Date: Tue, 5 Sep 2006 14:56:53 GMT From: Piotr Smyrak <piotr.smyrak@heron.pl> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/102908: [patch] update polish/gnugadu2 to 2.2.9 Message-ID: <200609051456.k85Eur8j017591@www.freebsd.org> Resent-Message-ID: <200609051501.k85F12ud066407@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102908 >Category: ports >Synopsis: [patch] update polish/gnugadu2 to 2.2.9 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Sep 05 15:01:02 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Piotr Smyrak >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD psmyrak.intra 6.1-STABLE FreeBSD 6.1-STABLE #0: Wed May 17 13:49:12 CEST 2006 root@psmyrak.intra:/usr/obj /usr/src/sys/JOB i386 >Description: The attached patch upgrades polish/gnugadu2 port to newly released version 2.2.9, that merges some FreeBSD port patches upstream, so the following patches have been deleted from the port: patch-src_plugins_GUI_gui__chat.c patch-src_plugins_GUI_gui__preferences.c patch-src_plugins_GUI_gui__userview.c patch-src_plugins_aaway_aaway.c patch-src_plugins_jabber_jabber__login.c patch-src_plugins_jabber_jabber__plugin.c patch-po::Makefile.in.in have been renamed to patch-po__Makefile.in.in to please portlint. polish/ekg dependency have been dropped in favor of more granular polish/libgadu. >How-To-Repeat: N/A >Fix: --- gnugadu.patch starts --- diff -Naru /usr/ports/polish/gnugadu2/Makefile gnugadu2/Makefile --- /usr/ports/polish/gnugadu2/Makefile Sun May 28 17:54:09 2006 +++ gnugadu2/Makefile Tue Sep 5 16:20:20 2006 @@ -3,11 +3,9 @@ # Whom: smyru@heron.pl # # $FreeBSD: ports/polish/gnugadu2/Makefile,v 1.36 2006/05/28 15:54:09 pav Exp $ -# PORTNAME= gnugadu2 -PORTVERSION= 2.2.8 -PORTREVISION= 2 +PORTVERSION= 2.2.9 CATEGORIES= polish net-im MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ggadu @@ -16,21 +14,21 @@ MAINTAINER= smyru@heron.pl COMMENT= GTK2 based Gadu-Gadu client for X11 -LIB_DEPENDS= gadu.3:${PORTSDIR}/polish/ekg \ +LIB_DEPENDS= gadu.3:${PORTSDIR}/polish/libgadu \ audiofile.0:${PORTSDIR}/audio/libaudiofile USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes +USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gtk20 +USE_LDCONFIG= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes WANT_GNOME= yes CONFLICTS= qhacc-[0-9]* -CONFIGURE_ARGS= \ - --disable-esdtest \ +CONFIGURE_ARGS= --disable-esdtest \ --with-external-libgadu \ --with-static=no \ --with-aaway \ @@ -41,35 +39,36 @@ --with-oss \ --with-sms \ --with-update \ - --without-dbus \ --without-gnutls \ --without-perl \ --without-remote CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${X11BASE}/include" -OPTIONS= TLEN "Enable Tlen.pl network plugin" off \ +OPTIONS= TLEN "Enable Tlen.pl network plugin" off \ JABBER "Enable Jabber loudmouth plugin" off \ - DOCKLET "Enable fd.o docklet plugin" on \ + DBUS "Enable D-Bus plugin" off \ + DOCKLET "Enable fd.o docklet plugin" on \ DOCKAPP "Enable WindowMaker dockapp plugin" off \ GTKSPELL "Enable GTKSpell checker" off \ XOSD "Enable On-Screen-Display messages" off \ - ARTS "Build with aRts sound server" off \ + ARTS "Build with aRts sound server" off \ ESOUND "Build with esound sound server" off .include <bsd.port.pre.mk> -.if (${HAVE_GNOME:Mesound}!="") +.if (${HAVE_GNOME:Mesound}!="") && !defined(WITHOUT_ESOUND) WITH_ESOUND= yes .endif # does not work with newer dbus versions -#.if exists(${LOCALBASE}/lib/libdbus-1.so) -#WITH_DBUS= yes -#.endif +.if exists(${LOCALBASE}/lib/libdbus-1.so) && !defined(WITHOUT_DBUS) +WITH_DBUS= yes +.endif -.if exists(${X11BASE}/lib/libgtkspell.so) +.if exists(${X11BASE}/lib/libgtkspell.so) && !defined(WITHOUT_GTKSPELL) WITH_GTKSPELL= yes .endif @@ -114,15 +113,15 @@ CONFIGURE_ARGS+= --without-gtkspell .endif -#.if defined(WITH_DBUS) -#LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus -#CONFIGURE_ARGS+= --with-dbus \ -# --with-dbus-dir=${LOCALBASE}/share/dbus-1/services -#PLIST_SUB+= DBUS:="" -#.else -#CONFIGURE_ARGS+= --without-dbus -#PLIST_SUB+= DBUS:="@comment " -#.endif +.if defined(WITH_DBUS) +LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus +CONFIGURE_ARGS+= --with-dbus \ + --with-dbus-dir=${PREFIX}/share/dbus-1/services +PLIST_SUB+= DBUS:="" +.else +CONFIGURE_ARGS+= --without-dbus +PLIST_SUB+= DBUS:="@comment " +.endif .if defined(WITH_ESOUND) PKGNAMESUFFIX= -esound @@ -172,11 +171,12 @@ post-install: .if (${HAVE_GNOME:Mgnomehier}!="") - ${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${X11BASE}/share/gnome/apps/Internet - ${LN} -sf ${PREFIX}/share/pixmaps/gg2.png ${X11BASE}/share/gnome/pixmaps + ${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${PREFIX}/share/gnome/apps/Internet + ${LN} -sf ${PREFIX}/share/pixmaps/gg2.png ${PREFIX}/share/gnome/pixmaps .endif .if exists(${LOCALBASE}/lib/libkdecore.so) ${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${LOCALBASE}/share/applnk/Internet .endif +# vim: set ts=8 sw=8: .include <bsd.port.post.mk> diff -Naru /usr/ports/polish/gnugadu2/distinfo gnugadu2/distinfo --- /usr/ports/polish/gnugadu2/distinfo Tue Jan 24 00:49:31 2006 +++ gnugadu2/distinfo Wed Aug 9 12:41:15 2006 @@ -1,3 +1,3 @@ -MD5 (gg2-2.2.8.tar.bz2) = 6896f8b5d18004976952c8e5358d60ee -SHA256 (gg2-2.2.8.tar.bz2) = a5d62ee48c1b3f40aca2cf0c6ab0458ff4a7b18b1e34ad4c090b9ad233084fba -SIZE (gg2-2.2.8.tar.bz2) = 1091976 +MD5 (gg2-2.2.9.tar.bz2) = a30f5f6e3d32193323669df66804cb90 +SHA256 (gg2-2.2.9.tar.bz2) = a64fec539ad379da9209aaefff12c503fa4caebf6b7d65ed80e635f506ceb956 +SIZE (gg2-2.2.9.tar.bz2) = 1139419 diff -Naru /usr/ports/polish/gnugadu2/files/patch-po::Makefile.in.in gnugadu2/files/patch-po::Makefile.in.in --- /usr/ports/polish/gnugadu2/files/patch-po::Makefile.in.in Tue Mar 2 19:57:32 2004 +++ gnugadu2/files/patch-po::Makefile.in.in Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- po/Makefile.in.in.orig Sun Feb 22 14:40:17 2004 -+++ po/Makefile.in.in Sun Feb 22 14:40:50 2004 -@@ -21,7 +21,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = @datadir@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gettextsrcdir = $(datadir)/gettext/po - - INSTALL = @INSTALL@ diff -Naru /usr/ports/polish/gnugadu2/files/patch-po__Makefile.in.in gnugadu2/files/patch-po__Makefile.in.in --- /usr/ports/polish/gnugadu2/files/patch-po__Makefile.in.in Thu Jan 1 01:00:00 1970 +++ gnugadu2/files/patch-po__Makefile.in.in Mon Jul 24 11:34:46 2006 @@ -0,0 +1,11 @@ +--- po/Makefile.in.in.orig Sun Feb 22 14:40:17 2004 ++++ po/Makefile.in.in Sun Feb 22 14:40:50 2004 +@@ -21,7 +21,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = @datadir@ +-localedir = $(datadir)/locale ++localedir = $(prefix)/share/locale + gettextsrcdir = $(datadir)/gettext/po + + INSTALL = @INSTALL@ diff -Naru /usr/ports/polish/gnugadu2/files/patch-src_plugins_GUI_gui__chat.c gnugadu2/files/patch-src_plugins_GUI_gui__chat.c --- /usr/ports/polish/gnugadu2/files/patch-src_plugins_GUI_gui__chat.c Mon Apr 11 11:03:22 2005 +++ gnugadu2/files/patch-src_plugins_GUI_gui__chat.c Thu Jan 1 01:00:00 1970 @@ -1,21 +0,0 @@ - -$FreeBSD: ports/polish/gnugadu2/files/patch-src_plugins_GUI_gui__chat.c,v 1.1 2005/04/11 09:03:22 flz Exp $ - ---- src/plugins/GUI/gui_chat.c.orig -+++ src/plugins/GUI/gui_chat.c -@@ -851,6 +851,7 @@ - gint percent = 0; - gint number_of_workspaces = 0; - GtkWidget *chat_notebook_paned_size = NULL; -+ PangoFontDescription *font_desc; - - if (!session || !plugin_name || !id) - return NULL; -@@ -1117,7 +1118,6 @@ - - /* set font of the message editing text_view */ - -- PangoFontDescription *font_desc; - fontstr = ggadu_config_var_get(gui_handler, "msg_out_edit_font"); - font_desc = pango_font_description_from_string (fontstr); - gtk_widget_modify_font (input, font_desc); diff -Naru /usr/ports/polish/gnugadu2/files/patch-src_plugins_GUI_gui__preferences.c gnugadu2/files/patch-src_plugins_GUI_gui__preferences.c --- /usr/ports/polish/gnugadu2/files/patch-src_plugins_GUI_gui__preferences.c Sat Oct 8 01:21:12 2005 +++ gnugadu2/files/patch-src_plugins_GUI_gui__preferences.c Thu Jan 1 01:00:00 1970 @@ -1,30 +0,0 @@ ---- src/plugins/GUI/gui_preferences.c.orig Fri Aug 12 10:21:26 2005 -+++ src/plugins/GUI/gui_preferences.c Fri Oct 7 12:38:50 2005 -@@ -1329,6 +1329,9 @@ - { - GSList *combo_theme_slist; - GSList *combo_icons_slist; -+ GSList *combo_skins_slist; -+ GSList *dict_slist; -+ - if (plugins_updated) - { - GIOChannel *ch = g_io_channel_new_file(g_build_filename(config->configdir, "modules.load", NULL), "w", -@@ -1362,7 +1365,7 @@ - ggadu_config_var_set(gui_handler, "use_spell", (gpointer) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(entry))); - - entry = g_object_get_data(G_OBJECT(chat_vbox), "combo_spell"); -- GSList *dict_slist = g_object_get_data(G_OBJECT(entry), "dictionary_slist"); -+ dict_slist = g_object_get_data(G_OBJECT(entry), "dictionary_slist"); - - g_return_if_fail(entry != NULL); - -@@ -1448,7 +1451,7 @@ - entry = g_object_get_data(G_OBJECT(adv_vbox), "combo_skins"); - g_return_if_fail(entry != NULL); - -- GSList *combo_skins_slist = g_object_get_data(G_OBJECT(entry), "combo_skins_slist"); -+ combo_skins_slist = g_object_get_data(G_OBJECT(entry), "combo_skins_slist"); - - if (gtk_combo_box_get_active(GTK_COMBO_BOX(entry))) { - ggadu_config_var_set(gui_handler, "skin", (gpointer) g_strdup(g_slist_nth_data(combo_skins_slist, gtk_combo_box_get_active(GTK_COMBO_BOX(entry))))); diff -Naru /usr/ports/polish/gnugadu2/files/patch-src_plugins_GUI_gui__userview.c gnugadu2/files/patch-src_plugins_GUI_gui__userview.c --- /usr/ports/polish/gnugadu2/files/patch-src_plugins_GUI_gui__userview.c Sat Oct 8 01:21:12 2005 +++ gnugadu2/files/patch-src_plugins_GUI_gui__userview.c Thu Jan 1 01:00:00 1970 @@ -1,24 +0,0 @@ ---- src/plugins/GUI/gui_userview.c.orig Fri Oct 7 12:31:16 2005 -+++ src/plugins/GUI/gui_userview.c Fri Oct 7 12:34:25 2005 -@@ -88,6 +88,8 @@ - GtkTreeIter * iter, gpointer data) - { - GGaduContact *k = NULL; -+ gchar *markup_descr; -+ gchar *markup; - - gtk_tree_model_get(model, iter, 2, &k, -1); - -@@ -165,10 +167,10 @@ - } - } - -- gchar *markup_descr = ggadu_config_var_get(gui_handler, "wrap_descr") ? -+ markup_descr = ggadu_config_var_get(gui_handler, "wrap_descr") ? - g_markup_escape_text(descr, strlen(descr)) : - g_markup_escape_text(k->status_descr, strlen(k->status_descr)); -- gchar *markup = g_strdup_printf("%s\n<small>%s</small>", k->nick, markup_descr); -+ markup = g_strdup_printf("%s\n<small>%s</small>", k->nick, markup_descr); - g_object_set(G_OBJECT(renderer), "text", NULL, "markup", markup, NULL); - g_free(markup_descr); - g_free(markup); diff -Naru /usr/ports/polish/gnugadu2/files/patch-src_plugins_aaway_aaway.c gnugadu2/files/patch-src_plugins_aaway_aaway.c --- /usr/ports/polish/gnugadu2/files/patch-src_plugins_aaway_aaway.c Sat Oct 8 01:21:12 2005 +++ gnugadu2/files/patch-src_plugins_aaway_aaway.c Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ ---- src/plugins/aaway/aaway.c.orig Fri Oct 7 13:04:11 2005 -+++ src/plugins/aaway/aaway.c Fri Oct 7 13:06:34 2005 -@@ -250,8 +250,10 @@ - static gpointer aaway_preferences(gpointer user_data) - { - GGaduDialog *d = ggadu_dialog_new(GGADU_DIALOG_CONFIG, _("Auto-Away Preferences"), "update config"); -+ gchar *utf; -+ - print_debug("%s: Preferences\n", "aaway"); -- gchar *utf = NULL; -+ utf = NULL; - ggadu_dialog_add_entry(d, GGADU_AAWAY_CONFIG_ENABLE_AUTOAWAY, _("Enable auto-away"), VAR_BOOL, (gpointer) ggadu_config_var_get(handler, "enable"), VAR_FLAG_ADVANCED); - ggadu_dialog_add_entry(d, GGADU_AAWAY_CONFIG_INTERVAL, _("Auto away after time (minutes)"), VAR_INT, (gpointer) ggadu_config_var_get(handler, "interval"), VAR_FLAG_NONE); - ggadu_dialog_add_entry(d, GGADU_AAWAY_CONFIG_ENABLE_AWAY_MSG, _("Enable away message"), VAR_BOOL, diff -Naru /usr/ports/polish/gnugadu2/files/patch-src_plugins_jabber_jabber__login.c gnugadu2/files/patch-src_plugins_jabber_jabber__login.c --- /usr/ports/polish/gnugadu2/files/patch-src_plugins_jabber_jabber__login.c Sat Oct 8 01:21:12 2005 +++ gnugadu2/files/patch-src_plugins_jabber_jabber__login.c Thu Jan 1 01:00:00 1970 @@ -1,37 +0,0 @@ ---- src/plugins/jabber/jabber_login.c.orig Fri Oct 7 12:45:32 2005 -+++ src/plugins/jabber/jabber_login.c Fri Oct 7 13:08:49 2005 -@@ -42,6 +42,13 @@ - gchar *jid = g_strdup(ggadu_config_var_get(jabber_handler, "jid")); - gchar *server = NULL; - gchar *portstr = NULL; -+ gchar **proxy_userpass; -+ gchar **proxy_hostport; -+ gchar **auth; -+ /* proxy setting taken from EKG project */ -+ gint jabber_proxy_enabled; -+ gchar jabber_proxy_host; -+ gint jabber_proxy_port; - - g_static_mutex_lock(&connect_mutex); - -@@ -98,15 +105,14 @@ - 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; -+ jabber_proxy_enabled = 0; -+ jabber_proxy_host = NULL; - - if (ggadu_config_var_check(jabber_handler, "proxy")) - { -- gchar **auth = array_make((gchar *) ggadu_config_var_get(jabber_handler, "proxy"), "@", 0, 0, 0); -- gchar **proxy_userpass = NULL; -- gchar **proxy_hostport = NULL; -+ auth = array_make((gchar *) ggadu_config_var_get(jabber_handler, "proxy"), "@", 0, 0, 0); -+ proxy_userpass = NULL; -+ proxy_hostport = NULL; - - jabber_proxy_enabled = 1; - diff -Naru /usr/ports/polish/gnugadu2/files/patch-src_plugins_jabber_jabber__plugin.c gnugadu2/files/patch-src_plugins_jabber_jabber__plugin.c --- /usr/ports/polish/gnugadu2/files/patch-src_plugins_jabber_jabber__plugin.c Sat Oct 8 01:21:12 2005 +++ gnugadu2/files/patch-src_plugins_jabber_jabber__plugin.c Thu Jan 1 01:00:00 1970 @@ -1,20 +0,0 @@ ---- src/plugins/jabber/jabber_plugin.c.orig Fri Oct 7 12:41:09 2005 -+++ src/plugins/jabber/jabber_plugin.c Fri Oct 7 12:44:32 2005 -@@ -1458,6 +1458,8 @@ - - void start_plugin() - { -+ GGaduStatusPrototype *sp; -+ - p = g_new0(GGaduProtocol, 1); - p->display_name = g_strdup("Jabber"); - p->protocol_uri = g_strdup("xmpp:"); -@@ -1505,7 +1507,7 @@ - { - gint auto_status = (gint) ggadu_config_var_get(jabber_handler, "auto_status"); - print_debug("jabber: autoconneting"); -- GGaduStatusPrototype *sp = ggadu_find_status_prototype(p, auto_status ? auto_status : JABBER_STATUS_AVAILABLE); -+ sp = ggadu_find_status_prototype(p, auto_status ? auto_status : JABBER_STATUS_AVAILABLE); - jabber_change_status(sp, FALSE); - GGaduStatusPrototype_free(sp); - } diff -Naru /usr/ports/polish/gnugadu2/pkg-plist gnugadu2/pkg-plist --- /usr/ports/polish/gnugadu2/pkg-plist Thu Feb 23 11:38:42 2006 +++ gnugadu2/pkg-plist Wed Aug 16 16:10:37 2006 @@ -5,6 +5,8 @@ lib/gg2/libGUI_plugin.so lib/gg2/libaaway_plugin.la lib/gg2/libaaway_plugin.so +%%DBUS:%%lib/gg2/libdbus_plugin.la +%%DBUS:%%lib/gg2/libdbus_plugin.so %%DOCKAPP:%%lib/gg2/libdocklet_dockapp_plugin.la %%DOCKAPP:%%lib/gg2/libdocklet_dockapp_plugin.so %%DOCKLET:%%lib/gg2/libdocklet_system_tray_plugin.la @@ -37,6 +39,7 @@ lib/libgg2_core.so lib/libgg2_core.so.2 libdata/pkgconfig/gg2_core.pc +%%DBUS:%%share/dbus-1/services/org.freedesktop.im.GG.service share/gg2/pixmaps/arrow.png share/gg2/pixmaps/away.png share/gg2/pixmaps/emoticon.gif --- gnugadu.patch ends --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200609051456.k85Eur8j017591>