summaryrefslogtreecommitdiff
path: root/source/xap/pidgin
diff options
context:
space:
mode:
Diffstat (limited to 'source/xap/pidgin')
-rw-r--r--source/xap/pidgin/doinst.sh10
-rw-r--r--source/xap/pidgin/link-libirc-to-libsasl2.patch65
-rwxr-xr-xsource/xap/pidgin/pidgin.SlackBuild21
3 files changed, 22 insertions, 74 deletions
diff --git a/source/xap/pidgin/doinst.sh b/source/xap/pidgin/doinst.sh
new file mode 100644
index 00000000..1f8ff67d
--- /dev/null
+++ b/source/xap/pidgin/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
+
diff --git a/source/xap/pidgin/link-libirc-to-libsasl2.patch b/source/xap/pidgin/link-libirc-to-libsasl2.patch
deleted file mode 100644
index 2858ac99..00000000
--- a/source/xap/pidgin/link-libirc-to-libsasl2.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- ./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 cf28811b..106bfc73 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, 2013 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,12 @@
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:-5}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
@@ -44,8 +44,8 @@ PKG=$TMP/package-${PKGNAM}
rm -rf $PKG
mkdir -p $TMP $PKG
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
ARCHQUADLET=""
elif [ "$ARCH" = "s390" ]; then
@@ -79,6 +79,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+#autoreconf --force --install
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -95,6 +97,7 @@ CXXFLAGS="$SLKCFLAGS" \
--with-nss-libs=/usr/lib${LIBDIRSUFFIX}/ \
--with-nspr-includes="$(pkg-config --variable=includedir nspr)" \
--with-nspr-libs=/usr/lib${LIBDIRSUFFIX}/ \
+ --with-system-ssl-certs=/etc/ssl/certs \
--disable-vv \
--enable-gtkspell \
--enable-cyrus-sasl \
@@ -102,12 +105,11 @@ CXXFLAGS="$SLKCFLAGS" \
--disable-meanwhile \
--disable-avahi \
--disable-nm \
+ --with-gstreamer=1.0 \
--program-prefix= \
--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'
@@ -154,7 +156,7 @@ find $PKG -name .packlist | while read plist ; do
mv -f ${plist}.new ${plist}
done
-### add gaim-encryption
+### add pidgin-encryption
( cd $TMP
rm -rf pidgin-encryption-$PIDGINENC
tar xvf $CWD/pidgin-encryption-$PIDGINENC.tar.gz || exit 1
@@ -182,7 +184,7 @@ done
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
) || exit 1
-### end add gaim-encryption
+### end add pidgin-encryption
# Strip binaries:
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -222,6 +224,7 @@ cp -a \
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz