diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-04 13:43:14 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-04 13:43:14 -0300 |
| commit | cbba2111ae585b17594535ec01f13bac66937331 (patch) | |
| tree | f097dd36996ae3c7c96c9f91c1dd428670572b80 /extra/libproxy | |
| parent | abcaa80b2d3bb539503c485bfea891adc7ffc193 (diff) | |
| parent | 1e6588d64f084decf287a58b7ff93ff0ce4d0446 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/multipath-tools/PKGBUILD
community/perl-gnome2-wnck/PKGBUILD
community/znc/PKGBUILD
core/openldap/PKGBUILD
extra/mod_perl/PKGBUILD
extra/perl-digest-nilsimsa/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/postgresql/PKGBUILD
extra/vim/PKGBUILD
extra/xcb-util-keysyms/PKGBUILD
extra/xcb-util-wm/PKGBUILD
extra/xournal/PKGBUILD
kde-unstable/kdepim/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-libxft/PKGBUILD
multilib/lib32-xcb-util/PKGBUILD
Diffstat (limited to 'extra/libproxy')
| -rw-r--r-- | extra/libproxy/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/libproxy/libproxy-0.4.7-unistd.patch | 40 |
2 files changed, 50 insertions, 3 deletions
diff --git a/extra/libproxy/PKGBUILD b/extra/libproxy/PKGBUILD index 7c0b48819..0ba1fb26e 100644 --- a/extra/libproxy/PKGBUILD +++ b/extra/libproxy/PKGBUILD @@ -3,7 +3,7 @@ pkgname=libproxy pkgver=0.4.7 -pkgrel=1 +pkgrel=2 pkgdesc="A library that provides automatic proxy configuration management" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -14,12 +14,19 @@ optdepends=('kdelibs: KDE configuration module' 'python2: Python bindings') makedepends=('cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl') url="http://libproxy.googlecode.com" -source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz + libproxy-0.4.7-unistd.patch) options=('!libtool') -md5sums=('509e03a488a61cd62bfbaf3ab6a2a7a5') +md5sums=('509e03a488a61cd62bfbaf3ab6a2a7a5' + 'e90c03f296e553ace347b46f4fea3625') build() { cd "${srcdir}" + + # Fix build with GCC 4.7 (patch from Fedora) + patch -d "${pkgname}-${pkgver}" -Np1 -i \ + "${srcdir}/libproxy-0.4.7-unistd.patch" + mkdir build cd build cmake \ diff --git a/extra/libproxy/libproxy-0.4.7-unistd.patch b/extra/libproxy/libproxy-0.4.7-unistd.patch new file mode 100644 index 000000000..803f81970 --- /dev/null +++ b/extra/libproxy/libproxy-0.4.7-unistd.patch @@ -0,0 +1,40 @@ +--- libproxy-0.4.7/libproxy/url.cpp.orig 2012-02-28 21:05:15.572948027 +0000 ++++ libproxy-0.4.7/libproxy/url.cpp 2012-02-28 21:05:45.635937474 +0000 +@@ -27,6 +27,7 @@ + #define close _close + #endif + #include <fcntl.h> // For ::open() ++#include <unistd.h> // For ::read() and ::close() + #include <cstring> // For memcpy() + #include <sstream> // For int/string conversion (using stringstream) + #include <cstdio> // For sscanf() +--- libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp.orig 2012-02-28 21:06:01.552943358 +0000 ++++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp 2012-02-28 21:11:21.429953982 +0000 +@@ -18,6 +18,7 @@ + ******************************************************************************/ + + #include <sys/stat.h> ++#include <unistd.h> + #include <cstdlib> + #include <map> + #include <fstream> +--- libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp.orig 2012-02-28 21:06:11.637943033 +0000 ++++ libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp 2012-02-28 21:11:46.560961409 +0000 +@@ -17,6 +17,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + ******************************************************************************/ + ++#include <unistd.h> // for ::gethostname() + #include <cstring> // ? + + #include "../extension_pacrunner.hpp" +--- libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp.orig 2012-02-28 21:06:29.615943614 +0000 ++++ libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp 2012-02-28 21:12:35.530965553 +0000 +@@ -17,6 +17,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + ******************************************************************************/ + ++#include <unistd.h> // for ::gethostname() + #include "../extension_pacrunner.hpp" + using namespace libproxy; + |