pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat/gg2 Fix a C99ism to make this package build with ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ee12eba586b2
branches: trunk
changeset: 487633:ee12eba586b2
user: kristerw <kristerw%pkgsrc.org@localhost>
date: Mon Jan 17 20:15:28 2005 +0000
description:
Fix a C99ism to make this package build with gcc 2.95.
diffstat:
chat/gg2/distinfo | 10 ++++++-
chat/gg2/patches/patch-ac | 21 ++++++++++++++
chat/gg2/patches/patch-ad | 68 +++++++++++++++++++++++++++++++++++++++++++++++
chat/gg2/patches/patch-ae | 44 ++++++++++++++++++++++++++++++
chat/gg2/patches/patch-af | 39 ++++++++++++++++++++++++++
chat/gg2/patches/patch-ag | 15 ++++++++++
chat/gg2/patches/patch-ah | 23 +++++++++++++++
chat/gg2/patches/patch-ai | 34 +++++++++++++++++++++++
chat/gg2/patches/patch-aj | 30 ++++++++++++++++++++
9 files changed, 283 insertions(+), 1 deletions(-)
diffs (truncated from 325 to 300 lines):
diff -r a76c3e11c697 -r ee12eba586b2 chat/gg2/distinfo
--- a/chat/gg2/distinfo Mon Jan 17 19:33:06 2005 +0000
+++ b/chat/gg2/distinfo Mon Jan 17 20:15:28 2005 +0000
@@ -1,6 +1,14 @@
-$NetBSD: distinfo,v 1.5 2005/01/14 08:57:50 adam Exp $
+$NetBSD: distinfo,v 1.6 2005/01/17 20:15:28 kristerw Exp $
SHA1 (gg2-2.2.4.tar.gz) = e22800b6fd56cdd58d156b403da7fb245cbfdc71
Size (gg2-2.2.4.tar.gz) = 1363001 bytes
SHA1 (patch-aa) = 3fedb56197306db9aeb09e8c2c0e7b944febabdc
SHA1 (patch-ab) = 85879865593c86de6664a8f1ee5bd1d1cb237b29
+SHA1 (patch-ac) = 9edcf71601c303e3741342658cc6177f9ee5809f
+SHA1 (patch-ad) = 9cafbc11cb955dc0c479304314905f6a1a290c3a
+SHA1 (patch-ae) = 0ca3e0ba75e1048ba4965686498b4541d10d171e
+SHA1 (patch-af) = 428eea7e5edca55f05e5c7402a1283fe675a028b
+SHA1 (patch-ag) = 3eaeccacb5417b1445b6885f1816b6f173512c18
+SHA1 (patch-ah) = d873026c738f86501bc3c07c991035b528374d59
+SHA1 (patch-ai) = 824e644febb5a402e410111d0815d87c02310f8b
+SHA1 (patch-aj) = 029e2a0968c132de966708e5ba6c66cb1e06002d
diff -r a76c3e11c697 -r ee12eba586b2 chat/gg2/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/gg2/patches/patch-ac Mon Jan 17 20:15:28 2005 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.1 2005/01/17 20:15:28 kristerw Exp $
+
+--- src/plugins/GUI/gui_chat.c.orig Mon Jan 17 20:43:59 2005
++++ src/plugins/GUI/gui_chat.c Mon Jan 17 20:44:35 2005
+@@ -252,6 +252,7 @@
+ gint chat_type = (gint) ggadu_config_var_get(gui_handler, "chat_type");
+ gui_chat_session *session = NULL;
+ GtkWidget *textview = NULL;
++ GtkTextBuffer *buf;
+
+ if (chat_type == CHAT_TYPE_TABBED)
+ {
+@@ -267,7 +268,7 @@
+ textview = g_object_get_data(G_OBJECT(session->chat), "history");
+ }
+
+- GtkTextBuffer *buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
++ buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
+ gtk_text_buffer_set_text(buf, "", -1);
+ }
+
diff -r a76c3e11c697 -r ee12eba586b2 chat/gg2/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/gg2/patches/patch-ad Mon Jan 17 20:15:28 2005 +0000
@@ -0,0 +1,68 @@
+$NetBSD: patch-ad,v 1.1 2005/01/17 20:15:28 kristerw Exp $
+
+--- src/plugins/GUI/gui_preferences.c.orig Mon Jan 17 20:45:38 2005
++++ src/plugins/GUI/gui_preferences.c Mon Jan 17 20:49:24 2005
+@@ -618,6 +618,8 @@
+ #endif
+ GtkWidget *label0_align, *label1_align, *label2_align;
+ GtkWidget *label3_align;
++ GtkWidget *exp;
++ GtkWidget *frm;
+
+ chat_vbox = gtk_vbox_new(FALSE, 5);
+
+@@ -694,8 +696,8 @@
+ gtk_table_set_row_spacings(GTK_TABLE(tabbox), 7);
+ gtk_table_set_col_spacings(GTK_TABLE(tabbox), 0);
+
+- GtkWidget *exp = gtk_expander_new(_("More advanced options"));
+- GtkWidget *frm = gtk_frame_new(_("Default size of window"));
++ exp = gtk_expander_new(_("More advanced options"));
++ frm = gtk_frame_new(_("Default size of window"));
+ gtk_frame_set_shadow_type(GTK_FRAME(frm),GTK_SHADOW_ETCHED_OUT);
+ gtk_container_add(GTK_CONTAINER(frm), tabbox);
+ gtk_container_add(GTK_CONTAINER(exp), frm);
+@@ -761,6 +763,7 @@
+ GtkWidget *combo_theme = NULL;
+ GtkWidget *combo_icons = NULL;
+ GtkWidget *notify_status_changes = NULL;
++ GtkWidget *entry;
+
+ gchar *dirname = NULL;
+ GDir *dir;
+@@ -922,7 +925,7 @@
+ label = gtk_label_new(_("Web Browser:"));
+ gtk_container_add(GTK_CONTAINER(label4_align), label);
+
+- GtkWidget *entry = gtk_entry_new();
++ entry = gtk_entry_new();
+ gtk_table_attach_defaults(GTK_TABLE(tabbox2), label4_align, 0, 1, 0, 1);
+ gtk_table_attach_defaults(GTK_TABLE(tabbox2), entry, 1, 2, 0, 1);
+ g_object_set_data(G_OBJECT(adv_vbox), "browser_exec", entry);
+@@ -975,6 +978,8 @@
+ gchar *previous_theme = ggadu_config_var_get(gui_handler, "theme");
+ gchar *previous_icons = ggadu_config_var_get(gui_handler, "icons");
+ gint response = -1;
++ GSList *combo_theme_slist;
++ GSList *combo_icons_slist;
+
+ print_debug("Preferences");
+
+@@ -1325,7 +1330,7 @@
+ entry = g_object_get_data(G_OBJECT(adv_vbox), "combo_theme");
+ g_return_if_fail(entry != NULL);
+
+- GSList *combo_theme_slist = g_object_get_data(G_OBJECT(entry), "combo_theme_slist");
++ combo_theme_slist = g_object_get_data(G_OBJECT(entry), "combo_theme_slist");
+ ggadu_config_var_set(gui_handler, "theme", (gpointer) g_strdup(g_slist_nth_data(combo_theme_slist, gtk_combo_box_get_active(GTK_COMBO_BOX(entry)))));
+
+ g_slist_foreach(combo_theme_slist, (GFunc) g_free, NULL);
+@@ -1333,7 +1338,7 @@
+
+ entry = g_object_get_data(G_OBJECT(adv_vbox), "combo_icons");
+ g_return_if_fail(entry != NULL);
+- GSList *combo_icons_slist = g_object_get_data(G_OBJECT(entry), "combo_icons_slist");
++ combo_icons_slist = g_object_get_data(G_OBJECT(entry), "combo_icons_slist");
+ ggadu_config_var_set(gui_handler, "icons", (gpointer) g_strdup(g_slist_nth_data(combo_icons_slist, gtk_combo_box_get_active(GTK_COMBO_BOX(entry)))));
+ g_slist_free(combo_icons_slist);
+
diff -r a76c3e11c697 -r ee12eba586b2 chat/gg2/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/gg2/patches/patch-ae Mon Jan 17 20:15:28 2005 +0000
@@ -0,0 +1,44 @@
+$NetBSD: patch-ae,v 1.1 2005/01/17 20:15:28 kristerw Exp $
+
+--- src/plugins/gadu_gadu/gadu_gadu_plugin.c.orig Mon Jan 17 20:50:35 2005
++++ src/plugins/gadu_gadu/gadu_gadu_plugin.c Mon Jan 17 20:52:52 2005
+@@ -422,6 +422,9 @@
+ uint32_t *uins;
+ GGaduMsg *msg = NULL;
+ gint i, j;
++ GSList *list;
++ GSList *us;
++ gchar *recipients_line;
+
+ /* w przypadku bledu/utraty polaczenia postap tak jak w przypadku disconnect */
+ if (!session || !(e = gg_watch_fd(session)) || (condition & G_IO_ERR) ||
+@@ -585,9 +588,9 @@
+
+ }
+
+- GSList *list = ggadu_repo_get_as_slist("gadu-gadu", REPO_VALUE_CONTACT);
+- GSList *us = list;
+- gchar *recipients_line = NULL;
++ list = ggadu_repo_get_as_slist("gadu-gadu", REPO_VALUE_CONTACT);
++ us = list;
++ recipients_line = NULL;
+
+ while (us)
+ {
+@@ -696,6 +699,7 @@
+
+ if (k)
+ {
++ gchar *status;
+ ip_addr.s_addr = n->remote_ip;
+ if (inet_ntoa(ip_addr) && (ggadu_strcasecmp(inet_ntoa(ip_addr), "0.0.0.0")))
+ {
+@@ -714,7 +718,7 @@
+
+ /* Zapiszmy sobie zmiane opisu do pliku historii */
+
+- gchar *status = NULL;
++ status = NULL;
+ if ((k->status == GG_STATUS_AVAIL) || (k->status == GG_STATUS_AVAIL_DESCR))
+ status = g_strdup_printf("avail");
+ else if ((k->status == GG_STATUS_BUSY) || (k->status == GG_STATUS_BUSY_DESCR))
diff -r a76c3e11c697 -r ee12eba586b2 chat/gg2/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/gg2/patches/patch-af Mon Jan 17 20:15:28 2005 +0000
@@ -0,0 +1,39 @@
+$NetBSD: patch-af,v 1.1 2005/01/17 20:15:28 kristerw Exp $
+
+--- src/plugins/docklet/dockapp/dockapp_plugin.c.orig Mon Jan 17 20:54:04 2005
++++ src/plugins/docklet/dockapp/dockapp_plugin.c Mon Jan 17 20:55:32 2005
+@@ -105,6 +105,8 @@
+ //Przerysowuje elementy dynamiczne pixmapy
+ void draw_pixmap()
+ {
++ int i;
++ GdkFont *font;
+
+ //tlo ikony
+ gdk_gc_set_rgb_fg_color(gc, &clwhite);
+@@ -118,9 +120,6 @@
+ if ((icon2_img != NULL) && ((blink_no % 2) == 1))
+ gdk_draw_pixbuf(launch_pixmap, gc, icon2_img, 0, 0, icon2.x, icon2.y, icon2.width, icon2.height, GDK_RGB_DITHER_NONE, 0, 0);
+
+- int i;
+- GdkFont *font;
+-
+ //Wyswietl 3 nicki w kolorach zalenych od statusu
+ font = gdk_font_load("-misc-fixed-bold-r-normal-*-15-*-*-*-*-*-iso8859-2");
+ gdk_gc_set_rgb_fg_color(gc, &clred);
+@@ -350,6 +349,7 @@
+ //Funkcja startowa pluginu, exportowana,musi byc
+ void start_plugin()
+ {
++ XWMHints wmhints;
+ print_debug("%s : start\n", GGadu_PLUGIN_NAME);
+
+ //Etykietki
+@@ -397,7 +397,6 @@
+ redraw();
+
+ //Windowmaker hints - tu sprowadza okno do ikony
+- XWMHints wmhints;
+ wmhints.initial_state = WithdrawnState;
+ wmhints.flags = StateHint;
+ XSetWMHints(GDK_DISPLAY(), GDK_WINDOW_XWINDOW(status_dockapp->window), &wmhints);
diff -r a76c3e11c697 -r ee12eba586b2 chat/gg2/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/gg2/patches/patch-ag Mon Jan 17 20:15:28 2005 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 2005/01/17 20:15:28 kristerw Exp $
+
+--- src/plugins/jabber/jabber_plugin.c.orig Mon Jan 17 20:56:36 2005
++++ src/plugins/jabber/jabber_plugin.c Mon Jan 17 20:57:09 2005
+@@ -1443,8 +1443,9 @@
+
+ if (ggadu_config_var_get(jabber_handler, "autoconnect"))
+ {
++ GGaduStatusPrototype *sp;
+ print_debug("jabber: autoconneting");
+- GGaduStatusPrototype *sp = ggadu_find_status_prototype(p,JABBER_STATUS_AVAILABLE);
++ sp = ggadu_find_status_prototype(p,JABBER_STATUS_AVAILABLE);
+ jabber_change_status(sp);
+ }
+
diff -r a76c3e11c697 -r ee12eba586b2 chat/gg2/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/gg2/patches/patch-ah Mon Jan 17 20:15:28 2005 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ah,v 1.1 2005/01/17 20:15:28 kristerw Exp $
+
+--- src/plugins/jabber/jabber_login.c.orig Mon Jan 17 20:58:07 2005
++++ src/plugins/jabber/jabber_login.c Mon Jan 17 20:59:01 2005
+@@ -80,14 +80,14 @@
+
+ if (!jabber_data.connection || !lm_connection_is_open(jabber_data.connection))
+ {
+- print_debug("jabber: Connecting to %s with %s", server,jid);
+- jabber_data.connection = lm_connection_new(server);
+- lm_connection_set_keep_alive_rate(jabber_data.connection,30);
+-
+ /* proxy setting taken from EKG project */
+ gint jabber_proxy_enabled = 0;
+ gchar *jabber_proxy_host = NULL;
+ gint jabber_proxy_port;
++
++ print_debug("jabber: Connecting to %s with %s", server,jid);
++ jabber_data.connection = lm_connection_new(server);
++ lm_connection_set_keep_alive_rate(jabber_data.connection,30);
+
+ if (ggadu_config_var_check(jabber_handler, "proxy"))
+ {
diff -r a76c3e11c697 -r ee12eba586b2 chat/gg2/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/gg2/patches/patch-ai Mon Jan 17 20:15:28 2005 +0000
@@ -0,0 +1,34 @@
+$NetBSD: patch-ai,v 1.1 2005/01/17 20:15:28 kristerw Exp $
+
+--- src/plugins/ignore/ignore.c.orig Mon Jan 17 20:59:50 2005
++++ src/plugins/ignore/ignore.c Mon Jan 17 21:01:57 2005
+@@ -102,10 +102,12 @@
+ {
+ case GGADU_IGNORE_ADD_ID:
+ {
++ gchar *ignored_list_prev;
++ gchar *ignored_list_after;
+ GGaduContact *k = g_new0(GGaduContact, 1);
+ k->id = g_strdup(kv->value);
+- gchar *ignored_list_prev = ggadu_config_var_get(ignore_handler, "list");
+- gchar *ignored_list_after = NULL;
++ ignored_list_prev = ggadu_config_var_get(ignore_handler, "list");
++ ignored_list_after = NULL;
+
+ ignored_list_after = ggadu_add_ignored_contact(ignored_list_prev, k);
+ if (ignored_list_after)
+@@ -142,10 +144,12 @@
+ {
+ case GGADU_IGNORE_REMOVE_ID:
+ {
++ gchar *ignored_list_prev;
++ gchar *ignored_list_after;
+ GGaduContact *k = g_new0(GGaduContact, 1);
+ k->id = g_strdup(kv->value);
+- gchar *ignored_list_prev = ggadu_config_var_get(ignore_handler, "list");
+- gchar *ignored_list_after = NULL;
++ ignored_list_prev = ggadu_config_var_get(ignore_handler, "list");
++ ignored_list_after = NULL;
+
+ ignored_list_after = ggadu_remove_ignored_contact(ignored_list_prev, k);
+ if (ignored_list_after)
diff -r a76c3e11c697 -r ee12eba586b2 chat/gg2/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/gg2/patches/patch-aj Mon Jan 17 20:15:28 2005 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-aj,v 1.1 2005/01/17 20:15:28 kristerw Exp $
+
+--- contrib/gghist/gghist.c.orig Mon Jan 17 21:02:34 2005
++++ contrib/gghist/gghist.c Mon Jan 17 21:03:29 2005
+@@ -244,6 +244,8 @@
Home |
Main Index |
Thread Index |
Old Index