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

[Andrea Scarpino]

    Date: Monday, June 6, 2011 @ 02:09:21
  Author: andrea
Revision: 126533

KDE SC 4.6.4

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

----------------------------------+
 PKGBUILD                         |   15 +++++----------
 fix-app-launch-in-plasmoid.patch |   22 ----------------------
 2 files changed, 5 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-06 06:06:07 UTC (rev 126532)
+++ PKGBUILD	2011-06-06 06:09:21 UTC (rev 126533)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdebase-workspace
-pkgver=4.6.3
-pkgrel=2
+pkgver=4.6.4
+pkgrel=1
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -27,17 +27,15 @@
 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'
-        'fix-app-launch-in-plasmoid.patch')
-sha1sums=('50103b7752defbab08965b665fa95361bb5b3ff6'
+        'fixpath.patch' 'terminate-server.patch')
+sha1sums=('303f4881b3c87d1bdbdfc8c4b5fd5a2492191d87'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           'f7b38af38549242a240f1a90ab9964ca8a366129'
           '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'ca55cd0a25fd8cfb95fa3b1cdd373d496fd7312d')
+          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
@@ -45,9 +43,6 @@
 	patch -p0 -i ${srcdir}/fixpath.patch
 	patch -p0 -i ${srcdir}/terminate-server.patch
 
-    # Already fixed upstream
-    patch -p1 -i ${srcdir}/fix-app-launch-in-plasmoid.patch
-
 	cd ${srcdir}
 	mkdir build
 	cd build

Deleted: fix-app-launch-in-plasmoid.patch
===================================================================
--- fix-app-launch-in-plasmoid.patch	2011-06-06 06:06:07 UTC (rev 126532)
+++ fix-app-launch-in-plasmoid.patch	2011-06-06 06:09:21 UTC (rev 126533)
@@ -1,22 +0,0 @@
-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);
- }