[arch-commits] Commit in kdelibs/trunk (PKGBUILD kdedglobalaccel.patch)

[Pierre Schmitz]

    Date: Wednesday, October 29, 2008 @ 04:42:06
  Author: pierre
Revision: 17419

prepare for 4.1.3 release

Modified:
  kdelibs/trunk/PKGBUILD
Deleted:
  kdelibs/trunk/kdedglobalaccel.patch

-----------------------+
 PKGBUILD              |    7 ++-----
 kdedglobalaccel.patch |   31 -------------------------------
 2 files changed, 2 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-29 05:23:06 UTC (rev 17418)
+++ PKGBUILD	2008-10-29 08:42:06 UTC (rev 17419)
@@ -17,16 +17,13 @@
 options=('docs')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch' 'kdedglobalaccel.patch')
+        'kde-applications-menu.patch' 'archlinux-menu.patch')
 md5sums=('cb5f43d2b11669fb17b0a1ecf3736c17'
          '3daa0f01fe26325fb3dbd807a04898ad'
-         '0ad42200df2d2b8aab01d2ef4b21e02f'
-         '5798b93694522b8d2d98ddb60ccf9a3a')
+         '0ad42200df2d2b8aab01d2ef4b21e02f')
 
 build() {
 	cd $srcdir/${pkgname}-${pkgver}
-	# fix crash with broken config files (see Bug #171870 and #171206)
-	patch -p0 -i $srcdir/kdedglobalaccel.patch || return 1
 	# avoid file conflict with gnome-menu
 	patch -p1 -i $srcdir/kde-applications-menu.patch || return 1
 	# add Archlinux menu entry

Deleted: kdedglobalaccel.patch
===================================================================
--- kdedglobalaccel.patch	2008-10-29 05:23:06 UTC (rev 17418)
+++ kdedglobalaccel.patch	2008-10-29 08:42:06 UTC (rev 17419)
@@ -1,31 +0,0 @@
-Index: kdeui/shortcuts/kdedglobalaccel.cpp
-===================================================================
---- kdeui/shortcuts/kdedglobalaccel.cpp	(Revision 866735)
-+++ kdeui/shortcuts/kdedglobalaccel.cpp	(Revision 866736)
-@@ -394,8 +394,9 @@
- 
- void KdedGlobalAccel::unRegister(const QStringList &actionId)
- {
-+    kDebug(125) << actionId;
-+
-     Q_ASSERT(actionId.size()==4);
--
-     if (actionId.size() < 4) {
-         return;
-     }
-@@ -661,7 +662,14 @@
- 
-             foreach (int key, ad->keys) {
-                 if (key != 0) {
--                    d->keyToAction.insert(key, ad);
-+                    if (d->keyToAction.contains(key)) {
-+                        // The shortcut is already used. The config file is
-+                        // broken. Ignore the request.
-+                        ad->keys.removeAll(key);
-+                        kWarning() << "Shortcut found twice in kglobalshortcutsrc.";
-+                    } else {
-+                        d->keyToAction.insert(key, ad);
-+                    }
-                 }
-             }
-         }