pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/gtk-gnutella Prepend two tokens with "gg_" to avoi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/567ceece2f3f
branches: trunk
changeset: 530022:567ceece2f3f
user: darcy <darcy%pkgsrc.org@localhost>
date: Fri Jun 15 14:26:22 2007 +0000
description:
Prepend two tokens with "gg_" to avoid conflicts with our system. A little
klugey but I doubt that we will be changing our proplib.h anytime soon.
diffstat:
net/gtk-gnutella/distinfo | 9 ++-
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-ah | 13 ++++
net/gtk-gnutella/patches/patch-ai | 22 ++++++
8 files changed, 314 insertions(+), 1 deletions(-)
diffs (truncated from 353 to 300 lines):
diff -r ad43e0779e8a -r 567ceece2f3f net/gtk-gnutella/distinfo
--- a/net/gtk-gnutella/distinfo Fri Jun 15 14:21:27 2007 +0000
+++ b/net/gtk-gnutella/distinfo Fri Jun 15 14:26:22 2007 +0000
@@ -1,7 +1,14 @@
-$NetBSD: distinfo,v 1.24 2007/01/20 14:50:03 cbiere Exp $
+$NetBSD: distinfo,v 1.25 2007/06/15 14:26:22 darcy Exp $
SHA1 (gtk-gnutella-0.96.3.tar.bz2) = 7469d4ea685c387f38e927efeb8b9947a9ec72e3
RMD160 (gtk-gnutella-0.96.3.tar.bz2) = fd5f04d22349a584e9b26cefbbbef41a2dbef7b2
Size (gtk-gnutella-0.96.3.tar.bz2) = 2845172 bytes
SHA1 (patch-aa) = 16cc12d99624677d81fd1a7746b2afb80db0b570
SHA1 (patch-ab) = 9ffbe8d12c7e4747a2110cd825bf957e2f3f393a
+SHA1 (patch-ac) = b5d3053d8fb7095adc72464a09b83c278d7616a8
+SHA1 (patch-ad) = 18126a316296828aca62e9e5b8dbd801f06427eb
+SHA1 (patch-ae) = aa45736568209888dae66f5c74aaf3e292e1a314
+SHA1 (patch-af) = d0a0f4ea8e6833350fb97b9b59b32903a61865d1
+SHA1 (patch-ag) = 4f60ae6d30c159b900c896baae28c11a2d77a879
+SHA1 (patch-ah) = d2d20e345411662ea9134557aea508b67ea3ec6f
+SHA1 (patch-ai) = 0a1f4b2be7873c8d9e204a1b6312cb0591770943
diff -r ad43e0779e8a -r 567ceece2f3f net/gtk-gnutella/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/gtk-gnutella/patches/patch-ac Fri Jun 15 14:26:22 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.5 2007/06/15 14:26:22 darcy Exp $
+
+--- src/if/gui_property.c.orig 2007-06-14 12:07:07.000000000 -0400
++++ src/if/gui_property.c
+@@ -2453,7 +2453,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 ad43e0779e8a -r 567ceece2f3f net/gtk-gnutella/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/gtk-gnutella/patches/patch-ad Fri Jun 15 14:26:22 2007 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.4 2007/06/15 14:26:22 darcy Exp $
+
+--- src/if/props.tpl.orig 2007-06-14 12:07:07.000000000 -0400
++++ src/if/props.tpl
+@@ -468,7 +468,7 @@ FOR prop =][=
+ (sprintf "%s_choices" (. prop-var-name ))=];[=
+
+ = 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) {
+@@ -500,7 +500,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 ad43e0779e8a -r 567ceece2f3f net/gtk-gnutella/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/gtk-gnutella/patches/patch-ae Fri Jun 15 14:26:22 2007 +0000
@@ -0,0 +1,121 @@
+$NetBSD: patch-ae,v 1.4 2007/06/15 14:26:23 darcy Exp $
+
+--- src/if/gnet_property.c.orig 2007-06-14 12:07:07.000000000 -0400
++++ src/if/gnet_property.c
+@@ -730,7 +730,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 = &new_version_str_def;
+ gnet_property->props[3].data.string.value = &new_version_str;
+ if (gnet_property->props[3].data.string.def) {
+@@ -2843,7 +2843,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 = &socks_user_def;
+ gnet_property->props[113].data.string.value = &socks_user;
+ if (gnet_property->props[113].data.string.def) {
+@@ -2864,7 +2864,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 = &socks_pass_def;
+ gnet_property->props[114].data.string.value = &socks_pass;
+ if (gnet_property->props[114].data.string.def) {
+@@ -2901,7 +2901,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 = &proxy_hostname_def;
+ gnet_property->props[116].data.string.value = &proxy_hostname;
+ if (gnet_property->props[116].data.string.def) {
+@@ -3492,7 +3492,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 = &scan_extensions_def;
+ gnet_property->props[146].data.string.value = &scan_extensions;
+ if (gnet_property->props[146].data.string.def) {
+@@ -3547,7 +3547,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 = &save_file_path_def;
+ gnet_property->props[149].data.string.value = &save_file_path;
+ if (gnet_property->props[149].data.string.def) {
+@@ -3568,7 +3568,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 = &move_file_path_def;
+ gnet_property->props[150].data.string.value = &move_file_path;
+ if (gnet_property->props[150].data.string.def) {
+@@ -3589,7 +3589,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 = &bad_file_path_def;
+ gnet_property->props[151].data.string.value = &bad_file_path;
+ if (gnet_property->props[151].data.string.def) {
+@@ -3610,7 +3610,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 = &shared_dirs_paths_def;
+ gnet_property->props[152].data.string.value = &shared_dirs_paths;
+ if (gnet_property->props[152].data.string.def) {
+@@ -3631,7 +3631,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 = &local_netmasks_string_def;
+ gnet_property->props[153].data.string.value = &local_netmasks_string;
+ if (gnet_property->props[153].data.string.def) {
+@@ -4765,7 +4765,7 @@ gnet_prop_init(void) {
+ gnet_property->props[214].vector_size = 1;
+
+ /* Type specific data: */
+- gnet_property->props[214].type = PROP_TYPE_STRING;
++ gnet_property->props[214].type = gg_PROP_TYPE_STRING;
+ gnet_property->props[214].data.string.def = &server_hostname_def;
+ gnet_property->props[214].data.string.value = &server_hostname;
+ if (gnet_property->props[214].data.string.def) {
+@@ -5630,7 +5630,7 @@ gnet_prop_init(void) {
+ gnet_property->props[259].vector_size = 1;
+
+ /* Type specific data: */
+- gnet_property->props[259].type = PROP_TYPE_STRING;
++ gnet_property->props[259].type = gg_PROP_TYPE_STRING;
+ gnet_property->props[259].data.string.def = &ancient_version_force_def;
+ gnet_property->props[259].data.string.value = &ancient_version_force;
+ if (gnet_property->props[259].data.string.def) {
+@@ -6223,7 +6223,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 ad43e0779e8a -r 567ceece2f3f net/gtk-gnutella/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/gtk-gnutella/patches/patch-af Fri Jun 15 14:26:22 2007 +0000
@@ -0,0 +1,27 @@
+$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 ad43e0779e8a -r 567ceece2f3f net/gtk-gnutella/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/gtk-gnutella/patches/patch-ag Fri Jun 15 14:26:22 2007 +0000
@@ -0,0 +1,88 @@
+$NetBSD: patch-ag,v 1.1 2007/06/15 14:26:23 darcy Exp $
+
+--- src/lib/prop.c.orig 2007-06-14 12:07:07.000000000 -0400
++++ src/lib/prop.c
+@@ -466,7 +466,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);
+@@ -521,7 +521,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);
+@@ -1198,12 +1198,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);
+
+@@ -1260,12 +1260,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;
+
+@@ -1375,7 +1375,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);
+
+@@ -1452,7 +1452,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:
+@@ -1727,7 +1727,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 (
Home |
Main Index |
Thread Index |
Old Index