pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/gtk-gnutella Removed unused (PROP_TYPE_STRING) pat...
details: https://anonhg.NetBSD.org/pkgsrc/rev/168761fc04a1
branches: trunk
changeset: 549467:168761fc04a1
user: adam <adam%pkgsrc.org@localhost>
date: Mon Nov 03 12:52:38 2008 +0000
description:
Removed unused (PROP_TYPE_STRING) patches
diffstat:
net/gtk-gnutella/distinfo | 8 +--
net/gtk-gnutella/patches/patch-ac | 13 ----
net/gtk-gnutella/patches/patch-ad | 22 ------
net/gtk-gnutella/patches/patch-ae | 121 --------------------------------------
net/gtk-gnutella/patches/patch-af | 27 --------
net/gtk-gnutella/patches/patch-ag | 88 ---------------------------
net/gtk-gnutella/patches/patch-ai | 13 ----
7 files changed, 1 insertions(+), 291 deletions(-)
diffs (truncated from 325 to 300 lines):
diff -r dd36df7b9783 -r 168761fc04a1 net/gtk-gnutella/distinfo
--- a/net/gtk-gnutella/distinfo Mon Nov 03 11:55:13 2008 +0000
+++ b/net/gtk-gnutella/distinfo Mon Nov 03 12:52:38 2008 +0000
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.27 2008/08/20 10:03:32 adam Exp $
+$NetBSD: distinfo,v 1.28 2008/11/03 12:52:38 adam Exp $
SHA1 (gtk-gnutella-0.96.5.tar.bz2) = 80589a24322f509ed1c2494a1b5ce08951c7e216
RMD160 (gtk-gnutella-0.96.5.tar.bz2) = 1f7b58b45955d940e19284110ad78bb6410cd3c6
Size (gtk-gnutella-0.96.5.tar.bz2) = 13634700 bytes
SHA1 (patch-aa) = b499e26fd7b714c6845d6d9914de29f733b785f8
-SHA1 (patch-ac) = db691de783cd1cf26110f391559ac146a3aa235a
-SHA1 (patch-ad) = 38a4940e17b04249797b9bc625bb9205981ce356
-SHA1 (patch-ae) = cdbe5440cadeb7f247ce01abb8a5ce76e80a35c3
-SHA1 (patch-af) = d0a0f4ea8e6833350fb97b9b59b32903a61865d1
-SHA1 (patch-ag) = 25ccbbbd237500535e857f244f449bdd69104530
-SHA1 (patch-ai) = f0a2bcad7100c30d6fee32479250004325f7bd98
diff -r dd36df7b9783 -r 168761fc04a1 net/gtk-gnutella/patches/patch-ac
--- a/net/gtk-gnutella/patches/patch-ac Mon Nov 03 11:55:13 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2008/08/20 10:03:32 adam Exp $
-
---- src/if/gui_property.c.orig 2008-04-02 01:19:44.000000000 +0200
-+++ src/if/gui_property.c
-@@ -2327,7 +2327,7 @@ gui_prop_shutdown(void) {
- }
-
- for (n = 0; n < GUI_PROPERTY_NUM; n ++) {
-- if (gui_property->props[n].type == PROP_TYPE_STRING) {
-+ if (gui_property->props[n].type == gg_PROP_TYPE_STRING) {
- gchar **p = gui_property->props[n].data.string.value;
- struct event *e = gui_property->props[n].ev_changed;
- G_FREE_NULL(*p);
diff -r dd36df7b9783 -r 168761fc04a1 net/gtk-gnutella/patches/patch-ad
--- a/net/gtk-gnutella/patches/patch-ad Mon Nov 03 11:55:13 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2007/10/14 08:32:19 adam Exp $
-
---- src/if/props.tpl.orig 2007-07-07 06:21:34.000000000 +0200
-+++ src/if/props.tpl
-@@ -510,7 +510,7 @@ FOR prop =][=
- (sprintf "%s_choices" (. prop-var))=];[=
-
- = string =]
-- [=(. current-prop)=].type = PROP_TYPE_STRING;
-+ [=(. current-prop)=].type = gg_PROP_TYPE_STRING;
- [=(. current-prop)=].data.string.def = [=(. prop-def-var)=];
- [=(. current-prop)=].data.string.value = [=(. prop-var)=];
- if ([=(. current-prop)=].data.string.def) {
-@@ -542,7 +542,7 @@ void
- }
-
- for (n = 0; n < [=(. prop-num)=]; n ++) {
-- if ([=(. prop-set)=]->props[n].type == PROP_TYPE_STRING) {
-+ if ([=(. prop-set)=]->props[n].type == gg_PROP_TYPE_STRING) {
- gchar **p = [=(. prop-array)=][n].data.string.value;
- struct event *e = [=(. prop-array)=][n].ev_changed;
- G_FREE_NULL(*p);
diff -r dd36df7b9783 -r 168761fc04a1 net/gtk-gnutella/patches/patch-ae
--- a/net/gtk-gnutella/patches/patch-ae Mon Nov 03 11:55:13 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2008/08/20 10:03:32 adam Exp $
-
---- src/if/gnet_property.c.orig 2008-04-02 01:19:44.000000000 +0200
-+++ src/if/gnet_property.c
-@@ -778,7 +778,7 @@ gnet_prop_init(void) {
- gnet_property->props[3].vector_size = 1;
-
- /* Type specific data: */
-- gnet_property->props[3].type = PROP_TYPE_STRING;
-+ gnet_property->props[3].type = gg_PROP_TYPE_STRING;
- gnet_property->props[3].data.string.def = (void *) &gnet_property_variable_new_version_str_default;
- gnet_property->props[3].data.string.value = (void *) &gnet_property_variable_new_version_str;
- if (gnet_property->props[3].data.string.def) {
-@@ -2888,7 +2888,7 @@ gnet_prop_init(void) {
- gnet_property->props[113].vector_size = 1;
-
- /* Type specific data: */
-- gnet_property->props[113].type = PROP_TYPE_STRING;
-+ gnet_property->props[113].type = gg_PROP_TYPE_STRING;
- gnet_property->props[113].data.string.def = (void *) &gnet_property_variable_socks_user_default;
- gnet_property->props[113].data.string.value = (void *) &gnet_property_variable_socks_user;
- if (gnet_property->props[113].data.string.def) {
-@@ -2909,7 +2909,7 @@ gnet_prop_init(void) {
- gnet_property->props[114].vector_size = 1;
-
- /* Type specific data: */
-- gnet_property->props[114].type = PROP_TYPE_STRING;
-+ gnet_property->props[114].type = gg_PROP_TYPE_STRING;
- gnet_property->props[114].data.string.def = (void *) &gnet_property_variable_socks_pass_default;
- gnet_property->props[114].data.string.value = (void *) &gnet_property_variable_socks_pass;
- if (gnet_property->props[114].data.string.def) {
-@@ -2946,7 +2946,7 @@ gnet_prop_init(void) {
- gnet_property->props[116].vector_size = 1;
-
- /* Type specific data: */
-- gnet_property->props[116].type = PROP_TYPE_STRING;
-+ gnet_property->props[116].type = gg_PROP_TYPE_STRING;
- gnet_property->props[116].data.string.def = (void *) &gnet_property_variable_proxy_hostname_default;
- gnet_property->props[116].data.string.value = (void *) &gnet_property_variable_proxy_hostname;
- if (gnet_property->props[116].data.string.def) {
-@@ -3537,7 +3537,7 @@ gnet_prop_init(void) {
- gnet_property->props[146].vector_size = 1;
-
- /* Type specific data: */
-- gnet_property->props[146].type = PROP_TYPE_STRING;
-+ gnet_property->props[146].type = gg_PROP_TYPE_STRING;
- gnet_property->props[146].data.string.def = (void *) &gnet_property_variable_scan_extensions_default;
- gnet_property->props[146].data.string.value = (void *) &gnet_property_variable_scan_extensions;
- if (gnet_property->props[146].data.string.def) {
-@@ -3592,7 +3592,7 @@ gnet_prop_init(void) {
- gnet_property->props[149].vector_size = 1;
-
- /* Type specific data: */
-- gnet_property->props[149].type = PROP_TYPE_STRING;
-+ gnet_property->props[149].type = gg_PROP_TYPE_STRING;
- gnet_property->props[149].data.string.def = (void *) &gnet_property_variable_save_file_path_default;
- gnet_property->props[149].data.string.value = (void *) &gnet_property_variable_save_file_path;
- if (gnet_property->props[149].data.string.def) {
-@@ -3613,7 +3613,7 @@ gnet_prop_init(void) {
- gnet_property->props[150].vector_size = 1;
-
- /* Type specific data: */
-- gnet_property->props[150].type = PROP_TYPE_STRING;
-+ gnet_property->props[150].type = gg_PROP_TYPE_STRING;
- gnet_property->props[150].data.string.def = (void *) &gnet_property_variable_move_file_path_default;
- gnet_property->props[150].data.string.value = (void *) &gnet_property_variable_move_file_path;
- if (gnet_property->props[150].data.string.def) {
-@@ -3634,7 +3634,7 @@ gnet_prop_init(void) {
- gnet_property->props[151].vector_size = 1;
-
- /* Type specific data: */
-- gnet_property->props[151].type = PROP_TYPE_STRING;
-+ gnet_property->props[151].type = gg_PROP_TYPE_STRING;
- gnet_property->props[151].data.string.def = (void *) &gnet_property_variable_bad_file_path_default;
- gnet_property->props[151].data.string.value = (void *) &gnet_property_variable_bad_file_path;
- if (gnet_property->props[151].data.string.def) {
-@@ -3655,7 +3655,7 @@ gnet_prop_init(void) {
- gnet_property->props[152].vector_size = 1;
-
- /* Type specific data: */
-- gnet_property->props[152].type = PROP_TYPE_STRING;
-+ gnet_property->props[152].type = gg_PROP_TYPE_STRING;
- gnet_property->props[152].data.string.def = (void *) &gnet_property_variable_shared_dirs_paths_default;
- gnet_property->props[152].data.string.value = (void *) &gnet_property_variable_shared_dirs_paths;
- if (gnet_property->props[152].data.string.def) {
-@@ -3676,7 +3676,7 @@ gnet_prop_init(void) {
- gnet_property->props[153].vector_size = 1;
-
- /* Type specific data: */
-- gnet_property->props[153].type = PROP_TYPE_STRING;
-+ gnet_property->props[153].type = gg_PROP_TYPE_STRING;
- gnet_property->props[153].data.string.def = (void *) &gnet_property_variable_local_netmasks_string_default;
- gnet_property->props[153].data.string.value = (void *) &gnet_property_variable_local_netmasks_string;
- if (gnet_property->props[153].data.string.def) {
-@@ -4774,7 +4774,7 @@ gnet_prop_init(void) {
- gnet_property->props[212].vector_size = 1;
-
- /* Type specific data: */
-- gnet_property->props[212].type = PROP_TYPE_STRING;
-+ gnet_property->props[212].type = gg_PROP_TYPE_STRING;
- gnet_property->props[212].data.string.def = (void *) &gnet_property_variable_server_hostname_default;
- gnet_property->props[212].data.string.value = (void *) &gnet_property_variable_server_hostname;
- if (gnet_property->props[212].data.string.def) {
-@@ -6489,7 +6489,7 @@ gnet_prop_init(void) {
- gnet_property->props[303].vector_size = 1;
-
- /* Type specific data: */
-- gnet_property->props[303].type = PROP_TYPE_STRING;
-+ gnet_property->props[303].type = gg_PROP_TYPE_STRING;
- gnet_property->props[303].data.string.def = (void *) &gnet_property_variable_latest_svn_release_signature_default;
- gnet_property->props[303].data.string.value = (void *) &gnet_property_variable_latest_svn_release_signature;
- if (gnet_property->props[303].data.string.def) {
-@@ -6687,7 +6687,7 @@ gnet_prop_shutdown(void) {
- }
-
- for (n = 0; n < GNET_PROPERTY_NUM; n ++) {
-- if (gnet_property->props[n].type == PROP_TYPE_STRING) {
-+ if (gnet_property->props[n].type == gg_PROP_TYPE_STRING) {
- gchar **p = gnet_property->props[n].data.string.value;
- struct event *e = gnet_property->props[n].ev_changed;
- G_FREE_NULL(*p);
diff -r dd36df7b9783 -r 168761fc04a1 net/gtk-gnutella/patches/patch-af
--- a/net/gtk-gnutella/patches/patch-af Mon Nov 03 11:55:13 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/06/15 14:26:23 darcy Exp $
-
---- src/lib/prop.h.orig 2007-06-14 12:07:07.000000000 -0400
-+++ src/lib/prop.h
-@@ -48,11 +48,11 @@ typedef enum {
- PROP_TYPE_IP,
- PROP_TYPE_MULTICHOICE,
- PROP_TYPE_STORAGE,
-- PROP_TYPE_STRING,
-+ gg_PROP_TYPE_STRING,
- PROP_TYPE_TIMESTAMP,
-
- NUM_PROP_TYPES
--} prop_type_t;
-+} gg_prop_type_t;
-
- /**
- * Callback signature definition.
-@@ -160,7 +160,7 @@ typedef gboolean *(*prop_get_boolean_t)
- typedef struct prop_def {
- gchar *name; /**< key used in the config file */
- gchar *desc; /**< description of the property */
-- prop_type_t type;
-+ gg_prop_type_t type;
- union {
- prop_def_guint32_t guint32;
- prop_def_guint64_t guint64;
diff -r dd36df7b9783 -r 168761fc04a1 net/gtk-gnutella/patches/patch-ag
--- a/net/gtk-gnutella/patches/patch-ag Mon Nov 03 11:55:13 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2008/08/20 10:03:32 adam Exp $
-
---- src/lib/prop.c.orig 2008-04-02 01:19:48.000000000 +0200
-+++ src/lib/prop.c
-@@ -420,7 +420,7 @@ prop_get_def(prop_set_t *ps, property_t
- sizeof buf->data.ip.value * PROP(ps,p).vector_size);
- break;
-
-- case PROP_TYPE_STRING:
-+ case gg_PROP_TYPE_STRING:
- buf->data.string.def = g_new(gchar*, 1);
- *buf->data.string.def = g_strdup(*PROP(ps,p).data.string.def);
- buf->data.string.value = g_new(gchar*, 1);
-@@ -475,7 +475,7 @@ prop_free_def(prop_def_t *d)
- case PROP_TYPE_IP:
- G_FREE_NULL(d->data.ip.value);
- break;
-- case PROP_TYPE_STRING:
-+ case gg_PROP_TYPE_STRING:
- G_FREE_NULL(*d->data.string.value);
- G_FREE_NULL(*d->data.string.def);
- G_FREE_NULL(d->data.string.value);
-@@ -1152,12 +1152,12 @@ prop_set_string(prop_set_t *ps, property
-
- if (!prop_in_range(ps, prop))
- g_error("prop_get_gchar: unknown property %d", prop);
-- if (PROP(ps,prop).type != PROP_TYPE_STRING)
-+ if (PROP(ps,prop).type != gg_PROP_TYPE_STRING)
- g_error("Type mismatch getting value for [%s] of type"
- " %s when %s was expected",
- PROP(ps,prop).name,
- prop_type_str[PROP(ps,prop).type].name,
-- prop_type_str[PROP_TYPE_STRING].name);
-+ prop_type_str[gg_PROP_TYPE_STRING].name);
-
- prop_assert(ps, prop, PROP(ps,prop).vector_size == 1);
-
-@@ -1214,12 +1214,12 @@ prop_get_string(prop_set_t *ps, property
-
- if (!prop_in_range(ps, prop))
- g_error("prop_get_gchar: unknown property %d", prop);
-- if (PROP(ps,prop).type != PROP_TYPE_STRING)
-+ if (PROP(ps,prop).type != gg_PROP_TYPE_STRING)
- g_error("Type mismatch getting value for [%s] of type"
- " %s when %s was expected",
- PROP(ps,prop).name,
- prop_type_str[PROP(ps,prop).type].name,
-- prop_type_str[PROP_TYPE_STRING].name);
-+ prop_type_str[gg_PROP_TYPE_STRING].name);
-
- s = *PROP(ps,prop).data.string.value;
-
-@@ -1329,7 +1329,7 @@ prop_to_string(prop_set_t *ps, property_
- timestamp_to_string_buf(val, s, sizeof s);
- }
- break;
-- case PROP_TYPE_STRING:
-+ case gg_PROP_TYPE_STRING:
- {
- gchar *buf = prop_get_string(ps, prop, NULL, 0);
-
-@@ -1406,7 +1406,7 @@ prop_default_to_string(prop_set_t *ps, p
- case PROP_TYPE_TIMESTAMP:
- uint64_to_string_buf(p->data.timestamp.def[0], s, sizeof s);
- break;
-- case PROP_TYPE_STRING:
-+ case gg_PROP_TYPE_STRING:
- g_strlcpy(s, *p->data.string.def ? *p->data.string.def : "", sizeof s);
- break;
- case PROP_TYPE_IP:
-@@ -1679,7 +1679,7 @@ prop_save_to_file(prop_set_t *ps, const
- val = g_strjoinv(",", vbuf);
- quotes = TRUE;
- break;
-- case PROP_TYPE_STRING:
-+ case gg_PROP_TYPE_STRING:
- val = g_strdup(*p->data.string.value);
- if (
- val != *p->data.string.def &&
-@@ -1828,7 +1828,7 @@ prop_set_from_string(prop_set_t *ps, pro
Home |
Main Index |
Thread Index |
Old Index