pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/gg2 Changes 2.2.5:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6295de6475d9
branches:  trunk
changeset: 492042:6295de6475d9
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Apr 04 08:26:29 2005 +0000

description:
Changes 2.2.5:
* Support for Perl scripts is turned off
* Support for skins compatible with Gadu-Gadu
* Fixes and stabilisation of the code for status changes
* Fixes in tlen.pl plug-in
* Now builds basic modules on MacOSX
* Improvements of "dockapp" plug-in

diffstat:

 chat/gg2/Makefile         |  16 ++++++----
 chat/gg2/distinfo         |  22 +++++---------
 chat/gg2/patches/patch-aa |   8 ++--
 chat/gg2/patches/patch-ab |  26 -----------------
 chat/gg2/patches/patch-ac |  21 --------------
 chat/gg2/patches/patch-ad |  68 -----------------------------------------------
 chat/gg2/patches/patch-ae |  44 ------------------------------
 chat/gg2/patches/patch-af |  29 ++++++++-----------
 chat/gg2/patches/patch-ag |  17 ++++++-----
 chat/gg2/patches/patch-ah |  13 ++++----
 chat/gg2/patches/patch-ai |  34 -----------------------
 chat/gg2/patches/patch-aj |  30 --------------------
 12 files changed, 51 insertions(+), 277 deletions(-)

diffs (truncated from 445 to 300 lines):

diff -r 26f5aacdd327 -r 6295de6475d9 chat/gg2/Makefile
--- a/chat/gg2/Makefile Mon Apr 04 07:24:07 2005 +0000
+++ b/chat/gg2/Makefile Mon Apr 04 08:26:29 2005 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2005/01/14 08:57:50 adam Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/04 08:26:29 adam Exp $
 
-DISTNAME=      gg2-2.2.4
+DISTNAME=      gg2-2.2.5
 CATEGORIES=    chat
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=ggadu/}
+EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    adam%NetBSD.org@localhost
 HOMEPAGE=      http://ggadu.sourceforge.net/
@@ -12,13 +13,16 @@
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
 USE_GNU_TOOLS+=                make
-PKGCONFIG_OVERRIDE+=   lib/gg2_core.pc.in
 GNU_CONFIGURE=         yes
 LIBS+=                 -lm
+PKGCONFIG_OVERRIDE+=   lib/gg2_core.pc.in
 
-CONFIGURE_ARGS+=       --without-gtkspell --without-remote \
-                       --without-update --without-external --without-arts \
-                       --with-external-libgadu
+CONFIGURE_ARGS+=       --with-external-libgadu
+CONFIGURE_ARGS+=       --without-arts
+CONFIGURE_ARGS+=       --without-external
+CONFIGURE_ARGS+=       --without-gtkspell
+CONFIGURE_ARGS+=       --without-remote
+CONFIGURE_ARGS+=       --without-update
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../chat/ekg/buildlink3.mk"
diff -r 26f5aacdd327 -r 6295de6475d9 chat/gg2/distinfo
--- a/chat/gg2/distinfo Mon Apr 04 07:24:07 2005 +0000
+++ b/chat/gg2/distinfo Mon Apr 04 08:26:29 2005 +0000
@@ -1,15 +1,9 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 15:59:11 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/04/04 08:26:29 adam Exp $
 
-SHA1 (gg2-2.2.4.tar.gz) = e22800b6fd56cdd58d156b403da7fb245cbfdc71
-RMD160 (gg2-2.2.4.tar.gz) = b12980cc62a6dc10555131528b651b4bd1b6c077
-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
+SHA1 (gg2-2.2.5.tar.bz2) = c6642ae186194618019c3467c8d81eb80f5f0c23
+RMD160 (gg2-2.2.5.tar.bz2) = 3871c13c55caa3647bb9d9fa73165f897d11f55d
+Size (gg2-2.2.5.tar.bz2) = 1087478 bytes
+SHA1 (patch-aa) = 1e27a4b03da73dd0c15efd376fe506ef126580d0
+SHA1 (patch-af) = e10417b0247c4ef4c33177eab35b6e27cfc2b21e
+SHA1 (patch-ag) = e98012fda6ca186fecd1fedf0b43a16b0129d5fb
+SHA1 (patch-ah) = b52abe3ed2fe478b7b55df78df299c3d7b706086
diff -r 26f5aacdd327 -r 6295de6475d9 chat/gg2/patches/patch-aa
--- a/chat/gg2/patches/patch-aa Mon Apr 04 07:24:07 2005 +0000
+++ b/chat/gg2/patches/patch-aa Mon Apr 04 08:26:29 2005 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2005/01/14 08:57:50 adam Exp $
+$NetBSD: patch-aa,v 1.5 2005/04/04 08:26:29 adam Exp $
 
---- lib/Makefile.in.orig       2005-01-05 10:50:35.000000000 +0000
+--- lib/Makefile.in.orig       2005-04-01 10:27:37.000000000 +0000
 +++ lib/Makefile.in
-@@ -339,7 +339,7 @@ libgg2_core_la_SOURCES = \
+@@ -341,7 +341,7 @@ libgg2_core_la_SOURCES = \
        perl_embed.h 
  
  libgg2_core_la_HEADERS = gg2_core.h
 -libgg2_core_la_LIBADD = $(PERL_OPTION_LDFLAGS) -ldl 
 +libgg2_core_la_LIBADD = $(PERL_OPTION_LDFLAGS)
- libgg2_core_la_LDFLAGS = -version-info 2:1:0
+ libgg2_core_la_LDFLAGS = -version-info 2:2:0
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = gg2_core.pc
diff -r 26f5aacdd327 -r 6295de6475d9 chat/gg2/patches/patch-ab
--- a/chat/gg2/patches/patch-ab Mon Apr 04 07:24:07 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/01/14 08:57:50 adam Exp $
-
---- src/main.c.orig    2004-12-26 22:47:53.000000000 +0000
-+++ src/main.c
-@@ -43,6 +43,12 @@
- #include "ggadu_repo.h"
- #include "perl_embed.h"
- 
-+#ifdef __Darwin__
-+#define DYLIB_SUFX ".dylib"
-+#else
-+#define DYLIB_SUFX ".so"
-+#endif
-+
- GGaduConfig *config;
- 
- gboolean gnu_gadu_init(gpointer data);
-@@ -80,7 +86,7 @@ void load_available_modules()
-     {
-       gchar *fullfilename = g_build_filename(dirpath, namepl, NULL);
- 
--      if ((!g_file_test(fullfilename, G_FILE_TEST_IS_DIR)) && (g_str_has_suffix(namepl, ".so")))
-+      if ((!g_file_test(fullfilename, G_FILE_TEST_IS_DIR)) && (g_str_has_suffix(namepl, DYLIB_SUFX)))
-       {
-           print_debug("core : load_avilable_modules : %s\n", namepl);
- 
diff -r 26f5aacdd327 -r 6295de6475d9 chat/gg2/patches/patch-ac
--- a/chat/gg2/patches/patch-ac Mon Apr 04 07:24:07 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$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 26f5aacdd327 -r 6295de6475d9 chat/gg2/patches/patch-ad
--- a/chat/gg2/patches/patch-ad Mon Apr 04 07:24:07 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-$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 26f5aacdd327 -r 6295de6475d9 chat/gg2/patches/patch-ae
--- a/chat/gg2/patches/patch-ae Mon Apr 04 07:24:07 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-$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 26f5aacdd327 -r 6295de6475d9 chat/gg2/patches/patch-af
--- a/chat/gg2/patches/patch-af Mon Apr 04 07:24:07 2005 +0000
+++ b/chat/gg2/patches/patch-af Mon Apr 04 08:26:29 2005 +0000
@@ -1,27 +1,24 @@
-$NetBSD: patch-af,v 1.1 2005/01/17 20:15:28 kristerw Exp $
+$NetBSD: patch-af,v 1.2 2005/04/04 08:26:29 adam 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 @@
+--- src/plugins/docklet/dockapp/dockapp_plugin.c.orig  2005-02-20 11:31:50.000000000 +0000
++++ src/plugins/docklet/dockapp/dockapp_plugin.c
+@@ -109,6 +109,7 @@ void redraw()
  //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 @@
+       gdk_draw_pixmap(launch_pixmap, gc , source_pixmap , 0 , 0 , 0 , 0 , 64 ,64);
+@@ -121,7 +122,6 @@ void draw_pixmap()
        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 @@
+ 
+       //Wyswietl 3 nicki w kolorach zalenych od statusu       
+       for (i = 0; i < NNICK; i++)
+@@ -468,6 +468,7 @@ gpointer user_preferences_action(gpointe
  //Funkcja startowa pluginu, exportowana,musi byc
  void start_plugin()
  {



Home | Main Index | Thread Index | Old Index