summaryrefslogtreecommitdiff
path: root/community/wvstreams
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-08-13 16:07:04 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-08-13 16:07:04 -0300
commite6b487980c858023cb4a3678f2d27f52c2a32596 (patch)
tree3a348db541d1a1ae1f356dd3970fff4910529558 /community/wvstreams
parentf08b6a2decf228473f030cfd49116c9fd0b05c37 (diff)
parent07a52495b8a64f14843878d6116151fbdb6deefb (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/bird/PKGBUILD community/ecryptfs-utils/PKGBUILD community/linux-tools/PKGBUILD community/qtcurve-kde4/PKGBUILD extra/audacity/PKGBUILD extra/cups/PKGBUILD extra/imagemagick/PKGBUILD extra/kdeadmin/PKGBUILD extra/kdepim/PKGBUILD extra/kradio/PKGBUILD extra/libimobiledevice/PKGBUILD extra/libmowgli/PKGBUILD extra/llvm/PKGBUILD extra/phonon-vlc/PKGBUILD extra/pycrypto/PKGBUILD extra/xorg-server/PKGBUILD libre/linux-libre/PKGBUILD libre/syslinux/PKGBUILD multilib-staging/gcc-multilib/PKGBUILD multilib/lib32-libldap/PKGBUILD staging/binutils/PKGBUILD staging/gcc/PKGBUILD staging/glibc/PKGBUILD testing/cronie/PKGBUILD testing/cryptsetup/PKGBUILD testing/krb5/PKGBUILD testing/lvm2/PKGBUILD testing/net-tools/PKGBUILD testing/systemd/PKGBUILD
Diffstat (limited to 'community/wvstreams')
-rw-r--r--community/wvstreams/PKGBUILD14
-rw-r--r--community/wvstreams/openssl-buildfix.patch14
-rw-r--r--community/wvstreams/wvstreams-4.6.1-gcc47.patch10
3 files changed, 34 insertions, 4 deletions
diff --git a/community/wvstreams/PKGBUILD b/community/wvstreams/PKGBUILD
index d6d506855..8bd07de60 100644
--- a/community/wvstreams/PKGBUILD
+++ b/community/wvstreams/PKGBUILD
@@ -1,25 +1,31 @@
-# $Id: PKGBUILD 59490 2011-11-26 18:58:32Z bluewind $
+# $Id: PKGBUILD 74964 2012-08-10 12:12:57Z bluewind $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
pkgname=wvstreams
pkgver=4.6.1
-pkgrel=3
+pkgrel=4
pkgdesc="A network programming library written in C++"
arch=('i686' 'x86_64' 'mips64el')
url="http://alumnit.ca/wiki/?page=WvStreams"
license=('LGPL')
depends=('zlib' 'pam' 'xplc' 'openssl' 'readline')
source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
-wvstreams-4.6.1-glibc212.patch)
+wvstreams-4.6.1-glibc212.patch wvstreams-4.6.1-gcc47.patch openssl-buildfix.patch)
md5sums=('2760dac31a43d452a19a3147bfde571c'
- '5f6e24864209055239cb4e7c9bbd4a41')
+ '5f6e24864209055239cb4e7c9bbd4a41'
+ '918be13d35205385a39077403ce36388'
+ 'df423c68134a09439b3961c34635e0b4')
options=('!makeflags')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+
patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch"
+ patch -p1 -i "$srcdir/wvstreams-4.6.1-gcc47.patch"
+ patch -p1 -i "$srcdir/openssl-buildfix.patch"
+
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
diff --git a/community/wvstreams/openssl-buildfix.patch b/community/wvstreams/openssl-buildfix.patch
new file mode 100644
index 000000000..1b0445d9e
--- /dev/null
+++ b/community/wvstreams/openssl-buildfix.patch
@@ -0,0 +1,14 @@
+--- wvstreams-4.6.1/crypto/wvx509.cc 2008-10-23 22:23:49.000000000 +0200
++++ wvstreams-4.6.1-1/crypto/wvx509.cc 2010-01-27 11:09:06.000000000 +0100
+@@ -1157,7 +1157,11 @@
+
+ if (ext)
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++ const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
++#else
+ X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
++#endif
+ if (!method)
+ {
+ WvDynBuf buf; \ No newline at end of file
diff --git a/community/wvstreams/wvstreams-4.6.1-gcc47.patch b/community/wvstreams/wvstreams-4.6.1-gcc47.patch
new file mode 100644
index 000000000..3d6704832
--- /dev/null
+++ b/community/wvstreams/wvstreams-4.6.1-gcc47.patch
@@ -0,0 +1,10 @@
+--- wvstreams-4.6.1-dist/include/wvuid.h 2012-01-05 10:18:58.713661236 +0100
++++ wvstreams-4.6.1/include/wvuid.h 2012-01-05 10:27:42.198435328 +0100
+@@ -7,6 +7,7 @@
+ #ifndef __WVUID_H
+ #define __WVUID_H
+
++#include <unistd.h>
+ #include "wvstring.h"
+
+ #if WIN32