diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-05 16:07:43 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-05 16:07:43 -0300 |
| commit | 3a0008bd8a3e6f4f21181c1fadc17c3da3108907 (patch) | |
| tree | 175c9e1755980b2a955b1b9e6b93c1a3d431276f /extra/kdeplasma-applets-networkmanagement | |
| parent | 933e5d274b2a4e386565d2f3bb982682e168438b (diff) | |
| parent | 2bba02fdaa36de05dffef6a54b57c73259d7db53 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/alienarena/PKGBUILD
community/mumble/PKGBUILD
community/mysql-workbench/PKGBUILD
community/paintown/PKGBUILD
community/ufoai/PKGBUILD
core/dcron/PKGBUILD
core/udev/PKGBUILD
extra/qt/PKGBUILD
extra/texlive-bin/PKGBUILD
testing/opencv/PKGBUILD
testing/pciutils/PKGBUILD
testing/usbutils/PKGBUILD
Diffstat (limited to 'extra/kdeplasma-applets-networkmanagement')
| -rw-r--r-- | extra/kdeplasma-applets-networkmanagement/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/kdeplasma-applets-networkmanagement/nm-09.patch | 44 |
2 files changed, 56 insertions, 4 deletions
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index 93e781170..b3d455918 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -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' 'mips64el') @@ -14,10 +15,15 @@ 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}") -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 @@ package() { cd ${srcdir}/build make DESTDIR=${pkgdir} install } +md5sums=('8373cd729b12a821b28b483e3e9d253f' + 'c46839bc0503f2dbec76282b8ab163bd') diff --git a/extra/kdeplasma-applets-networkmanagement/nm-09.patch b/extra/kdeplasma-applets-networkmanagement/nm-09.patch new file mode 100644 index 000000000..52b875513 --- /dev/null +++ b/extra/kdeplasma-applets-networkmanagement/nm-09.patch @@ -0,0 +1,44 @@ +From: Lamarque V. Souza <lamarque@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()); + } + + |