Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/chmsee/PKGBUILD
	community/projectm/PKGBUILD
	extra/apache/PKGBUILD
	extra/gv/PKGBUILD
	extra/libdc1394/PKGBUILD
	extra/libraw1394/PKGBUILD
	extra/samba/PKGBUILD
	extra/sg3_utils/PKGBUILD
	extra/upower/PKGBUILD
	extra/xf86-input-aiptek/PKGBUILD
	extra/xf86-video-modesetting/PKGBUILD
	extra/xorg-server/PKGBUILD
	libre/rp-pppoe-libre/PKGBUILD

2 files changed, 4 insertions, 50 deletions

diff --git a/extra/libproxy/PKGBUILD b/extra/libproxy/PKGBUILD
index 0ba1fb26e..70f9e5041 100644
--- a/extra/libproxy/PKGBUILD
+++ b/extra/libproxy/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libproxy
-pkgver=0.4.7
-pkgrel=2
+pkgver=0.4.11
+pkgrel=1
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
@@ -14,19 +14,13 @@ 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
-        libproxy-0.4.7-unistd.patch)
+source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')
-md5sums=('509e03a488a61cd62bfbaf3ab6a2a7a5'
-         'e90c03f296e553ace347b46f4fea3625')
+md5sums=('3cd1ae2a4abecf44b3f24d6639d2cd84')
 
 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
deleted file mode 100644
index 803f81970..000000000
--- a/extra/libproxy/libproxy-0.4.7-unistd.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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;
-