Date: Wednesday, May 5, 2010 @ 11:54:25 Author: ibiru Revision: 79671
upgpkg: libproxy 0.3.1-1 update to 0.3.1 Modified: libproxy/trunk/PKGBUILD libproxy/trunk/nm-dbus.patch ---------------+ PKGBUILD | 8 ++++---- nm-dbus.patch | 38 +++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 23 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-05-05 12:52:07 UTC (rev 79670) +++ PKGBUILD 2010-05-05 15:54:25 UTC (rev 79671) @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <[email protected]> pkgname=libproxy -pkgver=0.2.3 +pkgver=0.3.1 pkgrel=1 pkgdesc="A library that provides automatic proxy configuration management" arch=(i686 x86_64) @@ -13,11 +13,11 @@ 'gconf: GNOME plugin' 'networkmanager: NetworkManager plugin') url="http://libproxy.googlecode.com"; -source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz +source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 nm-dbus.patch) options=('!libtool') -md5sums=('86b635e1eb2d665cfbef4c6134fe6604' - '1bd7576d591889fd76cbf05d79cfe4af') +md5sums=('1745fe1bdf5beca1bf7269758f3906e8' + 'a56ee1519bc3640257430b5fe5540a38') build() { cd "${srcdir}/${pkgname}-${pkgver}" Modified: nm-dbus.patch =================================================================== --- nm-dbus.patch 2010-05-05 12:52:07 UTC (rev 79670) +++ nm-dbus.patch 2010-05-05 15:54:25 UTC (rev 79671) @@ -1,39 +1,39 @@ ---- libproxy-0.2.3/configure.ac 2008-06-05 22:56:16.000000000 +0200 -+++ libproxy-0.2.3.new/configure.ac 2009-01-07 13:42:48.000000000 +0100 -@@ -6,6 +6,7 @@ +diff -Nur libproxy-0.3.1.orig//configure.ac libproxy-0.3.1/configure.ac +--- libproxy-0.3.1.orig//configure.ac 2009-10-05 21:42:34.000000000 +0300 ++++ libproxy-0.3.1/configure.ac 2010-05-05 18:45:29.569107696 +0300 +@@ -7,6 +7,7 @@ ### Checks for programs. AC_PROG_CC AC_PROG_CPP +AM_PROG_CC_C_O + AC_PROG_CXX AC_PROG_INSTALL AC_PROG_LIBTOOL - AC_PROG_LN_S -@@ -19,8 +20,9 @@ - PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes, +@@ -34,8 +35,9 @@ [PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes, - [PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])]) --PKG_CHECK_MODULES(NetworkManager, NetworkManager, + [PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, + [PKG_CHECK_MODULES(mozjs, seamonkey-js, have_mozjs=yes,have_mozjs=no)])])]) +-PKG_CHECK_MODULES(NetworkManager, NetworkManager dbus-1, - have_networkmanager=yes, have_networkmanager=no) +PKG_CHECK_MODULES(NetworkManager, NetworkManager, -+ [PKG_CHECK_MODULES(DBUS, dbus-1, have_networkmanager=yes, have_networkmanager=no)], ++ [PKG_CHECK_MODULES(DBUS, dbus-1, have_networkmanager=yes, have_networkmanager=no)], + have_networkmanager=no) + PKG_CHECK_MODULES(QtCore, QtCore, have_qtcore=yes, have_qtcore=no) - # Environmental Variable - AC_ARG_WITH([envvar], -@@ -136,12 +138,12 @@ - [test x$have_networkmanager == xyes && with_networkmanager=yes]) + # Direct +@@ -124,12 +126,12 @@ + [test x$have_networkmanager = xyes && with_networkmanager=yes]) if test x$with_networkmanager = xyes; then - if test x$have_networkmanager == xyes; then + if test x$have_networkmanager = xyes; then - NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS" - NETWORKMANAGER_LIBS="$NetworkManager_LIBS" -+ NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS $DBUS_CFLAGS" -+ NETWORKMANAGER_LIBS="$NetworkManager_LIBS $DBUS_LIBS" ++ NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS $DBUS_CFLAGS" ++ NETWORKMANAGER_LIBS="$NetworkManager_LIBS $DBUS_LIBS" AC_SUBST(NETWORKMANAGER_CFLAGS) AC_SUBST(NETWORKMANAGER_LIBS) else -- echo "NetworkManager plugin requires: NetworkManager!" -+ echo "NetworkManager plugin requires: NetworkManager and DBus!" +- echo "NetworkManager module requires: NetworkManager!" ++ echo "NetworkManager module requires: NetworkManager and DBus!" exit 1 fi else -
