Wed Apr 13 04:53:33 UTC 2011

2 files changed, 59 insertions, 6 deletions

diff --git a/testing/kdeplasma-applets-networkmanagement/PKGBUILD b/testing/kdeplasma-applets-networkmanagement/PKGBUILD
index abfa541da..debe03a2f 100644
--- a/testing/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/testing/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
 
 pkgname=kdeplasma-applets-networkmanagement
-pkgver=git20110407
-_commit=a2d35d4ec55fe6a5db209974a928482c662ac830
+pkgver=git20110412
+_commit=cbce07ca5b353cd2aadca260db856f595210afc9
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64')
@@ -14,12 +14,16 @@ depends=('kdebase-workspace' 'networkmanager')
 makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info')
 optdepends=('mobile-broadband-provider-info: allow to add new mobile connection')
 install=${pkgname}.install
-#source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
-source=('ftp://ftp.archlinux.org/other/kde/networkmanagement-nm09.tar.bz2')
-md5sums=('a853338f79bc75837e343c3820d1bb39')
+source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}"
+        'networkmanager09.patch')
+md5sums=('501bbca6cf410c8b9df7af97da6a321d'
+         'abb1c19a36653d85594b16ef60daca89')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}/networkmanagement"
+  patch -Np1 -i "${srcdir}/networkmanager09.patch"
+
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../networkmanagement \
diff --git a/testing/kdeplasma-applets-networkmanagement/networkmanager09.patch b/testing/kdeplasma-applets-networkmanagement/networkmanager09.patch
new file mode 100644
index 000000000..d209fc7d8
--- /dev/null
+++ b/testing/kdeplasma-applets-networkmanagement/networkmanager09.patch
@@ -0,0 +1,49 @@
+From 76001a795ed8f88d1aee317d71b7ae76384549d5 Mon Sep 17 00:00:00 2001
+From: Andrea Scarpino <andrea@archlinux.org>
+Date: Tue, 12 Apr 2011 11:22:06 +0200
+Subject: [PATCH] build with Network Manager 0.9
+
+---
+ backends/NetworkManager/nmdbussettingsservice.cpp |    3 +++
+ backends/NetworkManager/settings/gsmdbus.cpp      |    4 ++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/backends/NetworkManager/nmdbussettingsservice.cpp b/backends/NetworkManager/nmdbussettingsservice.cpp
+index 65e654e..035e7b0 100644
+--- a/backends/NetworkManager/nmdbussettingsservice.cpp
++++ b/backends/NetworkManager/nmdbussettingsservice.cpp
+@@ -57,6 +57,9 @@ public:
+     QHash<QUuid, QDBusObjectPath> uuidToPath;
+ };
+ 
++#define NM_DBUS_SERVICE_USER_SETTINGS     "org.freedesktop.NetworkManagerUserSettings"
++#define NM_DBUS_SERVICE_SYSTEM_SETTINGS   "org.freedesktop.NetworkManagerSystemSettings"
++
+ const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String(NM_DBUS_SERVICE_USER_SETTINGS);
+ const QString NMDBusSettingsService::SERVICE_SYSTEM_SETTINGS = QLatin1String(NM_DBUS_SERVICE_SYSTEM_SETTINGS);
+ 
+diff --git a/backends/NetworkManager/settings/gsmdbus.cpp b/backends/NetworkManager/settings/gsmdbus.cpp
+index 9912df6..eedf1ea 100644
+--- a/backends/NetworkManager/settings/gsmdbus.cpp
++++ b/backends/NetworkManager/settings/gsmdbus.cpp
+@@ -35,7 +35,7 @@ void GsmDbus::fromMap(const QVariantMap & map)
+   if (map.contains(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE))) {
+     setting->setNetworktype(map.value(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE)).value<int>());
+   } else {
+-      setting->setNetworktype(NM_GSM_NETWORK_ANY);
++      setting->setNetworktype(NM_SETTING_GSM_NETWORK_TYPE_ANY);
+   }
+   if (map.contains("band")) {
+     setting->setBand(map.value("band").value<int>());
+@@ -62,7 +62,7 @@ QVariantMap GsmDbus::toMap()
+       map.insert("apn", setting->apn());
+   if (!setting->networkid().isEmpty())
+       map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_ID), setting->networkid());
+-  if (setting->networktype() != NM_GSM_NETWORK_ANY) {
++  if (setting->networktype() != NM_SETTING_GSM_NETWORK_TYPE_ANY) {
+       map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE), setting->networktype());
+   }
+ 
+-- 
+1.7.4.4
+