diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
| commit | d07d53d7af1e9694d9558783841bc2df3124a90f (patch) | |
| tree | 40d68de204b29d3360efd654d3c458c9cdad3cd6 /community/net6 | |
| parent | a873bdc69d24650d832933463af71dfaa96f1a8a (diff) | |
| parent | 64e290184042563a240e2d6d15c02e06703d00ee (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/obconf/PKGBUILD
community/obconf/obconf.install
community/qstardict/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
extra/cups/PKGBUILD
extra/eject/PKGBUILD
extra/emacs/PKGBUILD
extra/evilwm/PKGBUILD
extra/fbset/PKGBUILD
extra/gmpc/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gtkpod/PKGBUILD
extra/kdepim/PKGBUILD
extra/kile/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/potrace/PKGBUILD
extra/racket/PKGBUILD
extra/soundtouch/PKGBUILD
extra/wireshark/PKGBUILD
extra/xpdf/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/lib32-acl/PKGBUILD
multilib/lib32-attr/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'community/net6')
| -rw-r--r-- | community/net6/PKGBUILD | 14 | ||||
| -rw-r--r-- | community/net6/build-fix.patch | 24 |
2 files changed, 32 insertions, 6 deletions
diff --git a/community/net6/PKGBUILD b/community/net6/PKGBUILD index a744a8c3b..8d38ad92a 100644 --- a/community/net6/PKGBUILD +++ b/community/net6/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 7956 2010-01-12 23:28:07Z giovanni $ +# $Id: PKGBUILD 54475 2011-08-18 15:08:16Z bluewind $ # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=net6 pkgver=1.3.12 -pkgrel=1 +pkgrel=2 pkgdesc="A library that provides a TCP protocol abstraction for C++" arch=('i686' 'x86_64' 'mips64el') url="http://gobby.0x539.de/" license=('LGPL') depends=('gnutls' 'libsigc++2.0') options=('!libtool') -source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('506776416d8aea2b9ea13a81f9145383') +source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz + build-fix.patch) +md5sums=('506776416d8aea2b9ea13a81f9145383' + '18ac67590d6bce0a0a4a6a21af8da429') build() { cd ${srcdir}/$pkgname-$pkgver - + patch -Rp1 <$srcdir/build-fix.patch ./configure --prefix=/usr - make || return 1 + make make DESTDIR=${pkgdir} install } diff --git a/community/net6/build-fix.patch b/community/net6/build-fix.patch new file mode 100644 index 000000000..7e932bce6 --- /dev/null +++ b/community/net6/build-fix.patch @@ -0,0 +1,24 @@ +diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp net6-1.3.12/inc/encrypt.hpp +--- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp 2011-08-09 00:19:29.000000000 +0400 ++++ net6-1.3.12/inc/encrypt.hpp 2009-11-15 16:02:46.000000000 +0300 +@@ -34,7 +34,7 @@ + typedef gnutls_anon_server_credentials gnutls_anon_server_credentials_t; + typedef gnutls_transport_ptr gnutls_transport_ptr_t; + typedef gnutls_dh_params gnutls_dh_params_t; +-//typedef gnutls_connection_end gnutls_connection_end_t; ++typedef gnutls_connection_end gnutls_connection_end_t; + + class dh_params: private net6::non_copyable + { +diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp net6-1.3.12/src/encrypt.cpp +--- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp 2011-08-09 00:20:12.000000000 +0400 ++++ net6-1.3.12/src/encrypt.cpp 2009-11-15 16:02:46.000000000 +0300 +@@ -25,7 +25,7 @@ + { + const unsigned int DH_BITS = 1024; + +- net6::gnutls_session_t create_session(gnutls_connection_end_t end) ++ net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end) + { + net6::gnutls_session_t session; + gnutls_init(&session, end); |