diff options
Diffstat (limited to 'source/xap/pidgin')
| -rw-r--r-- | source/xap/pidgin/link-libirc-to-libsasl2.patch | 65 | ||||
| -rwxr-xr-x | source/xap/pidgin/pidgin.SlackBuild | 6 |
2 files changed, 69 insertions, 2 deletions
diff --git a/source/xap/pidgin/link-libirc-to-libsasl2.patch b/source/xap/pidgin/link-libirc-to-libsasl2.patch new file mode 100644 index 000000000..2858ac994 --- /dev/null +++ b/source/xap/pidgin/link-libirc-to-libsasl2.patch @@ -0,0 +1,65 @@ +--- ./libpurple/protocols/irc/Makefile.am.orig 2013-02-11 03:16:52.000000000 -0600 ++++ ./libpurple/protocols/irc/Makefile.am 2013-02-15 15:18:32.950591016 -0600 +@@ -27,7 +27,7 @@ + st = + pkg_LTLIBRARIES = libirc.la + libirc_la_SOURCES = $(IRCSOURCES) +-libirc_la_LIBADD = $(GLIB_LIBS) ++libirc_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) + + endif + +--- ./libpurple/protocols/irc/Makefile.in.orig 2013-02-11 03:17:20.000000000 -0600 ++++ ./libpurple/protocols/irc/Makefile.in 2013-02-15 15:18:43.256590687 -0600 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.11.5 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -92,7 +92,8 @@ + am__installdirs = "$(DESTDIR)$(pkgdir)" + LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES) + am__DEPENDENCIES_1 = +-@STATIC_IRC_FALSE@libirc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) ++@STATIC_IRC_FALSE@libirc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++@STATIC_IRC_FALSE@ $(am__DEPENDENCIES_1) + am__libirc_la_SOURCES_DIST = cmds.c dcc_send.c irc.c irc.h msgs.c \ + parse.c + am__objects_1 = libirc_la-cmds.lo libirc_la-dcc_send.lo \ +@@ -415,7 +416,7 @@ + @STATIC_IRC_TRUE@libirc_la_SOURCES = $(IRCSOURCES) + @STATIC_IRC_TRUE@libirc_la_CFLAGS = $(AM_CFLAGS) + @STATIC_IRC_FALSE@pkg_LTLIBRARIES = libirc.la +-@STATIC_IRC_FALSE@libirc_la_LIBADD = $(GLIB_LIBS) ++@STATIC_IRC_FALSE@libirc_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) + AM_CPPFLAGS = \ + -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ +--- ./libpurple/protocols/irc/Makefile.orig 2013-02-15 15:16:32.812594857 -0600 ++++ ./libpurple/protocols/irc/Makefile 2013-02-15 15:18:53.684590354 -0600 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.11.5 from Makefile.am. + # libpurple/protocols/irc/Makefile. Generated from Makefile.in by configure. + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -92,7 +92,8 @@ + am__installdirs = "$(DESTDIR)$(pkgdir)" + LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES) + am__DEPENDENCIES_1 = +-libirc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) ++libirc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + am__libirc_la_SOURCES_DIST = cmds.c dcc_send.c irc.c irc.h msgs.c \ + parse.c + am__objects_1 = libirc_la-cmds.lo libirc_la-dcc_send.lo \ +@@ -415,7 +416,7 @@ + #libirc_la_SOURCES = $(IRCSOURCES) + #libirc_la_CFLAGS = $(AM_CFLAGS) + pkg_LTLIBRARIES = libirc.la +-libirc_la_LIBADD = $(GLIB_LIBS) ++libirc_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) + AM_CPPFLAGS = \ + -I$(top_srcdir)/libpurple \ + -I$(top_builddir)/libpurple \ diff --git a/source/xap/pidgin/pidgin.SlackBuild b/source/xap/pidgin/pidgin.SlackBuild index 5fa20495f..cf28811be 100755 --- a/source/xap/pidgin/pidgin.SlackBuild +++ b/source/xap/pidgin/pidgin.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PKGNAM=pidgin VERSION=${VERSION:-$(echo $PKGNAM-2.*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} PIDGINENC=${PIDGINENC:-3.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -106,6 +106,8 @@ CXXFLAGS="$SLKCFLAGS" \ --program-suffix= \ --build=$ARCH-slackware-linux$ARCHQUADLET || exit 1 +zcat $CWD/link-libirc-to-libsasl2.patch.gz | patch -p1 --verbose || exit 1 + # Fix install location: grep -lr -- "lib/perl" . | xargs sed -i 's?lib/perl?lib'"$LIBDIRSUFFIX"'/perl?g' |