diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-29 12:36:05 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-29 12:36:05 -0300 |
| commit | 6f36350b7b59dd4ccea3dd878938dd47b77a1608 (patch) | |
| tree | 6e81bc69d8bba80912b0f7f9224f82bda2d96792 /community/wvstreams | |
| parent | e40531aab32ff93b1f9da20d8a43a440d8dffaca (diff) | |
| parent | 83c3c42a38bda36bdc56d594318958bc4cfd9b32 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/percona-server/PKGBUILD
community/qdevelop/PKGBUILD
core/openssh/PKGBUILD
extra/colord/PKGBUILD
extra/enblend-enfuse/PKGBUILD
extra/mesa/PKGBUILD
extra/telepathy-kde-contact-list/PKGBUILD
extra/vim/PKGBUILD
multilib/lib32-mesa/PKGBUILD
Diffstat (limited to 'community/wvstreams')
| -rw-r--r-- | community/wvstreams/PKGBUILD | 11 | ||||
| -rw-r--r-- | community/wvstreams/wvstreams-4.6.1-glibc212.patch | 24 |
2 files changed, 31 insertions, 4 deletions
diff --git a/community/wvstreams/PKGBUILD b/community/wvstreams/PKGBUILD index 81bd87127..d6d506855 100644 --- a/community/wvstreams/PKGBUILD +++ b/community/wvstreams/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 49019 2011-06-09 20:53:15Z andrea $ +# $Id: PKGBUILD 59490 2011-11-26 18:58:32Z bluewind $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=wvstreams pkgver=4.6.1 -pkgrel=2 +pkgrel=3 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) -md5sums=('2760dac31a43d452a19a3147bfde571c') +source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz +wvstreams-4.6.1-glibc212.patch) +md5sums=('2760dac31a43d452a19a3147bfde571c' + '5f6e24864209055239cb4e7c9bbd4a41') options=('!makeflags') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/community/wvstreams/wvstreams-4.6.1-glibc212.patch b/community/wvstreams/wvstreams-4.6.1-glibc212.patch new file mode 100644 index 000000000..eb3e9b631 --- /dev/null +++ b/community/wvstreams/wvstreams-4.6.1-glibc212.patch @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/333301 +https://bugs.archlinux.org/task/27188 + +--- ipstreams/wvunixdgsocket.cc ++++ ipstreams/wvunixdgsocket.cc +@@ -1,5 +1,5 @@ + #include "wvunixdgsocket.h" +-#ifdef MACOS ++#if defined(MACOS) || defined(__GNUC__) + #include <sys/types.h> + #include <sys/stat.h> + #endif +--- streams/wvatomicfile.cc ++++ streams/wvatomicfile.cc +@@ -11,7 +11,8 @@ + #include "wvfileutils.h" + #include "wvstrutils.h" + +-#ifdef MACOS ++#if defined(MACOS) || defined(__GNUC__) ++#include <sys/types.h> + #include <sys/stat.h> + #endif + |