Fri Mar 8 00:04:03 PST 2013

17 files changed, 110 insertions, 802 deletions

diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 36f171cac..420dc3a0e 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 179103 2013-03-03 17:28:31Z dreisner $
+# $Id: PKGBUILD 179599 2013-03-07 17:46:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
 pkgver=2.8.10.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64')
 url="http://www.cmake.org/"
@@ -13,12 +13,17 @@ depends=('curl' 'libarchive' 'shared-mime-info')
 makedepends=('qt5-base' 'emacs')
 optdepends=('qt5-base: cmake-gui')
 install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('097278785da7182ec0aea8769d06860c')
+source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
+        'qt4.patch')
+md5sums=('097278785da7182ec0aea8769d06860c'
+         '4933fbe934d3989923f0a60a78dac44e')
 
 build() {
   cd ${pkgname}-${pkgver}
 
+  # qmake refers to Qt5
+  patch -p1 -i "${srcdir}"/qt4.patch
+
   # Qt is built with reduce-relocations
   export CFLAGS="${CFLAGS} -fPIC"
   export CXXFLAGS="${CXXFLAGS} -fPIC"
diff --git a/extra/cmake/qt4.patch b/extra/cmake/qt4.patch
new file mode 100644
index 000000000..0518681f0
--- /dev/null
+++ b/extra/cmake/qt4.patch
@@ -0,0 +1,11 @@
+--- cmake-2.8.10.2/Modules/FindQt4.cmake~	2013-03-07 16:50:35.388399689 +0000
++++ cmake-2.8.10.2/Modules/FindQt4.cmake	2013-03-07 16:51:35.017991029 +0000
+@@ -497,7 +497,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac
++find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac
+   PATHS
+     ENV QTDIR
+     "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index d3b8558cf..dfe8c8498 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169995 2012-10-30 23:01:10Z heftig $
+# $Id: PKGBUILD 179567 2013-03-07 11:54:25Z foutrelis $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@archlinux.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -6,7 +6,7 @@
 # Contributor: Will Rea <sillywilly@gmail.com>
 
 pkgname=network-manager-applet
-pkgver=0.9.6.4
+pkgver=0.9.8.0
 pkgrel=1
 pkgdesc="GNOME frontends to NetWorkmanager"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ optdepends=('gnome-bluetooth: for PAN/DUN support')
 options=('!libtool' '!emptydirs')
 install=network-manager-applet.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
-sha256sums=('ae5667b165f0f83244ec76c42f17553ec2169f5250e144904994497137374141')
+sha256sums=('1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD
index 735ca955e..833edf2f9 100644
--- a/extra/networkmanager-openconnect/PKGBUILD
+++ b/extra/networkmanager-openconnect/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166519 2012-09-09 15:40:55Z heftig $
+# $Id: PKGBUILD 179569 2013-03-07 11:54:27Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openconnect
-pkgver=0.9.6.2
+pkgver=0.9.8.0
 pkgrel=1
 pkgdesc="NetworkManager VPN integration for openconnect"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz)
-sha256sums=('3f53d87dbeb00fc841ef5981e6f1a1a192c65d273386246d48245cca84fa41b0')
+sha256sums=('c12487f57ad2f2386db4b103397e3cb66bf34ba589c5f48c3c5ec0b5547e4d9b')
 
 build() {
   cd NetworkManager-openconnect-${pkgver}
diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD
index 13953643a..d709fd471 100644
--- a/extra/networkmanager-openvpn/PKGBUILD
+++ b/extra/networkmanager-openvpn/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166520 2012-09-09 15:41:00Z heftig $
+# $Id: PKGBUILD 179570 2013-03-07 11:54:28Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openvpn
-pkgver=0.9.6.0
+pkgver=0.9.8.0
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for OpenVPN"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 install=networkmanager-openvpn.install
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz)
-sha256sums=('8fb88705793399574b3de2af93f87b63c0eae342d549a1c79bc59f6a1fad87a3')
+sha256sums=('4196f4c124426884657c8d0e2578f4d35205b8981a46bf645fd599fb238395ce')
 
 build() {
   cd NetworkManager-openvpn-${pkgver}
diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD
index 4b756c939..f048495ff 100644
--- a/extra/networkmanager-pptp/PKGBUILD
+++ b/extra/networkmanager-pptp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 171364 2012-11-17 11:09:07Z ibiru $
+# $Id: PKGBUILD 179571 2013-03-07 11:54:28Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-pptp
-pkgver=0.9.6.0
-pkgrel=2
+pkgver=0.9.8.0
+pkgrel=1
 pkgdesc="NetworkManager VPN plugin for pptp "
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,20 +14,17 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-pptp.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz
-        fix-path-to-auth-dialog.patch
         gtk_table_to_gtk_grid.patch)
-sha256sums=('a84cbbf24827229e3dd3611bbde191398275c3b7ecd03913047197644f27a2b4'
-            '35f9c2cb4d046c8f215617e1a0bfd8551965bd0655af0cd25f89c17ea5e9081a'
+sha256sums=('34d0981462d8948ace0dd4f49478c86017b53516afbbf62e2a4c6c0adc679cc8'
             '17c194c605bca780bf657711e9cff910c63ab27eae70c11cb6c53e9c75ad3215')
 
 build() {
   cd NetworkManager-pptp-${pkgver}
-  patch -Np1 -i ../fix-path-to-auth-dialog.patch
   patch -Np1 -i ../gtk_table_to_gtk_grid.patch
   ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
+        --sysconfdir=/etc \
+        --libexecdir=/usr/lib/networkmanager \
+        --disable-static
   make
 }
 
diff --git a/extra/networkmanager-pptp/fix-path-to-auth-dialog.patch b/extra/networkmanager-pptp/fix-path-to-auth-dialog.patch
deleted file mode 100644
index 28a4a5a44..000000000
--- a/extra/networkmanager-pptp/fix-path-to-auth-dialog.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a2f52d4455bd81732b6b3c16bdab206c56818c07 Mon Sep 17 00:00:00 2001
-From: Clemens Buchacher <drizzd@aon.at>
-Date: Sun, 1 Jul 2012 18:35:50 +0200
-Subject: [PATCH] fix path to auth-dialog
-
-
-Signed-off-by: Clemens Buchacher <drizzd@aon.at>
----
- nm-pptp-service.name.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nm-pptp-service.name.in b/nm-pptp-service.name.in
-index 9ee79b8..ea5f0e5 100644
---- a/nm-pptp-service.name.in
-+++ b/nm-pptp-service.name.in
-@@ -4,6 +4,6 @@ service=org.freedesktop.NetworkManager.pptp
- program=@LIBEXECDIR@/nm-pptp-service
- 
- [GNOME]
--auth-dialog=nm-pptp-auth-dialog
-+auth-dialog=@LIBEXECDIR@/nm-pptp-auth-dialog
- properties=libnm-pptp-properties
- supports-external-ui-mode=true
--- 
-1.7.11.1
-
diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD
index be0161572..b65ae3f3c 100644
--- a/extra/networkmanager-vpnc/PKGBUILD
+++ b/extra/networkmanager-vpnc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166522 2012-09-09 15:41:10Z heftig $
+# $Id: PKGBUILD 179572 2013-03-07 11:54:29Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-vpnc
-pkgver=0.9.6.0
+pkgver=0.9.8.0
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for vpnc"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-vpnc.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz)
-sha256sums=('6c8e35862330e17ee8f4dc44b1ac47470da703e436d339c7b3e2dac7d1b148a2')
+sha256sums=('e4504c569315c20f2468995f073123a787cdb66695d321f20f994abd1d7eb1c1')
 
 build() {
   cd NetworkManager-vpnc-${pkgver}
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index edb3f262c..f5964f01f 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177957 2013-02-12 12:13:58Z thomas $
+# $Id: PKGBUILD 179568 2013-03-07 11:54:26Z foutrelis $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -8,15 +8,15 @@
 
 pkgname=networkmanager
 _pkgname=NetworkManager
-pkgver=0.9.6.4
-pkgrel=2
+pkgver=0.9.8.0
+pkgrel=1
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org/projects/$_pkgname/"
 depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant ppp dhclient
          libsoup systemd)
-makedepends=(intltool dhcpcd iptables gobject-introspection)
+makedepends=(intltool dhcpcd iptables gobject-introspection gtk-doc)
 optdepends=('modemmanager: for modem management service'
             'dhcpcd: alternative DHCP client; does not support DHCPv6'
             'iptables: Connection sharing'
@@ -27,25 +27,18 @@ options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch
-        nm-polkit-permissive.patch repair-signals.patch systemd-sleep.patch)
-sha256sums=('511b411e055d187bc8f26c519fdb3e55e07fc40d4adecbbec623c0249380a7eb'
+        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch)
+sha256sums=('c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb'
-            'e23b651a90ef62d515921953b4c6779538d35a737fb74c266b7fce94d62fdb06'
-            'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6'
-            '24c181ab69e769e703e45f64a552add5df5de22fbcd8899d588add053674420a')
+            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb')
 
 build() {
   cd $_pkgname-$pkgver
 
   patch -Np1 -i ../disable_set_hostname.patch
   patch -Np1 -i ../dnsmasq-path.patch
-  patch -Np1 -i ../nm-polkit-permissive.patch
-  patch -Np1 -i ../repair-signals.patch # FS#31115
-  patch -Np1 -i ../systemd-sleep.patch
-  AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi
+  #AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi
 
   ./configure \
     --prefix=/usr \
@@ -53,7 +46,6 @@ build() {
     --localstatedir=/var \
     --libexecdir=/usr/lib/networkmanager \
     --with-crypto=nss \
-    --with-distro=arch \
     --with-dhclient=/usr/sbin/dhclient \
     --with-dhcpcd=/usr/sbin/dhcpcd \
     --with-iptables=/usr/sbin/iptables \
@@ -63,7 +55,9 @@ build() {
     --with-session-tracking=systemd \
     --disable-static \
     --enable-more-warnings=no \
-    --disable-wimax
+    --disable-wimax \
+    --enable-modify-system \
+    --enable-doc
 
   make
 }
diff --git a/extra/networkmanager/nm-polkit-permissive.patch b/extra/networkmanager/nm-polkit-permissive.patch
deleted file mode 100644
index 1ac406224..000000000
--- a/extra/networkmanager/nm-polkit-permissive.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in
---- NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive	2011-03-24 14:21:35.100912222 -0500
-+++ NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in	2011-03-24 14:21:49.916726997 -0500
-@@ -95,7 +95,7 @@
-     <_message>System policy prevents modification of network settings for all users</_message>
-     <defaults>
-       <allow_inactive>no</allow_inactive>
--      <allow_active>auth_admin_keep</allow_active>
-+      <allow_active>yes</allow_active>
-     </defaults>
-   </action>
- 
diff --git a/extra/networkmanager/repair-signals.patch b/extra/networkmanager/repair-signals.patch
deleted file mode 100644
index cf1319dc5..000000000
--- a/extra/networkmanager/repair-signals.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 64342a313ef497fca8a4fb7567900d4a1460065f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 13 Sep 2012 09:32:53 +0000
-Subject: core: wait until we daemonized before setting up signals (bgo #683932)
-
-If we mask signals before daemonizing, the daemon process will not be
-able to handle them, and thus would be unkillable with anything other
-than SIGKILL.
----
-diff --git a/src/main.c b/src/main.c
-index 8bc6d3f..5b82cfa 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -401,10 +401,6 @@ main (int argc, char *argv[])
- 		exit (1);
- 	}
- 
--	/* Set up unix signal handling */
--	if (!setup_signals ())
--		exit (1);
--
- 	/* Set locale to be able to use environment variables */
- 	setlocale (LC_ALL, "");
- 
-@@ -501,6 +497,10 @@ main (int argc, char *argv[])
- 			wrote_pidfile = TRUE;
- 	}
- 
-+	/* Set up unix signal handling - before creating threads, but after daemonizing! */
-+	if (!setup_signals ())
-+		exit (1);
-+
- 	if (g_fatal_warnings) {
- 		GLogLevelFlags fatal_mask;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/networkmanager/systemd-sleep.patch b/extra/networkmanager/systemd-sleep.patch
deleted file mode 100644
index 3470d4654..000000000
--- a/extra/networkmanager/systemd-sleep.patch
+++ /dev/null
@@ -1,616 +0,0 @@
-From b444d31cba5b8ac0c9771cc5a246dfd3af9dfd00 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 9 Oct 2012 00:36:35 -0400
-Subject: [PATCH] core: factor out the upower suspend/resume code (bgo
- #677694)
-
-Factor the code that listens for upower sleeping and resuming
-signals out into a class code NMSleepMonitor.
-
-core: add a systemd suspend/resume monitor (bgo #677694)
-
-This implementation uses a delay inhibitor to get systemd to
-emit PrepareForSleep, and then emits ::Sleeping and ::Resuming
-when receiving the before/after PrepareForSleep emissions.
-
-core: DBusGConnections are not GObjects
-
-Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2.
-
-core: fix suspend/resume signal names which the manager listens for
-
-Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2; but honestly
-I also thought GObject lower-cased signal names since it munges them
-for - and _ too.  Apparently not.
----
- configure.ac                   |   2 +-
- src/Makefile.am                |   9 +-
- src/nm-manager.c               |  40 +++-----
- src/nm-sleep-monitor-systemd.c | 217 +++++++++++++++++++++++++++++++++++++++++
- src/nm-sleep-monitor-upower.c  | 151 ++++++++++++++++++++++++++++
- src/nm-sleep-monitor.h         |  46 +++++++++
- 6 files changed, 437 insertions(+), 28 deletions(-)
- create mode 100644 src/nm-sleep-monitor-systemd.c
- create mode 100644 src/nm-sleep-monitor-upower.c
- create mode 100644 src/nm-sleep-monitor.h
-
-diff --git a/configure.ac b/configure.ac
-index e76e193..9152c23 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -327,7 +327,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
- AC_SUBST(GUDEV_CFLAGS)
- AC_SUBST(GUDEV_LIBS)
- 
--PKG_CHECK_MODULES(GIO, gio-2.0)
-+PKG_CHECK_MODULES(GIO, gio-unix-2.0)
- AC_SUBST(GIO_CFLAGS)
- AC_SUBST(GIO_LIBS)
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index b155209..ba7d2d6 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -191,6 +191,7 @@ NetworkManager_SOURCES = \
- 		nm-session-monitor.h \
- 		nm-session-utils.c \
- 		nm-session-utils.h \
-+		nm-sleep-monitor.h \
- 		nm-connection-provider.h \
- 		nm-connection-provider.c \
- 		nm-dispatcher.c \
-@@ -201,13 +202,18 @@ NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h
- endif
- 
- if SESSION_TRACKING_SYSTEMD
--NetworkManager_SOURCES += nm-session-monitor-systemd.c
-+NetworkManager_SOURCES += \
-+		nm-session-monitor-systemd.c \
-+		nm-sleep-monitor-systemd.c
- else
- if SESSION_TRACKING_CK
- NetworkManager_SOURCES += nm-session-monitor-ck.c
- else
- NetworkManager_SOURCES += nm-session-monitor-null.c
- endif
-+
-+# UPower suspend/resume used whenever systemd is not enabled
-+NetworkManager_SOURCES += nm-sleep-monitor-upower.c
- endif
- 
- nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml
-@@ -283,6 +289,7 @@ BUILT_SOURCES = \
- NetworkManager_CPPFLAGS = \
- 	$(DBUS_CFLAGS) \
- 	$(GLIB_CFLAGS) \
-+	$(GIO_CFLAGS) \
- 	$(GUDEV_CFLAGS) \
- 	$(LIBNL_CFLAGS) \
- 	$(GMODULE_CFLAGS) \
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 618c4ed..c8ce115 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -69,6 +69,7 @@
- #include "nm-device-factory.h"
- #include "wifi-utils.h"
- #include "nm-enum-types.h"
-+#include "nm-sleep-monitor.h"
- 
- #if WITH_CONCHECK
- #include "nm-connectivity.h"
-@@ -78,8 +79,6 @@
- #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd"
- #define NM_AUTOIP_DBUS_IFACE   "org.freedesktop.nm_avahi_autoipd"
- 
--#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
--
- static gboolean impl_manager_get_devices (NMManager *manager,
-                                           GPtrArray **devices,
-                                           GError **err);
-@@ -228,7 +227,7 @@ typedef struct {
- 	guint modem_removed_id;
- 
- 	DBusGProxy *aipd_proxy;
--	DBusGProxy *upower_proxy;
-+	NMSleepMonitor *sleep_monitor;
- 
- 	GSList *auth_chains;
- 
-@@ -3288,16 +3287,16 @@ impl_manager_sleep (NMManager *self,
- }
- 
- static void
--upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
-+sleeping_cb (DBusGProxy *proxy, gpointer user_data)
- {
--	nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
-+	nm_log_dbg (LOGD_SUSPEND, "Received sleeping signal");
- 	_internal_sleep (NM_MANAGER (user_data), TRUE);
- }
- 
- static void
--upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
-+resuming_cb (DBusGProxy *proxy, gpointer user_data)
- {
--	nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
-+	nm_log_dbg (LOGD_SUSPEND, "Received resuming signal");
- 	_internal_sleep (NM_MANAGER (user_data), FALSE);
- }
- 
-@@ -4049,8 +4048,8 @@ dispose (GObject *object)
- 	if (priv->aipd_proxy)
- 		g_object_unref (priv->aipd_proxy);
- 
--	if (priv->upower_proxy)
--		g_object_unref (priv->upower_proxy);
-+	if (priv->sleep_monitor)
-+		g_object_unref (priv->sleep_monitor);
- 
- 	if (priv->fw_monitor) {
- 		if (priv->fw_monitor_id)
-@@ -4372,23 +4371,12 @@ nm_manager_init (NMManager *manager)
- 	} else
- 		nm_log_warn (LOGD_AUTOIP4, "could not initialize avahi-autoipd D-Bus proxy");
- 
--	/* upower sleep/wake handling */
--	priv->upower_proxy = dbus_g_proxy_new_for_name (g_connection,
--	                                                UPOWER_DBUS_SERVICE,
--	                                                "/org/freedesktop/UPower",
--	                                                "org.freedesktop.UPower");
--	if (priv->upower_proxy) {
--		dbus_g_proxy_add_signal (priv->upower_proxy, "Sleeping", G_TYPE_INVALID);
--		dbus_g_proxy_connect_signal (priv->upower_proxy, "Sleeping",
--		                             G_CALLBACK (upower_sleeping_cb),
--		                             manager, NULL);
--
--		dbus_g_proxy_add_signal (priv->upower_proxy, "Resuming", G_TYPE_INVALID);
--		dbus_g_proxy_connect_signal (priv->upower_proxy, "Resuming",
--		                             G_CALLBACK (upower_resuming_cb),
--		                             manager, NULL);
--	} else
--		nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
-+	/* sleep/wake handling */
-+	priv->sleep_monitor = nm_sleep_monitor_get ();
-+	g_signal_connect (priv->sleep_monitor, "sleeping",
-+	                  G_CALLBACK (sleeping_cb), manager);
-+	g_signal_connect (priv->sleep_monitor, "resuming",
-+	                  G_CALLBACK (resuming_cb), manager);
- 
- 	/* Listen for authorization changes */
- 	nm_auth_changed_func_register (authority_changed_cb, manager);
-diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c
-new file mode 100644
-index 0000000..70adc89
---- /dev/null
-+++ b/src/nm-sleep-monitor-systemd.c
-@@ -0,0 +1,217 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#include "config.h"
-+#include <errno.h>
-+#include <string.h>
-+#include <sys/stat.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+#include <dbus/dbus-glib.h>
-+#include <gio/gio.h>
-+#include <gio/gunixfdlist.h>
-+
-+#include "nm-logging.h"
-+#include "nm-dbus-manager.h"
-+
-+#include "nm-sleep-monitor.h"
-+
-+#define SD_NAME              "org.freedesktop.login1"
-+#define SD_PATH              "/org/freedesktop/login1"
-+#define SD_INTERFACE         "org.freedesktop.login1.Manager"
-+
-+
-+struct _NMSleepMonitor {
-+	GObject parent_instance;
-+
-+	GDBusProxy *sd_proxy;
-+	gint inhibit_fd;
-+};
-+
-+struct _NMSleepMonitorClass {
-+	GObjectClass parent_class;
-+
-+	void (*sleeping) (NMSleepMonitor *monitor);
-+	void (*resuming) (NMSleepMonitor *monitor);
-+};
-+
-+
-+enum {
-+	SLEEPING,
-+	RESUMING,
-+	LAST_SIGNAL,
-+};
-+static guint signals[LAST_SIGNAL] = {0};
-+
-+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
-+
-+/********************************************************************/
-+
-+static void
-+inhibit_done (GObject      *source,
-+              GAsyncResult *result,
-+              gpointer      user_data)
-+{
-+	GDBusProxy *sd_proxy = G_DBUS_PROXY (source);
-+	NMSleepMonitor *self = user_data;
-+	GError *error = NULL;
-+	GVariant *res;
-+	GUnixFDList *fd_list;
-+
-+	res = g_dbus_proxy_call_with_unix_fd_list_finish (sd_proxy, &fd_list, result, &error);
-+	if (!res) {
-+		nm_log_warn (LOGD_SUSPEND, "Inhibit failed: %s", error->message);
-+		g_error_free (error);
-+	} else {
-+		if (!fd_list || g_unix_fd_list_get_length (fd_list) != 1)
-+			nm_log_warn (LOGD_SUSPEND, "Didn't get a single fd back");
-+
-+		self->inhibit_fd = g_unix_fd_list_get (fd_list, 0, NULL);
-+
-+		nm_log_dbg (LOGD_SUSPEND, "Inhibitor fd is %d", self->inhibit_fd);
-+		g_object_unref (fd_list);
-+		g_variant_unref (res);
-+	}
-+}
-+
-+static void
-+take_inhibitor (NMSleepMonitor *self)
-+{
-+	g_assert (self->inhibit_fd == -1);
-+
-+	nm_log_dbg (LOGD_SUSPEND, "Taking systemd sleep inhibitor");
-+	g_dbus_proxy_call_with_unix_fd_list (self->sd_proxy,
-+	                                     "Inhibit",
-+	                                     g_variant_new ("(ssss)",
-+	                                                    "sleep",
-+	                                                    g_get_user_name (),
-+	                                                    "inhibited",
-+	                                                    "delay"),
-+	                                     0,
-+	                                     G_MAXINT,
-+	                                     NULL,
-+	                                     NULL,
-+	                                     inhibit_done,
-+	                                     self);
-+}
-+
-+static gboolean
-+drop_inhibitor (NMSleepMonitor *self)
-+{
-+	if (self->inhibit_fd >= 0) {
-+		nm_log_dbg (LOGD_SUSPEND, "Dropping systemd sleep inhibitor");
-+		close (self->inhibit_fd);
-+		self->inhibit_fd = -1;
-+		return TRUE;
-+	}
-+	return FALSE;
-+}
-+
-+static void
-+signal_cb (GDBusProxy  *proxy,
-+           const gchar *sendername,
-+           const gchar *signalname,
-+           GVariant    *args,
-+           gpointer     data)
-+{
-+	NMSleepMonitor *self = data;
-+	gboolean is_about_to_suspend;
-+
-+	if (strcmp (signalname, "PrepareForSleep") != 0)
-+		return;
-+
-+	g_variant_get (args, "(b)", &is_about_to_suspend);
-+	nm_log_dbg (LOGD_SUSPEND, "Received PrepareForSleep signal: %d", is_about_to_suspend);
-+
-+	if (is_about_to_suspend) {
-+		g_signal_emit (self, signals[SLEEPING], 0);
-+		drop_inhibitor (self);
-+	} else {
-+		take_inhibitor (self);
-+		g_signal_emit (self, signals[RESUMING], 0);
-+	}
-+}
-+
-+static void
-+nm_sleep_monitor_init (NMSleepMonitor *self)
-+{
-+	GDBusConnection *bus;
-+
-+	self->inhibit_fd = -1;
-+	bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
-+	self->sd_proxy = g_dbus_proxy_new_sync (bus, 0, NULL,
-+	                                        SD_NAME, SD_PATH, SD_INTERFACE,
-+	                                        NULL, NULL);
-+	g_object_unref (bus);
-+	g_signal_connect (self->sd_proxy, "g-signal", G_CALLBACK (signal_cb), self);
-+	take_inhibitor (self);
-+}
-+
-+static void
-+finalize (GObject *object)
-+{
-+	NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
-+
-+	drop_inhibitor (self);
-+	if (self->sd_proxy)
-+		g_object_unref (self->sd_proxy);
-+
-+	if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
-+		G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
-+}
-+
-+static void
-+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
-+{
-+	GObjectClass *gobject_class;
-+
-+	gobject_class = G_OBJECT_CLASS (klass);
-+
-+	gobject_class->finalize = finalize;
-+
-+	signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
-+	                                  NM_TYPE_SLEEP_MONITOR,
-+	                                  G_SIGNAL_RUN_LAST,
-+	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
-+	                                  NULL,                   /* accumulator      */
-+	                                  NULL,                   /* accumulator data */
-+	                                  g_cclosure_marshal_VOID__VOID,
-+	                                  G_TYPE_NONE, 0);
-+	signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
-+	                                  NM_TYPE_SLEEP_MONITOR,
-+	                                  G_SIGNAL_RUN_LAST,
-+	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
-+	                                  NULL,                   /* accumulator      */
-+	                                  NULL,                   /* accumulator data */
-+	                                  g_cclosure_marshal_VOID__VOID,
-+	                                  G_TYPE_NONE, 0);
-+}
-+
-+NMSleepMonitor *
-+nm_sleep_monitor_get (void)
-+{
-+	static NMSleepMonitor *singleton = NULL;
-+
-+	if (singleton)
-+		return g_object_ref (singleton);
-+
-+	singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
-+	return singleton;
-+}
-+
-+/* ---------------------------------------------------------------------------------------------------- */
-diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
-new file mode 100644
-index 0000000..3c93f66
---- /dev/null
-+++ b/src/nm-sleep-monitor-upower.c
-@@ -0,0 +1,151 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#include "config.h"
-+#include <errno.h>
-+#include <string.h>
-+#include <sys/stat.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+#include <dbus/dbus-glib.h>
-+#include <gio/gio.h>
-+#include "nm-logging.h"
-+#include "nm-dbus-manager.h"
-+
-+#include "nm-sleep-monitor.h"
-+
-+#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
-+
-+struct _NMSleepMonitor {
-+        GObject parent_instance;
-+
-+        DBusGProxy *upower_proxy;
-+};
-+
-+struct _NMSleepMonitorClass {
-+        GObjectClass parent_class;
-+
-+        void (*sleeping) (NMSleepMonitor *monitor);
-+        void (*resuming) (NMSleepMonitor *monitor);
-+};
-+
-+
-+enum {
-+        SLEEPING,
-+        RESUMING,
-+        LAST_SIGNAL,
-+};
-+static guint signals[LAST_SIGNAL] = {0};
-+
-+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
-+
-+/********************************************************************/
-+
-+static void
-+upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
-+{
-+        nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
-+        g_signal_emit (user_data, signals[SLEEPING], 0);
-+}
-+
-+static void
-+upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
-+{
-+        nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
-+        g_signal_emit (user_data, signals[RESUMING], 0);
-+}
-+
-+static void
-+nm_sleep_monitor_init (NMSleepMonitor *self)
-+{
-+        NMDBusManager *dbus_mgr;
-+        DBusGConnection *bus;
-+
-+        dbus_mgr = nm_dbus_manager_get ();
-+        bus = nm_dbus_manager_get_connection (dbus_mgr);
-+        self->upower_proxy = dbus_g_proxy_new_for_name (bus,
-+                                                        UPOWER_DBUS_SERVICE,
-+                                                        "/org/freedesktop/UPower",
-+                                                        "org.freedesktop.UPower");
-+        if (self->upower_proxy) {
-+                dbus_g_proxy_add_signal (self->upower_proxy, "Sleeping", G_TYPE_INVALID);
-+                dbus_g_proxy_connect_signal (self->upower_proxy, "Sleeping",
-+                                             G_CALLBACK (upower_sleeping_cb),
-+                                             self, NULL);
-+
-+                dbus_g_proxy_add_signal (self->upower_proxy, "Resuming", G_TYPE_INVALID);
-+                dbus_g_proxy_connect_signal (self->upower_proxy, "Resuming",
-+                                             G_CALLBACK (upower_resuming_cb),
-+                                             self, NULL);
-+        } else
-+                nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
-+        g_object_unref (dbus_mgr);
-+}
-+
-+static void
-+finalize (GObject *object)
-+{
-+        NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
-+
-+        if (self->upower_proxy)
-+                g_object_unref (self->upower_proxy);
-+
-+        if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
-+                G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
-+}
-+
-+static void
-+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
-+{
-+        GObjectClass *gobject_class;
-+
-+        gobject_class = G_OBJECT_CLASS (klass);
-+
-+        gobject_class->finalize = finalize;
-+
-+        signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
-+                                          NM_TYPE_SLEEP_MONITOR,
-+                                          G_SIGNAL_RUN_LAST,
-+                                          G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
-+                                          NULL,                   /* accumulator      */
-+                                          NULL,                   /* accumulator data */
-+                                          g_cclosure_marshal_VOID__VOID,
-+                                          G_TYPE_NONE, 0);
-+        signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
-+                                          NM_TYPE_SLEEP_MONITOR,
-+                                          G_SIGNAL_RUN_LAST,
-+                                          G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
-+                                          NULL,                   /* accumulator      */
-+                                          NULL,                   /* accumulator data */
-+                                          g_cclosure_marshal_VOID__VOID,
-+                                          G_TYPE_NONE, 0);
-+}
-+
-+NMSleepMonitor *
-+nm_sleep_monitor_get (void)
-+{
-+        static NMSleepMonitor *singleton = NULL;
-+
-+        if (singleton)
-+                return g_object_ref (singleton);
-+
-+        singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
-+        return singleton;
-+}
-+
-+/* ---------------------------------------------------------------------------------------------------- */
-diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h
-new file mode 100644
-index 0000000..173e6a1
---- /dev/null
-+++ b/src/nm-sleep-monitor.h
-@@ -0,0 +1,46 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#ifndef NM_SLEEP_MONITOR_H
-+#define NM_SLEEP_MONITOR_H
-+
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+#define NM_TYPE_SLEEP_MONITOR         (nm_sleep_monitor_get_type ())
-+#define NM_SLEEP_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitor))
-+#define NM_SLEEP_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass))
-+#define NM_SLEEP_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass))
-+#define NM_IS_SLEEP_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_SLEEP_MONITOR))
-+#define NM_IS_SLEEP_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_SLEEP_MONITOR))
-+
-+#define NM_SLEEP_MONITOR_SLEEPING "sleeping"
-+#define NM_SLEEP_MONITOR_RESUMING "resuming"
-+
-+typedef struct _NMSleepMonitor         NMSleepMonitor;
-+typedef struct _NMSleepMonitorClass    NMSleepMonitorClass;
-+
-+GType           nm_sleep_monitor_get_type     (void) G_GNUC_CONST;
-+NMSleepMonitor *nm_sleep_monitor_get          (void);
-+
-+G_END_DECLS
-+
-+#endif /* NM_SLEEP_MONITOR_H */
-+
--- 
-1.7.12.2
-
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index 7c55c3061..2e2064da0 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,33 +1,35 @@
-# $Id: PKGBUILD 178976 2013-03-01 10:23:02Z andrea $
+# $Id: PKGBUILD 179560 2013-03-07 08:19:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgbase=pyqt
 pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.9.6
-pkgrel=2
+pkgver=4.10
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
-makedepends=('qt4' 'python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
+makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
              'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
 source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('514e1f9597771dc732ba75ba9fa5c6b6')
+md5sums=('b5953e96d0f82d322d0cba008163321e')
 
 build() {
-  . /etc/profile.d/qt4.sh
-
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
 
   cd PyQt-x11-gpl-${pkgver}
   python configure.py \
     --confirm-license \
-    --qsci-api
+    --qsci-api \
+    -q /usr/bin/qmake-qt4
 
   # Thanks Gerardo for the rpath fix
   find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
 
+  # Ugly workaround to fix build
+  sed -i 's|/usr/include/qt4/phonon|/usr/include/phonon|' phonon/Makefile
+
   make
 
   ### Python2 version ###
@@ -35,16 +37,21 @@ build() {
   python2 configure.py \
     --confirm-license \
     -v /usr/share/sip \
-    --qsci-api
+    --qsci-api \
+    -q /usr/bin/qmake-qt4
 
   # Thanks Gerardo for the rpath fix
   find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+  
+  # Ugly workaround to fix build
+  sed -i 's|/usr/include/qt4/phonon|/usr/include/phonon|' phonon/Makefile
 
   make
 }
 
 package_pyqt-common(){
   pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
+  depends=('qt4')
   
   cd PyQt-x11-gpl-${pkgver}
   make -C pyrcc DESTDIR="${pkgdir}" install
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index 44ce886c8..53a7449a8 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,24 +1,22 @@
-# $Id: PKGBUILD 178983 2013-03-01 10:23:58Z andrea $
+# $Id: PKGBUILD 179562 2013-03-07 08:19:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
          'python-qscintilla-common')
-pkgver=2.7
-pkgrel=2
+pkgver=2.7.1
+pkgrel=1
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
 makedepends=('python2-pyqt' 'pyqt' 'chrpath')
 source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
         'configure.py-objdir-support.diff')
-md5sums=('a3857d75a2b332e0460131e0aa4cc4b5'
-         '8cf9c06252e2f11ab00e62848e322fd3')
+md5sums=('da8939b5679a075e30c6632e54dc5abf'
+         'eae1bd23117c5f1f7f172a1c1e11f600')
 
 build() {
-    . /etc/profile.d/qt4.sh
-
     cd "${srcdir}/QScintilla-gpl-${pkgver}"
     patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
 
@@ -26,18 +24,18 @@ build() {
     qmake qscintilla.pro
     make
     
-    cd ../designer-Qt4
+    cd ../designer-Qt4Qt5
     qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
     make
 
     cd ../
     cp -rf Python Python2
     cd Python
-    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c
     make
 
     cd ../Python2
-    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c
     make    
 }
 
@@ -48,7 +46,7 @@ package_qscintilla() {
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4"
+    cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4Qt5"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 }
 
diff --git a/extra/qscintilla/configure.py-objdir-support.diff b/extra/qscintilla/configure.py-objdir-support.diff
index b595de18c..8d4a7c99d 100644
--- a/extra/qscintilla/configure.py-objdir-support.diff
+++ b/extra/qscintilla/configure.py-objdir-support.diff
@@ -1,39 +1,21 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_configure.dpatch by Torsten Marek <shlomme@debian.org>
-##
-## DP: patch the configure script for the Python bindings to support object dir builds
-
-@DPATCH@
-Index: qscintilla2-2.4.2/Python/configure.py
-===================================================================
---- qscintilla2-2.4.2.orig/Python/configure.py	2010-01-20 20:56:09.000000000 +0100
-+++ qscintilla2-2.4.2/Python/configure.py	2010-01-27 22:54:35.603870417 +0100
-@@ -33,6 +33,7 @@
+--- QScintilla-gpl-2.7.1/Python/configure.py~	2013-03-07 08:09:00.678704222 +0000
++++ QScintilla-gpl-2.7.1/Python/configure.py	2013-03-07 08:11:48.860880852 +0000
+@@ -29,6 +29,8 @@
  import glob
  import optparse
  
 +src_dir = os.path.dirname(os.path.abspath(__file__))
++
+ try:
+     import sysconfig
+ except ImportError:
+@@ -455,6 +457,9 @@
  
- # Import SIP's configuration module so that we have access to the error
- # reporting.  Then try and import the configuration modules for both PyQt3 and
-@@ -162,7 +163,7 @@
-     if os.access(sciglobal, os.F_OK):
-         # Get the QScintilla version string.
-         _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
--
-+        return # Debian: do not check for the installed version, we're good this way.
-         if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")):
-             # Because we include the Python bindings with the C++ code we can
-             # reasonably force the same version to be used and not bother about
-@@ -232,9 +233,9 @@
-     argv.append(buildfile)
- 
-     if pyqt.pyqt_version >= 0x040000:
--        argv.append("sip/qscimod4.sip")
-+        argv.append(os.path.join(src_dir, "sip/qscimod4.sip"))
-     else:
--        argv.append("sip/qscimod3.sip")
-+        argv.append(os.path.join(src_dir, "sip/qscimod3.sip"))
- 
-     os.system(" ".join(argv))
- 
+     # Get the QScintilla version string.
+     sciversstr = read_define(sciglobal, 'QSCINTILLA_VERSION_STR')
++
++    return # Debian: do not check for the installed version, we're good this way.
++
+     if sciversstr is None:
+         error(
+                 "The QScintilla version number could not be determined by "
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index d9dab39d1..73f37d304 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 178483 2013-02-24 11:42:18Z andrea $
+# $Id: PKGBUILD 179558 2013-03-07 08:18:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
 pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.14.3
+pkgver=4.14.4
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.com/software/sip/"
 license=('custom:"sip"')
 makedepends=('python' 'python2')
 source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('d5f037800bfd727e40ed818260943772')
+md5sums=('ae2d73ef43b8b0f7a9913561e9651706')
 
 build() {
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
diff --git a/extra/xerces-c/PKGBUILD b/extra/xerces-c/PKGBUILD
index ef62a98d8..11095214b 100644
--- a/extra/xerces-c/PKGBUILD
+++ b/extra/xerces-c/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 173034 2012-12-09 09:01:09Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
+# $Id: PKGBUILD 179593 2013-03-07 13:22:22Z andrea $
+# Maintainer:
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: pukyxd
 
 pkgname=xerces-c
 pkgver=3.1.1
 pkgrel=3
-pkgdesc="A validating XML parser written in a portable subset of C++."
+pkgdesc="A validating XML parser written in a portable subset of C++"
 arch=('i686' 'x86_64')
-url="http://xerces.apache.org/xerces-c"
-license=("APACHE")
+url="http://xerces.apache.org/xerces-c/"
+license=('APACHE')
 depends=('gcc-libs' 'curl')
 options=('!libtool')
-source=("http://apache.osuosl.org/xerces/c/3/sources/xerces-c-${pkgver}.tar.gz")
+source=("http://apache.osuosl.org/xerces/c/3/sources/${pkgname}-${pkgver}.tar.gz")
 md5sums=('6a8ec45d83c8cfb1584c5a5345cb51ae')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc
   make
-  make DESTDIR=${pkgdir}/ install
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}/" install
 }