[arch-commits] Commit in kdeplasma-applets-networkmanagement/trunk (2 files)
Andrea Scarpino
andrea at archlinux.org
Tue May 24 17:24:45 UTC 2011
Date: Tuesday, May 24, 2011 @ 13:24:45
Author: andrea
Revision: 124832
new snapshot, provides the NetworkManager backend for NM09
Modified:
kdeplasma-applets-networkmanagement/trunk/PKGBUILD
Deleted:
kdeplasma-applets-networkmanagement/trunk/nm-09.patch
-------------+
PKGBUILD | 13 ++++---------
nm-09.patch | 44 --------------------------------------------
2 files changed, 4 insertions(+), 53 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-05-24 17:22:55 UTC (rev 124831)
+++ PKGBUILD 2011-05-24 17:24:45 UTC (rev 124832)
@@ -4,8 +4,8 @@
pkgname=kdeplasma-applets-networkmanagement
epoch=1
-pkgver=git20110323
-_commit=986cae8974998213496a8678ad03523dba83e69d
+pkgver=git20110524
+_commit=f112886575a9c1fc8986f098db9ef84a6fb2e98e
pkgrel=1
pkgdesc="KDE control panel and widget network connections"
arch=('i686' 'x86_64')
@@ -15,15 +15,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}"
- 'nm-09.patch')
-md5sums=('8373cd729b12a821b28b483e3e9d253f'
- 'c46839bc0503f2dbec76282b8ab163bd')
+source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
+md5sums=('19d139aa4e80b5829b8a898b315a0a0a')
build() {
- cd "${srcdir}/networkmanagement"
- patch -p1 -i "${srcdir}/nm-09.patch"
-
cd "${srcdir}"
mkdir build
cd build
Deleted: nm-09.patch
===================================================================
--- nm-09.patch 2011-05-24 17:22:55 UTC (rev 124831)
+++ nm-09.patch 2011-05-24 17:24:45 UTC (rev 124832)
@@ -1,44 +0,0 @@
-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());
- }
-
-
More information about the arch-commits
mailing list