summaryrefslogtreecommitdiff
path: root/source/xap/pidgin
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2012-09-26 01:10:42 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 22:51:55 +0200
commit9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch)
treeb428a16618e36ed864a8d76ea3435e19a452bf90 /source/xap/pidgin
parent75a4a592e5ccda30715f93563d741b83e0dcf39e (diff)
downloadcurrent-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz
Slackware 14.0slackware-14.0
Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-)
Diffstat (limited to 'source/xap/pidgin')
-rw-r--r--source/xap/pidgin/fix-gmain_h-compile-error.diff17
-rwxr-xr-xsource/xap/pidgin/pidgin.SlackBuild24
-rw-r--r--source/xap/pidgin/purple-allow-sign-rsa-md5.patch12
3 files changed, 30 insertions, 23 deletions
diff --git a/source/xap/pidgin/fix-gmain_h-compile-error.diff b/source/xap/pidgin/fix-gmain_h-compile-error.diff
new file mode 100644
index 00000000..1e313cde
--- /dev/null
+++ b/source/xap/pidgin/fix-gmain_h-compile-error.diff
@@ -0,0 +1,17 @@
+Since glib-2.32, this is a common error:
+ In file included from rsa_nss.c:27:0:
+ /usr/include/glib-2.0/glib/gmain.h:21:2: error: #error "Only <glib.h> can be included directly."
+Let's fix it :)
+
+diff -Nur pidgin-encryption-3.1.orig/rsa_nss.c pidgin-encryption-3.1/rsa_nss.c
+--- pidgin-encryption-3.1.orig/rsa_nss.c 2010-04-25 20:53:46.000000000 -0500
++++ pidgin-encryption-3.1/rsa_nss.c 2012-05-01 22:58:18.033710803 -0500
+@@ -24,7 +24,7 @@
+ #include <debug.h>
+ #include <gtkdialogs.h>
+
+-#include "glib/gmain.h"
++#include <glib.h>
+
+ #include <string.h>
+ #include <assert.h>
diff --git a/source/xap/pidgin/pidgin.SlackBuild b/source/xap/pidgin/pidgin.SlackBuild
index bfefef2e..5fa20495 100755
--- a/source/xap/pidgin/pidgin.SlackBuild
+++ b/source/xap/pidgin/pidgin.SlackBuild
@@ -79,9 +79,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Allow certificates signed with rsa-md5:
-zcat $CWD/purple-allow-sign-rsa-md5.patch.gz | patch -p0 --verbose || exit 1
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -92,8 +89,12 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-dot=no \
--disable-schemas-install \
--enable-dbus \
- --enable-gnutls=yes \
- --enable-nss=no \
+ --enable-gnutls=no \
+ --enable-nss=yes \
+ --with-nss-includes="$(pkg-config --variable=includedir nss)" \
+ --with-nss-libs=/usr/lib${LIBDIRSUFFIX}/ \
+ --with-nspr-includes="$(pkg-config --variable=includedir nspr)" \
+ --with-nspr-libs=/usr/lib${LIBDIRSUFFIX}/ \
--disable-vv \
--enable-gtkspell \
--enable-cyrus-sasl \
@@ -113,9 +114,9 @@ make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
# Fix misplaced items:
-eval $(perl '-V:archlib')
+eval $(perl '-V:installvendorlib')
eval $(perl '-V:privlib')
-VENDORPERL="$(echo $archlib | sed -e "s/perl5/perl5\/vendor_perl/")"
+VENDORPERL="$(echo $installvendorlib)"
mkdir -vpm755 $PKG/$VENDORPERL/
find $PKG -type f -name perllocal.pod -exec mv -fv {} $PKG/$VENDORPERL/Pidgin.pod \;
@@ -156,6 +157,7 @@ done
rm -rf pidgin-encryption-$PIDGINENC
tar xvf $CWD/pidgin-encryption-$PIDGINENC.tar.gz || exit 1
cd pidgin-encryption-$PIDGINENC
+ zcat $CWD/fix-gmain_h-compile-error.diff.gz | patch -p1 --verbose || exit 1
PIDGIN_CFLAGS="-I${PKG}/usr/include/pidgin" \
PIDGIN_LIBS="-L${PKG}/usr/lib${LIBDIRSUFFIX}" \
PURPLE_CFLAGS="-I${PKG}/usr/include/libpurple" \
@@ -164,10 +166,10 @@ done
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--disable-static \
- --with-nss-includes=/usr/include/seamonkey/nss \
- --with-nspr-includes=/usr/include/seamonkey/nspr \
- --with-nss-libs=/usr/lib${LIBDIRSUFFIX}/seamonkey/ \
- --with-nspr-libs=/usr/lib${LIBDIRSUFFIX}/seamonkey/ \
+ --with-nss-includes="$(pkg-config --variable=includedir nss)" \
+ --with-nss-libs=/usr/lib${LIBDIRSUFFIX}/ \
+ --with-nspr-includes="$(pkg-config --variable=includedir nspr)" \
+ --with-nspr-libs=/usr/lib${LIBDIRSUFFIX}/ \
--program-prefix="" \
--program-suffix="" \
--build=$ARCH-slackware-linux$ARCHQUADLET || exit 1
diff --git a/source/xap/pidgin/purple-allow-sign-rsa-md5.patch b/source/xap/pidgin/purple-allow-sign-rsa-md5.patch
deleted file mode 100644
index d882a6e8..00000000
--- a/source/xap/pidgin/purple-allow-sign-rsa-md5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libpurple/plugins/ssl/ssl-gnutls.c.old 2008-10-17 18:58:31.000000000 +0200
-+++ libpurple/plugins/ssl/ssl-gnutls.c 2008-10-17 18:53:03.000000000 +0200
-@@ -693,7 +693,8 @@
- (Verisign and possibly others have
- root certificates that predate the
- current standard) */
-- GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT,
-+ GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT
-+ | GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD5,
- &verify);
-
- if (ret != 0) {