summaryrefslogtreecommitdiff
path: root/extra/kdebase-workspace
diff options
context:
space:
mode:
authorroot <root@rshg047.dnsready.net>2011-05-25 22:48:05 +0000
committerroot <root@rshg047.dnsready.net>2011-05-25 22:48:05 +0000
commit6e35be4b44d90f92ddceb8b067cbbf03fc652a35 (patch)
tree5a27309f3fe126e49f5a2f08f08b2526bc8d4dc2 /extra/kdebase-workspace
parent363d953113a327863013a9422c8212654a86a209 (diff)
Wed May 25 22:48:05 UTC 2011
Diffstat (limited to 'extra/kdebase-workspace')
-rw-r--r--extra/kdebase-workspace/PKGBUILD19
-rw-r--r--extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch22
2 files changed, 33 insertions, 8 deletions
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 8211dd1d7..0bc1f7a37 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122250 2011-05-03 10:29:38Z andrea $
+# $Id: PKGBUILD 124831 2011-05-24 17:22:55Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
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 @@ groups=('kde')
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 @@ backup=('usr/share/config/kdm/kdmrc'
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,14 +37,16 @@ sha1sums=('50103b7752defbab08965b665fa95361bb5b3ff6'
'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
@@ -54,7 +56,8 @@ build() {
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_Xmms=OFF \
- -DWITH_Googlegadgets=OFF
+ -DWITH_Googlegadgets=OFF \
+ -DWITH_NetworkManager=OFF
make
}
diff --git a/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch b/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch
new file mode 100644
index 000000000..fec667663
--- /dev/null
+++ b/extra/kdebase-workspace/fix-app-launch-in-plasmoid.patch
@@ -0,0 +1,22 @@
+commit 3f1dd3b94ab2b56abb43a51b7b78a9cd162325d0
+Author: Aaron Seigo <aseigo@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);
+ }