[arch-commits] Commit in kdeplasma-applets-networkmanagement/trunk (2 files)

[Andrea Scarpino]

    Date: Wednesday, May 4, 2011 @ 02:44:12
  Author: andrea
Revision: 122423

upgpkg: kdeplasma-applets-networkmanagement git20110323-1
downgrade to a semi-working version

Added:
  kdeplasma-applets-networkmanagement/trunk/nm-09.patch
Modified:
  kdeplasma-applets-networkmanagement/trunk/PKGBUILD

-------------+
 PKGBUILD    |   16 ++++++++++++----
 nm-09.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-04 06:44:07 UTC (rev 122422)
+++ PKGBUILD	2011-05-04 06:44:12 UTC (rev 122423)
@@ -3,8 +3,9 @@
 # Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
 
 pkgname=kdeplasma-applets-networkmanagement
-pkgver=git20110502
-_commit=fdb4edbc91f60d358d202a694c4ab229c66f9f61
+epoch=1
+pkgver=git20110323
+_commit=986cae8974998213496a8678ad03523dba83e69d
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64')
@@ -14,10 +15,15 @@
 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}")
-md5sums=('6ac9e04cb917a8ac875b2bffde4b5420')
+source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}"
+        'nm-09.patch')
+md5sums=('3dc3b2631e0d4e4f578ef20f7802bf04'
+         'b7ad3dac9a5022c99dfd2ad0dc8549cb')
 
 build() {
+  cd "${srcdir}/networkmanagement"
+  patch -p1 -i "${srcdir}/nm-09.patch"
+
   cd "${srcdir}"
   mkdir build
   cd build
@@ -32,3 +38,5 @@
   cd ${srcdir}/build
   make DESTDIR=${pkgdir} install
 }
+md5sums=('8373cd729b12a821b28b483e3e9d253f'
+         'c46839bc0503f2dbec76282b8ab163bd')

Added: nm-09.patch
===================================================================
--- nm-09.patch	                        (rev 0)
+++ nm-09.patch	2011-05-04 06:44:12 UTC (rev 122423)
@@ -0,0 +1,44 @@
+From: Lamarque V. Souza <lamarque at gmail.com>
+Date: Sun, 17 Apr 2011 00:09:43 +0000
+Subject: Fix compilation against NetworkManager-0.8.98.
+X-Git-Url: http://quickgit.kde.org/?p=networkmanagement.git&a=commitdiff&h=e87ceccadc833e220f73d86352968655cedc0485
+---
+Fix compilation against NetworkManager-0.8.98.
+
+BUG: 271101
+---
+
+
+--- a/backends/NetworkManager/nmdbussettingsservice.cpp
++++ b/backends/NetworkManager/nmdbussettingsservice.cpp
+@@ -59,7 +59,7 @@ public:
+     QHash<QUuid, QDBusObjectPath> uuidToPath;
+ };
+ 
+-const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String(NM_DBUS_SERVICE_USER_SETTINGS);
++const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String("org.freedesktop.NetworkManagerUserSettings");
+ const QString NMDBusSettingsService::SERVICE_SYSTEM_SETTINGS = QLatin1String("org.freedesktop.NetworkManager");
+ 
+ NMDBusSettingsService::NMDBusSettingsService(QObject * parent)
+
+--- a/backends/NetworkManager/settings/gsmdbus.cpp
++++ b/backends/NetworkManager/settings/gsmdbus.cpp
+@@ -35,7 +35,7 @@ void GsmDbus::fromMap(const QVariantMap 
+   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());
+   }
+ 
+