[arch-commits] Commit in kdelibs/repos (3 files)

[Pierre Schmitz]

    Date: Friday, October 31, 2008 @ 03:44:42
  Author: pierre
Revision: 17633

Merged revisions 17419,17449,17562 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/kdelibs/trunk

........
  r17419 | pierre | 2008-10-29 09:42:06 +0100 (Mi, 29 Okt 2008) | 1 line
  
  prepare for 4.1.3 release
........
  r17449 | pierre | 2008-10-30 10:46:23 +0100 (Do, 30 Okt 2008) | 1 line
  
  pmount is not needed
........
  r17562 | pierre | 2008-10-31 04:05:49 +0100 (Fr, 31 Okt 2008) | 1 line
  
  prepare for 4.1.3 release
........

Modified:
  kdelibs/repos/extra-i686/	(properties)
  kdelibs/repos/extra-i686/PKGBUILD
Deleted:
  kdelibs/repos/extra-i686/kdedglobalaccel.patch

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


Property changes on: kdelibs/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /kdelibs/trunk:1-14890
   + /kdelibs/trunk:1-17632

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-31 07:39:31 UTC (rev 17632)
+++ extra-i686/PKGBUILD	2008-10-31 07:44:42 UTC (rev 17633)
@@ -2,31 +2,28 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdelibs
-pkgver=4.1.2
-pkgrel=2
+pkgver=4.1.3
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde')
-depends=('libxcursor' 'phonon' 'shared-mime-info' 'qt>=4.4' 'libxpm'
+depends=('libxcursor' 'phonon' 'shared-mime-info' 'qt>=4.4' 'libxpm' 'hal'
 	 'enchant' 'jasper' 'openexr' 'strigi' 'bzip2' 'libxslt' 'libxtst'
-	 'giflib' 'soprano' 'ca-certificates' 'heimdal' 'pmount' 'xdg-utils')
+	 'giflib' 'soprano' 'ca-certificates' 'heimdal' 'xdg-utils' 'libxft')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 'hspell')
 replaces=('arts')
 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')
-md5sums=('cb5f43d2b11669fb17b0a1ecf3736c17'
+        'kde-applications-menu.patch' 'archlinux-menu.patch')
+md5sums=('562090d3c1d891081bc4a392e0b513ac'
          '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: extra-i686/kdedglobalaccel.patch
===================================================================
--- extra-i686/kdedglobalaccel.patch	2008-10-31 07:39:31 UTC (rev 17632)
+++ extra-i686/kdedglobalaccel.patch	2008-10-31 07:44:42 UTC (rev 17633)
@@ -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);
-+                    }
-                 }
-             }
-         }