From 39711f3264d3b9de2ff6392649274d6333932457 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 29 Jan 2012 23:15:03 +0000
Subject: Sun Jan 29 23:15:02 UTC 2012

---
 extra/kdebase/PKGBUILD                         | 30 +++++++++++++++-----------
 extra/kdebase/fix-controlclick-selection.patch | 11 ++++++++++
 extra/kdebase/kdebase-dolphin.install          | 11 ++++++++++
 extra/kdebase/kdebase-konqueror.install        | 12 +++++++++++
 4 files changed, 52 insertions(+), 12 deletions(-)
 create mode 100644 extra/kdebase/fix-controlclick-selection.patch
 create mode 100644 extra/kdebase/kdebase-dolphin.install
 create mode 100644 extra/kdebase/kdebase-konqueror.install

(limited to 'extra/kdebase')

diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index 5511a4524..1450eabeb 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144637 2011-12-08 09:18:50Z andrea $
+# $Id: PKGBUILD 147790 2012-01-28 10:33:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -12,17 +12,22 @@ pkgname=('kdebase-dolphin'
          'kdebase-konqueror'
          'kdebase-lib'
          'kdebase-plasma')
-pkgver=4.7.4
+pkgver=4.8.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
-makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml')
-source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2")
-sha1sums=('ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6')
+makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
+source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2"
+        'fix-controlclick-selection.patch')
+sha1sums=('25151b551793164c5eb1cb303d3031e63a6122e3'
+          'b29c42301b84475f95f19ff9edb22d2134df9c1c')
 
 build() {
+    cd "${srcdir}"/kde-baseapps-${pkgver}
+    patch -p1 -i "${srcdir}"/fix-controlclick-selection.patch
+
 	cd ${srcdir}
 	mkdir build
 	cd build
@@ -40,6 +45,7 @@ package_kdebase-dolphin() {
                 'kdegraphics-thumbnailers: thumbnailers for graphics file'
                 'ruby: servicemenu installation')
 	url="http://kde.org/applications/system/dolphin/"
+        install=kdebase-dolphin.install
 	cd $srcdir/build/dolphin
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/doc/dolphin
@@ -94,13 +100,13 @@ package_kdebase-konqueror() {
 	depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
 	optdepends=('kwebkitpart: to enable webkit engine')
 	url="http://kde.org/applications/internet/konqueror/"
-	install='kdebase.install'
-    conflicts=('kdebase-nsplugins')
-    replaces=('kdebase-nsplugins')
-    for i in konqueror doc/konqueror nsplugins; do
-        cd $srcdir/build/${i}
-        make DESTDIR=$pkgdir install
-    done
+	install='kdebase-konqueror.install'
+        conflicts=('kdebase-nsplugins')
+        replaces=('kdebase-nsplugins')
+        for i in konqueror doc/konqueror nsplugins; do
+              cd $srcdir/build/${i}
+              make DESTDIR=$pkgdir install
+        done
 }
 
 package_kdebase-lib() {
diff --git a/extra/kdebase/fix-controlclick-selection.patch b/extra/kdebase/fix-controlclick-selection.patch
new file mode 100644
index 000000000..a51161326
--- /dev/null
+++ b/extra/kdebase/fix-controlclick-selection.patch
@@ -0,0 +1,11 @@
+--- a/dolphin/src/kitemviews/kitemlistcontroller.cpp
++++ b/dolphin/src/kitemviews/kitemlistcontroller.cpp
+@@ -471,7 +471,7 @@ bool KItemListController::mousePressEven
+                                 (!shiftOrControlPressed && !pressedItemAlreadySelected);
+     if (clearSelection) {
+         m_selectionManager->clearSelection();
+-    } else if (pressedItemAlreadySelected && (event->buttons() & Qt::LeftButton)) {
++    } else if (pressedItemAlreadySelected && !shiftOrControlPressed && (event->buttons() & Qt::LeftButton)) {
+         // The user might want to start dragging multiple items, but if he clicks the item
+         // in order to trigger it instead, the other selected items must be deselected.
+         // However, we do not know yet what the user is going to do.
diff --git a/extra/kdebase/kdebase-dolphin.install b/extra/kdebase/kdebase-dolphin.install
new file mode 100644
index 000000000..660593cf5
--- /dev/null
+++ b/extra/kdebase/kdebase-dolphin.install
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/kdebase/kdebase-konqueror.install b/extra/kdebase/kdebase-konqueror.install
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/extra/kdebase/kdebase-konqueror.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
-- 
cgit v1.2.3-54-g00ecf