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

[Andrea Scarpino]

    Date: Saturday, April 16, 2011 @ 21:26:38
  Author: andrea
Revision: 119923

upgpkg: kdeplasma-applets-networkmanagement git20110417-1
new snapshot

Modified:
  kdeplasma-applets-networkmanagement/trunk/PKGBUILD
Deleted:
  kdeplasma-applets-networkmanagement/trunk/networkmanager09.patch

------------------------+
 PKGBUILD               |   13 +++---------
 networkmanager09.patch |   49 -----------------------------------------------
 2 files changed, 4 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-16 23:00:06 UTC (rev 119922)
+++ PKGBUILD	2011-04-17 01:26:38 UTC (rev 119923)
@@ -3,8 +3,8 @@
 # Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
 
 pkgname=kdeplasma-applets-networkmanagement
-pkgver=git20110412
-_commit=cbce07ca5b353cd2aadca260db856f595210afc9
+pkgver=git20110417
+_commit=51897916c5e45f12f3e5132fdad421fbda794ad7
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64')
@@ -14,15 +14,10 @@
 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}"
-        'networkmanager09.patch')
-md5sums=('501bbca6cf410c8b9df7af97da6a321d'
-         'abb1c19a36653d85594b16ef60daca89')
+source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
+md5sums=('e7fd481cdc40e5c7b77c6fc01571bb8d')
 
 build() {
-  cd "${srcdir}/networkmanagement"
-  patch -Np1 -i "${srcdir}/networkmanager09.patch"
-
   cd "${srcdir}"
   mkdir build
   cd build

Deleted: networkmanager09.patch
===================================================================
--- networkmanager09.patch	2011-04-16 23:00:06 UTC (rev 119922)
+++ networkmanager09.patch	2011-04-17 01:26:38 UTC (rev 119923)
@@ -1,49 +0,0 @@
-From 76001a795ed8f88d1aee317d71b7ae76384549d5 Mon Sep 17 00:00:00 2001
-From: Andrea Scarpino <andrea at 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
-