Date: Tue, 2 Mar 2004 14:46:10 +0100 (CET) From: Piotr Smyrak <smyru@beth.poprostu.pl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/63640: [patch] update polish/gnugadu2 to pre7 Message-ID: <200403021346.i22DkATZ070028@beth.poprostu.pl> Resent-Message-ID: <200403021350.i22Do9JS018571@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63640 >Category: ports >Synopsis: [patch] update polish/gnugadu2 to pre7 >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 Mar 02 05:50:08 PST 2004 >Closed-Date: >Last-Modified: >Originator: Piotr Smyrak >Release: FreeBSD 5.2.1-RELEASE i386 >Organization: >Environment: System: FreeBSD ntbk 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #0: Thu Feb 26 18:55:33 CET 2004 root@ntbk:/usr/obj/usr/src/sys/SMYRU i386 >Description: The attached patch updates the port to recently released version 2.0 pre7 >How-To-Repeat: N/A >Fix: --- gnugadu2.patch begins here --- diff -Naru gnugadu2.orig/Makefile gnugadu2/Makefile --- gnugadu2.orig/Makefile Wed Feb 18 11:04:48 2004 +++ gnugadu2/Makefile Tue Mar 2 14:20:08 2004 @@ -6,12 +6,11 @@ # PORTNAME= gnugadu2 -PORTVERSION= 2.0.p6 -PORTREVISION= 2 +PORTVERSION= 2.0.p7 CATEGORIES= polish net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ggadu -DISTNAME= gg2-${PORTVERSION:S/.p6/pre6/} +DISTNAME= gg2-${PORTVERSION:S/.p7/pre7/} MAINTAINER= smyru@heron.pl COMMENT= GTK2 based Gadu-Gadu client for X11 @@ -143,6 +142,7 @@ 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 .endif .if exists(${LOCALBASE}/lib/libkdecore.so) ${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${LOCALBASE}/share/applnk/Internet diff -Naru gnugadu2.orig/distinfo gnugadu2/distinfo --- gnugadu2.orig/distinfo Thu Jan 22 10:20:07 2004 +++ gnugadu2/distinfo Sun Feb 22 15:17:42 2004 @@ -1 +1,2 @@ -MD5 (gg2-2.0pre6.tar.bz2) = a22e307e31605986169ec94af600bac5 +MD5 (gg2-2.0pre7.tar.bz2) = 855526fd075bfbd739a8bc823b2aa0ac +SIZE (gg2-2.0pre7.tar.bz2) = 893819 diff -Naru gnugadu2.orig/files/patch-gg2.desktop gnugadu2/files/patch-gg2.desktop --- gnugadu2.orig/files/patch-gg2.desktop Sat Feb 14 14:56:45 2004 +++ gnugadu2/files/patch-gg2.desktop Thu Jan 1 01:00:00 1970 @@ -1,15 +0,0 @@ ---- gg2.desktop.orig Wed Jan 14 20:37:47 2004 -+++ gg2.desktop Fri Jan 30 17:18:58 2004 -@@ -3,9 +3,10 @@ - Encoding=UTF-8 - Name=GNU Gadu - Comment=Instant Messanger Client --Comment[pl]=Wolne Gadanie -+Comment[pl]=Free-wolne Gadanie - TryExec=gg2 --Icon=gg2.png -+Exec=gg2 -+Icon=%%PREFIX%%/share/gg2/pixmaps/icon.png - Terminal=false - Type=Application - Categories=Application;Network;InstantMessaging;GTK; diff -Naru gnugadu2.orig/files/patch-po::Makefile.in.in gnugadu2/files/patch-po::Makefile.in.in --- gnugadu2.orig/files/patch-po::Makefile.in.in Fri Jan 16 00:48:06 2004 +++ gnugadu2/files/patch-po::Makefile.in.in Sun Feb 22 15:17:42 2004 @@ -1,11 +1,11 @@ ---- po/Makefile.in.in.orig Sun Dec 14 21:44:41 2003 -+++ po/Makefile.in.in Sun Dec 14 21:45:44 2003 -@@ -27,7 +27,7 @@ +--- 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 = $(prefix)/@DATADIRNAME@ + datadir = @datadir@ -localedir = $(datadir)/locale +localedir = $(prefix)/share/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/glib-2.0/gettext/po - subdir = po + gettextsrcdir = $(datadir)/gettext/po + + INSTALL = @INSTALL@ diff -Naru gnugadu2.orig/files/patch-src::plugins::jabber::jabber_plugin.c gnugadu2/files/patch-src::plugins::jabber::jabber_plugin.c --- gnugadu2.orig/files/patch-src::plugins::jabber::jabber_plugin.c Thu Jan 1 01:00:00 1970 +++ gnugadu2/files/patch-src::plugins::jabber::jabber_plugin.c Mon Feb 23 22:47:59 2004 @@ -0,0 +1,16 @@ +--- src/plugins/jabber/jabber_plugin.c.orig Tue Feb 17 17:12:25 2004 ++++ src/plugins/jabber/jabber_plugin.c Mon Feb 23 22:45:48 2004 +@@ -235,11 +235,12 @@ + { + GSList *user = (GSList *) user_data; + GGaduContact *k = NULL; ++ LmMessage *m = NULL; + + if (!user) return NULL; + + k = (GGaduContact *) user->data; +- LmMessage *m = lm_message_new_with_sub_type(k->id, LM_MESSAGE_TYPE_PRESENCE, LM_MESSAGE_SUB_TYPE_SUBSCRIBE); ++ m = lm_message_new_with_sub_type(k->id, LM_MESSAGE_TYPE_PRESENCE, LM_MESSAGE_SUB_TYPE_SUBSCRIBE); + lm_connection_send(connection, m, NULL); + lm_message_unref(m); + return NULL; diff -Naru gnugadu2.orig/pkg-plist gnugadu2/pkg-plist --- gnugadu2.orig/pkg-plist Thu Jan 22 10:20:07 2004 +++ gnugadu2/pkg-plist Tue Mar 2 14:18:37 2004 @@ -223,7 +223,6 @@ share/gg2/pixmaps/icons/rozgwiazda/gadu-gadu-offline.png share/gg2/pixmaps/icons/rozgwiazda/gadu-gadu-online-descr.png share/gg2/pixmaps/icons/rozgwiazda/gadu-gadu-online.png -share/gg2/pixmaps/icons/rozgwiazda/gadu-gadu.png share/gg2/pixmaps/icons/rozgwiazda/icon.png share/gg2/pixmaps/icons/rozgwiazda/jabber.png share/gg2/pixmaps/icons/rozgwiazda/license.txt @@ -256,6 +255,7 @@ share/gg2/pixmaps/new-msg.png share/gg2/pixmaps/offline.png share/gg2/pixmaps/online.png +share/gg2/pixmaps/send-im.png share/gg2/pixmaps/show-hide-inactive.png share/gg2/pixmaps/sms.png share/gg2/pixmaps/sms_i.png @@ -284,7 +284,9 @@ share/gg2/themes/vred2.theme share/gg2/themes/white2.theme %%GNOME:%%share/gnome/apps/Internet/gg2.desktop +%%GNOME:%%share/gnome/pixmaps/gg2.png share/locale/pl/LC_MESSAGES/gg2.mo +share/pixmaps/gg2.png @dirrm share/gg2/themes @dirrm share/gg2/sounds @dirrm share/gg2/pixmaps/icons/tlen-3d --- gnugadu2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403021346.i22DkATZ070028>