[arch-commits] Commit in libproxy/repos (4 files)
Florian Pritz
bluewind at archlinux.org
Sat Jun 2 10:26:38 UTC 2012
Date: Saturday, June 2, 2012 @ 06:26:38
Author: bluewind
Revision: 160494
db-move: moved libproxy from [testing] to [extra] (i686)
Added:
libproxy/repos/extra-i686/PKGBUILD
(from rev 160459, libproxy/repos/testing-i686/PKGBUILD)
libproxy/repos/extra-i686/libproxy-0.4.7-unistd.patch
(from rev 160459, libproxy/repos/testing-i686/libproxy-0.4.7-unistd.patch)
Deleted:
libproxy/repos/extra-i686/PKGBUILD
libproxy/repos/testing-i686/
-----------------------------+
PKGBUILD | 87 ++++++++++++++++++++++--------------------
libproxy-0.4.7-unistd.patch | 40 +++++++++++++++++++
2 files changed, 87 insertions(+), 40 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-06-02 10:26:36 UTC (rev 160493)
+++ extra-i686/PKGBUILD 2012-06-02 10:26:38 UTC (rev 160494)
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 24494 2009-01-17 20:42:01Z jgc $
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=libproxy
-pkgver=0.4.7
-pkgrel=1
-pkgdesc="A library that provides automatic proxy configuration management"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gcc-libs')
-optdepends=('kdelibs: KDE configuration module'
- 'networkmanager: NetworkManager configuration module'
- 'perl: Perl bindings'
- '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)
-options=('!libtool')
-md5sums=('509e03a488a61cd62bfbaf3ab6a2a7a5')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \
- -DCMAKE_SKIP_RPATH=ON \
- -DPERL_VENDORINSTALL=yes \
- -DCMAKE_BUILD_TYPE=Release \
- -DWITH_WEBKIT=OFF \
- -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
- -DCMAKE_C_FLAGS="${CFLAGS}"
- make
-}
-
-package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install
-}
Copied: libproxy/repos/extra-i686/PKGBUILD (from rev 160459, libproxy/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-06-02 10:26:38 UTC (rev 160494)
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 24494 2009-01-17 20:42:01Z jgc $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=libproxy
+pkgver=0.4.7
+pkgrel=2
+pkgdesc="A library that provides automatic proxy configuration management"
+arch=(i686 x86_64)
+license=('LGPL')
+depends=('gcc-libs')
+optdepends=('kdelibs: KDE configuration module'
+ 'networkmanager: NetworkManager configuration module'
+ 'perl: Perl bindings'
+ '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
+ libproxy-0.4.7-unistd.patch)
+options=('!libtool')
+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} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DPERL_VENDORINSTALL=yes \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DWITH_WEBKIT=OFF \
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+ -DCMAKE_C_FLAGS="${CFLAGS}"
+ make
+}
+
+package() {
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}" install
+}
Copied: libproxy/repos/extra-i686/libproxy-0.4.7-unistd.patch (from rev 160459, libproxy/repos/testing-i686/libproxy-0.4.7-unistd.patch)
===================================================================
--- extra-i686/libproxy-0.4.7-unistd.patch (rev 0)
+++ extra-i686/libproxy-0.4.7-unistd.patch 2012-06-02 10:26:38 UTC (rev 160494)
@@ -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;
+
More information about the arch-commits
mailing list