summaryrefslogtreecommitdiff
path: root/extra/libproxy
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-06-04 00:01:23 +0000
committerroot <root@rshg054.dnsready.net>2012-06-04 00:01:23 +0000
commit1e6588d64f084decf287a58b7ff93ff0ce4d0446 (patch)
tree29bf5b8778e1eb67871d9e6e8bb6e205bdde5db7 /extra/libproxy
parent80053e720288b6205a59c52c1b31c14a0f830989 (diff)
Mon Jun 4 00:01:23 UTC 2012
Diffstat (limited to 'extra/libproxy')
-rw-r--r--extra/libproxy/PKGBUILD13
-rw-r--r--extra/libproxy/libproxy-0.4.7-unistd.patch40
2 files changed, 50 insertions, 3 deletions
diff --git a/extra/libproxy/PKGBUILD b/extra/libproxy/PKGBUILD
index 5b1367bd5..ca6d9e2d0 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)
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 ../${pkgname}-${pkgver} \
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;
+