SF.net SVN: gar:[22296] csw/mgar/pkg/pidgin/trunk

[lblume at users.sourceforge.net]

Revision: 22296
          http://gar.svn.sourceforge.net/gar/?rev=22296&view=rev
Author:   lblume
Date:     2013-10-24 08:41:22 +0000 (Thu, 24 Oct 2013)
Log Message:
-----------
pidgin/trunk: libirc.so was not linked against libsasl2.so

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

Added Paths:
-----------
    csw/mgar/pkg/pidgin/trunk/files/0004-irc-with-sasl.patch

Modified: csw/mgar/pkg/pidgin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pidgin/trunk/Makefile	2013-10-23 21:08:05 UTC (rev 22295)
+++ csw/mgar/pkg/pidgin/trunk/Makefile	2013-10-24 08:41:22 UTC (rev 22296)
@@ -33,19 +33,17 @@
 CONFIGURE_ARGS += --enable-consoleui
 
 # We deffinitely want SASL
-### BREAKS IRC
-#CONFIGURE_ARGS += --enable-cyrus-sasl
+CONFIGURE_ARGS += --enable-cyrus-sasl
 
 # For msgfmt, msgmerge, xgettext and gettext to be used from GNU
 CONFIGURE_ENV_PATH = $(prefix)/gnu:$(PATH)
 
-CFLAGS = -xc99 -D_XPG6 -D__EXTENSIONS__
+EXTRA_CFLAGS  = -xc99 -D_XPG6 -D__EXTENSIONS__
+EXTRA_LD_OPTIONS = -z nolazyload
+
 NCURSES_HEADERS = /opt/csw/include/ncursesw
 EXTRA_CONFIGURE_EXPORTS += CFLAGS NCURSES_HEADERS
 TEST_SCRIPTS =
-# We define upstream file regex so we can be notifed of new upstream software release
-UPSTREAM_USE_SF = 1
-UFILES_REGEX = (\d+(?:\.\d+)*)
 
 EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod
 
@@ -85,7 +83,7 @@
 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgnutls28
 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsilc1-1-2
 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsilcclient1-1-3
-#RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsasl2-2
 
 BUILD_DEP_PKGS += CSWpkgconfig
 BUILD_DEP_PKGS += CSWlibxml2-dev
@@ -110,12 +108,13 @@
 BUILD_DEP_PKGS += CSWmeanwhile-dev
 BUILD_DEP_PKGS += CSWlibsilc-dev
 BUILD_DEP_PKGS += CSWgstreamer-dev
-#BUILD_DEP_PKGS += CSWsasl-dev
+BUILD_DEP_PKGS += CSWsasl-dev
 
 PATCHFILES += patch-pidgin-Makefile.in
 PATCHFILES += patch-pidgin-plugin.c
 PATCHFILES += patch-pidgin-plugins-perl-common-Makefile.PL.in
 PATCHFILES += patch-libpurple-plugins-perl-common-Makefile.PL.in
+PATCHFILES += 0004-irc-with-sasl.patch
 
 CHECKPKG_OVERRIDES_CSWpidgin += file-with-bad-content|/usr/local|root/opt/csw/lib/pidgin/musicmessaging.so 
 CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libgnt.so

Added: csw/mgar/pkg/pidgin/trunk/files/0004-irc-with-sasl.patch
===================================================================
--- csw/mgar/pkg/pidgin/trunk/files/0004-irc-with-sasl.patch	                        (rev 0)
+++ csw/mgar/pkg/pidgin/trunk/files/0004-irc-with-sasl.patch	2013-10-24 08:41:22 UTC (rev 22296)
@@ -0,0 +1,12 @@
+index b39690d..d362782 100644
+--- a/libpurple/protocols/irc/Makefile.in
++++ b/libpurple/protocols/irc/Makefile.in
+@@ -105,7 +105,7 @@ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ libirc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libirc_la_CFLAGS) \
+-	$(CFLAGS) $(libirc_la_LDFLAGS) $(LDFLAGS) -o $@
++	$(CFLAGS) $(libirc_la_LDFLAGS) $(LDFLAGS) $(SASL_LIBS) -o $@
+ @STATIC_IRC_FALSE at am_libirc_la_rpath = -rpath $(pkgdir)
+ @STATIC_IRC_TRUE at am_libirc_la_rpath =
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)

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