[csw-devel] SF.net SVN: gar:[8827] csw/mgar/pkg/pidgin/trunk

bensons at users.sourceforge.net bensons at users.sourceforge.net
Thu Feb 25 18:47:32 CET 2010


Revision: 8827
          http://gar.svn.sourceforge.net/gar/?rev=8827&view=rev
Author:   bensons
Date:     2010-02-25 17:47:24 +0000 (Thu, 25 Feb 2010)

Log Message:
-----------
pidgin: bumped to version 2.6.6, will build against our new perl, still some missing symbols, anyone eager to have a look at? beside that, pidgin runs fine :-)

Modified Paths:
--------------
    csw/mgar/pkg/pidgin/trunk/Makefile
    csw/mgar/pkg/pidgin/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-Makefile.in
    csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-common-Makefile.PL.in
    csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-Makefile.in
    csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugin.c
    csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-Makefile.in
    csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-common-Makefile.PL.in

Modified: csw/mgar/pkg/pidgin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pidgin/trunk/Makefile	2010-02-25 17:45:44 UTC (rev 8826)
+++ csw/mgar/pkg/pidgin/trunk/Makefile	2010-02-25 17:47:24 UTC (rev 8827)
@@ -1,7 +1,7 @@
 # $Id$
 
 GARNAME = pidgin
-GARVERSION = 2.6.5
+GARVERSION = 2.6.6
 CATEGORIES = apps
 
 DESCRIPTION = Multi-protocol IM client
@@ -20,12 +20,16 @@
 CONFIGURE_ARGS += '--enable-gnutls=yes'
 CONFIGURE_ARGS += '--disable-nss'
 CONFIGURE_ARGS += '--disable-avahi'
+CONFIGURE_ARGS += '--disable-screensaver'
 CONFIGURE_ARGS += '--disable-nm'
 CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
 CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib
 CONFIGURE_ARGS += --disable-vv
 
 
+EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so
 PATH = $(SOS11_CC_HOME)/bin:$(PATH)
 EXTRA_EXPORTS = PATH
 
@@ -55,9 +59,16 @@
 RUNTIME_DEP_PKGS += CSWlibcairo CSWlibdbus CSWlibxml2 CSWmeanwhile CSWncurses
 RUNTIME_DEP_PKGS += CSWpango CSWperl CSWpython CSWsilctoolkit CSWstartupnotif
 RUNTIME_DEP_PKGS += CSWtcl CSWtk CSWiconv CSWsunmath CSWzlib CSWdbus
-RUNTIME_DEP_PKGS += CSWfconfig CSWftype2 CSWlibx11 CSWbdb CSWlibidn
+RUNTIME_DEP_PKGS += CSWfconfig CSWftype2 CSWlibx11 CSWbdb47 CSWlibidn
+RUNTIME_DEP_PKGS += CSWlibice CSWlibxext CSWlibsm CSWgstplugins
 
-
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWlibdbusdev CSWdbusglibdev CSWgnutlsdevel
 
+PATCHFILES += patch-pidgin-Makefile.in
+PATCHFILES += patch-pidgin-plugin.c
+PATCHFILES += patch-pidgin-plugins-perl-Makefile.in
+PATCHFILES += patch-pidgin-plugins-perl-common-Makefile.PL.in
+PATCHFILES += patch-libpurple-plugins-perl-Makefile.in
+PATCHFILES += patch-libpurple-plugins-perl-common-Makefile.PL.in
+
 include gar/category.mk

Modified: csw/mgar/pkg/pidgin/trunk/checksums
===================================================================
--- csw/mgar/pkg/pidgin/trunk/checksums	2010-02-25 17:45:44 UTC (rev 8826)
+++ csw/mgar/pkg/pidgin/trunk/checksums	2010-02-25 17:47:24 UTC (rev 8827)
@@ -1 +1,7 @@
-93306b1eff371fc28af580a2dc9679e6  download/pidgin-2.6.5.tar.gz
+5043a5a5a6fd671631782a4562add729  patch-libpurple-plugins-perl-Makefile.in
+685473080941d793ab08338c66a81e71  patch-libpurple-plugins-perl-common-Makefile.PL.in
+99f3067ed65d2003f48629ebba5acc3d  patch-pidgin-Makefile.in
+37b9ed69736f803cc30eadc562d4b61c  patch-pidgin-plugin.c
+21aa84e80b62704aef90d90bb075f083  patch-pidgin-plugins-perl-Makefile.in
+c643897c7eef3aefd713db4fa99e64e4  patch-pidgin-plugins-perl-common-Makefile.PL.in
+29109672ea90e901b6bbebb09487e50f  pidgin-2.6.6.tar.gz

Added: csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-Makefile.in
===================================================================
--- csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-Makefile.in	                        (rev 0)
+++ csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-Makefile.in	2010-02-25 17:47:24 UTC (rev 8827)
@@ -0,0 +1,25 @@
+--- pidgin-2.6.6.orig/libpurple/plugins/perl/Makefile.in	2010-02-16 10:34:23.000000000 +0100
++++ pidgin-2.6.6/libpurple/plugins/perl/Makefile.in	2010-02-25 17:26:31.537969797 +0100
+@@ -798,7 +798,7 @@
+ 			${LN_S} -f $$srcloc/$$f $$f; \
+ 		done; \
+ 	fi
+-	@cd common && $(perlpath) Makefile.PL
++	@cd common && $(perlpath) Makefile.PL INSTALLDIRS=vendor
+ 
+ common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+@@ -807,10 +807,10 @@
+ 	@for dir in $(perl_dirs); do \
+ 		cd $$dir && \
+ 		if [ ! -f Makefile ]; then \
+-			$(perlpath) Makefile.PL; \
++			$(perlpath) Makefile.PL INSTALLDIRS=vendor; \
+ 		fi && \
+-		($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
+-		 $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
++		($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS) $(PERL_LIBS)" $(PERL_EXTRA_OPTS) || \
++		 $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS) $(PERL_LIBS)" $(PERL_EXTRA_OPTS)) && \
+ 		cd ..; \
+ 	done
+ 

Added: csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-common-Makefile.PL.in
===================================================================
--- csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-common-Makefile.PL.in	                        (rev 0)
+++ csw/mgar/pkg/pidgin/trunk/files/patch-libpurple-plugins-perl-common-Makefile.PL.in	2010-02-25 17:47:24 UTC (rev 8827)
@@ -0,0 +1,10 @@
+--- pidgin-2.6.6.orig/libpurple/plugins/perl/common/Makefile.PL.in	2010-02-16 10:34:06.000000000 +0100
++++ pidgin-2.6.6/libpurple/plugins/perl/common/Makefile.PL.in	2010-02-25 18:18:46.653361400 +0100
+@@ -11,6 +11,7 @@
+        AUTHOR           => 'Purple <http://pidgin.im/>') : ()),
+     'DEFINE'            => '@DEBUG_CFLAGS@',
+     'INC'               => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_srcdir@/libpurple @GLIB_CFLAGS@',
++    'LIBS'              => '@PERL_LIBS@',
+     'OBJECT'            => '$(O_FILES)', # link all the C files too
+ #    'OPTIMIZE'          => '-g', # For debugging
+     'INSTALLDIRS'          => 'vendor',

Added: csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-Makefile.in
===================================================================
--- csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-Makefile.in	                        (rev 0)
+++ csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-Makefile.in	2010-02-25 17:47:24 UTC (rev 8827)
@@ -0,0 +1,10 @@
+--- pidgin-2.6.6.orig/pidgin/Makefile.in	2010-02-16 10:34:30.000000000 +0100
++++ pidgin-2.6.6/pidgin/Makefile.in	2010-02-25 17:32:26.985892766 +0100
+@@ -695,6 +695,7 @@
+ @ENABLE_GTK_TRUE@	$(DBUS_LIBS) \
+ @ENABLE_GTK_TRUE@	$(GSTREAMER_LIBS) \
+ @ENABLE_GTK_TRUE@	$(XSS_LIBS) \
++ at ENABLE_GTK_TRUE@	$(X11_LIBS) \
+ @ENABLE_GTK_TRUE@	$(SM_LIBS) \
+ @ENABLE_GTK_TRUE@	$(INTLLIBS) \
+ @ENABLE_GTK_TRUE@	$(GTKSPELL_LIBS) \

Added: csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugin.c
===================================================================
--- csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugin.c	                        (rev 0)
+++ csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugin.c	2010-02-25 17:47:24 UTC (rev 8827)
@@ -0,0 +1,11 @@
+--- pidgin-2.6.6.orig/libpurple/plugin.c	2010-02-16 10:34:06.000000000 +0100
++++ pidgin-2.6.6/libpurple/plugin.c	2010-02-25 12:01:40.545624295 +0100
+@@ -876,7 +876,7 @@
+ 		 * it keeps all the plugins open, meaning that valgrind is able to
+ 		 * resolve symbol names in leak traces from plugins.
+ 		 */
+-		if (!g_getenv("PURPLE_LEAKCHECK_HELP") && !RUNNING_ON_VALGRIND)
++		if (!g_getenv("PURPLE_LEAKCHECK_HELP"))
+ 		{
+ 			if (plugin->handle != NULL)
+ 				g_module_close(plugin->handle);

Added: csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-Makefile.in
===================================================================
--- csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-Makefile.in	                        (rev 0)
+++ csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-Makefile.in	2010-02-25 17:47:24 UTC (rev 8827)
@@ -0,0 +1,25 @@
+--- pidgin-2.6.6.orig/pidgin/plugins/perl/Makefile.in	2010-02-16 10:34:32.000000000 +0100
++++ pidgin-2.6.6/pidgin/plugins/perl/Makefile.in	2010-02-25 17:25:56.810869007 +0100
+@@ -604,7 +604,7 @@
+ 			${LN_S} -f $$srcloc/$$f $$f; \
+ 		done; \
+ 	fi
+-	@cd common && $(perlpath) Makefile.PL
++	@cd common && $(perlpath) Makefile.PL INSTALLDIRS=vendor
+ 
+ common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+@@ -613,10 +613,10 @@
+ 	@for dir in $(perl_dirs); do \
+ 		cd $$dir && \
+ 		if [ ! -f Makefile ]; then \
+-			$(perlpath) Makefile.PL; \
++			$(perlpath) Makefile.PL INSTALLDIRS=vendor; \
+ 		fi && \
+-		($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
+-		$(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
++		($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS) $(PERL_LIBS)" $(PERL_EXTRA_OPTS) || \
++		$(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS) $(PERL_LIBS)" $(PERL_EXTRA_OPTS)) && \
+ 		cd ..; \
+ 	done
+ 

Added: csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-common-Makefile.PL.in
===================================================================
--- csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-common-Makefile.PL.in	                        (rev 0)
+++ csw/mgar/pkg/pidgin/trunk/files/patch-pidgin-plugins-perl-common-Makefile.PL.in	2010-02-25 17:47:24 UTC (rev 8827)
@@ -0,0 +1,10 @@
+--- pidgin-2.6.6.orig/pidgin/plugins/perl/common/Makefile.PL.in	2010-02-16 10:34:06.000000000 +0100
++++ pidgin-2.6.6/pidgin/plugins/perl/common/Makefile.PL.in	2010-02-25 18:10:57.385636308 +0100
+@@ -10,6 +10,7 @@
+        'AUTHOR'        => 'Pidgin <http://pidgin.im/>') :  ()),
+     'DEFINE'        => '@DEBUG_CFLAGS@',
+     'INC'           => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_srcdir@/libpurple -I at top_srcdir@/pidgin @GTK_CFLAGS@',
++    'LIBS'          => '@PERL_LIBS@',
+     'OBJECT'        => '$(O_FILES)', # link all the C files too
+     'TYPEMAPS'      => ["@top_srcdir@/libpurple/plugins/perl/common/typemap"],
+ #    'OPTIMIZE'      => '-g', # For debugging.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list