[arch-commits] Commit in kdebase-workspace/trunk (3 files)

[Andrea Scarpino]

    Date: Tuesday, May 24, 2011 @ 13:22:55
  Author: andrea
Revision: 124831

Disable NetworkManager backend, is provided by the new version of the networkmanagement plasmoid; apply patch to avoid double launch of an application from a plasmoid (FS#24263); remove useless bluez makedependence

Added:
  kdebase-workspace/trunk/fix-app-launch-in-plasmoid.patch
Modified:
  kdebase-workspace/trunk/PKGBUILD
Deleted:
  kdebase-workspace/trunk/nm-09.patch

----------------------------------+
 PKGBUILD                         |   17 ++++++++++-------
 fix-app-launch-in-plasmoid.patch |   22 ++++++++++++++++++++++
 nm-09.patch                      |   34 ----------------------------------
 3 files changed, 32 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-24 16:19:44 UTC (rev 124830)
+++ PKGBUILD	2011-05-24 17:22:55 UTC (rev 124831)
@@ -4,7 +4,7 @@
 
 pkgname=kdebase-workspace
 pkgver=4.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -16,8 +16,7 @@
 depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'qimageblitz' 'libqalculate'
          'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx'
          'xorg-xsetroot' 'libxcomposite' 'libxinerama')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'networkmanager' 'bluez'
-             'python2' 'kdebindings-python')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python')
 replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
 conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
 install="${pkgname}.install"
@@ -28,7 +27,8 @@
 options=('emptydirs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch' 'nm-09.patch')
+        'fixpath.patch' 'terminate-server.patch'
+        'fix-app-launch-in-plasmoid.patch')
 sha1sums=('50103b7752defbab08965b665fa95361bb5b3ff6'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
@@ -37,15 +37,17 @@
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          '91ed84f5bb99909cab1b5ca0779bbf5cf6c72d33')
+          'ca55cd0a25fd8cfb95fa3b1cdd373d496fd7312d')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 	patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
 	patch -p0 -i ${srcdir}/fixpath.patch
 	patch -p0 -i ${srcdir}/terminate-server.patch
-    patch -p1 -i ${srcdir}/nm-09.patch
 
+    # Already fixed upstream
+    patch -p1 -i ${srcdir}/fix-app-launch-in-plasmoid.patch
+
 	cd ${srcdir}
 	mkdir build
 	cd build
@@ -54,7 +56,8 @@
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DWITH_Xmms=OFF \
-		-DWITH_Googlegadgets=OFF
+		-DWITH_Googlegadgets=OFF \
+        -DWITH_NetworkManager=OFF
 	make
 }
 

Added: fix-app-launch-in-plasmoid.patch
===================================================================
--- fix-app-launch-in-plasmoid.patch	                        (rev 0)
+++ fix-app-launch-in-plasmoid.patch	2011-05-24 17:22:55 UTC (rev 124831)
@@ -0,0 +1,22 @@
+commit 3f1dd3b94ab2b56abb43a51b7b78a9cd162325d0
+Author: Aaron Seigo <aseigo at kde.org>
+Date:   Fri May 6 22:51:50 2011 +0200
+
+    get rid of duplicate connect
+    
+    patch contributed by Luc Menut
+    BUG:262614
+    REVIEW:101284
+
+diff --git a/plasma/generic/containmentactions/applauncher/launch.cpp b/plasma/generic/containmentactions/applauncher/launch.cpp
+index cbc7175..bef53e5 100644
+--- a/plasma/generic/containmentactions/applauncher/launch.cpp
++++ b/plasma/generic/containmentactions/applauncher/launch.cpp
+@@ -36,7 +36,6 @@ AppLauncher::AppLauncher(QObject *parent, const QVariantList &args)
+ {
+     m_menu = new KMenu();
+     connect(m_menu, SIGNAL(triggered(QAction*)), this, SLOT(switchTo(QAction*)));
+-    connect(m_menu, SIGNAL(triggered(QAction*)), this, SLOT(switchTo(QAction*)));
+ 
+     m_action->setMenu(m_menu);
+ }

Deleted: nm-09.patch
===================================================================
--- nm-09.patch	2011-05-24 16:19:44 UTC (rev 124830)
+++ nm-09.patch	2011-05-24 17:22:55 UTC (rev 124831)
@@ -1,34 +0,0 @@
---- kdebase-workspace-4.6.3/solid/CMakeLists.txt~	2011-04-29 03:43:20.321994578 -0700
-+++ kdebase-workspace-4.6.3/solid/CMakeLists.txt	2011-04-29 03:43:33.271995023 -0700
-@@ -17,7 +17,7 @@
-     add_subdirectory(networkmanager-0.6)
-   endif (NM_0_6)
- 
--  macro_ensure_version_range("0.7.0" ${NETWORKMANAGER_VERSION} "0.9.0" NM_0_7)
-+  macro_ensure_version("0.7.0" ${NETWORKMANAGER_VERSION} NM_0_7)
-   if (NM_0_7)
-     message(STATUS "Will build networkmanager-0.7")
-     set(HAVE_NETWORKMANAGER TRUE)
---- kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp~	2011-04-29 03:32:33.838644845 -0700
-+++ kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp	2011-04-29 03:40:52.308657544 -0700
-@@ -118,16 +118,16 @@
-     uint deviceType = devIface.deviceType();
-     NMNetworkInterface * createdInterface = 0;
-     switch ( deviceType ) {
--        case DEVICE_TYPE_802_3_ETHERNET:
-+        case NM_DEVICE_TYPE_ETHERNET:
-             createdInterface = new NMWiredNetworkInterface(uni, this, 0); // these are deleted by the frontend manager
-             break;
--        case DEVICE_TYPE_802_11_WIRELESS:
-+        case NM_DEVICE_TYPE_WIFI:
-             createdInterface = new NMWirelessNetworkInterface(uni, this, 0);
-             break;
--        case DEVICE_TYPE_GSM:
-+        case 3:
-             createdInterface = new NMGsmNetworkInterface(uni, this, 0);
-             break;
--        case DEVICE_TYPE_CDMA:
-+        case 4:
-             createdInterface = new NMCdmaNetworkInterface(uni, this, 0);
-             break;
-             /*