Add upstream patch which fixes selection behaviour with ctrl/shift key.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 45 insertions, 11 deletions

diff --git a/kde-base/dolphin/ChangeLog b/kde-base/dolphin/ChangeLog
index ab5b72aad1b6..f8b2f6230cb0 100644
--- a/kde-base/dolphin/ChangeLog
+++ b/kde-base/dolphin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/dolphin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.123 2012/01/25 18:17:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.124 2012/01/27 09:01:13 johu Exp $
+
+*dolphin-4.8.0-r1 (27 Jan 2012)
+
+  27 Jan 2012; Johannes Huber <johu@gentoo.org> +dolphin-4.8.0-r1.ebuild,
+  +files/dolphin-4.8.0-fix-selection.patch, -dolphin-4.8.0.ebuild:
+  Add upstream patch which fixes selection behaviour with ctrl/shift key.
 
 *dolphin-4.8.0 (25 Jan 2012)
 
diff --git a/kde-base/dolphin/Manifest b/kde-base/dolphin/Manifest
index 098b7651103b..c2b9a31eacd9 100644
--- a/kde-base/dolphin/Manifest
+++ b/kde-base/dolphin/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX dolphin-4.8.0-fix-selection.patch 1290 RMD160 9b958f2e61842b8bcd3bd30a84747daa0fb60dda SHA1 959aa785922627359ea363539a6609c6b5689a8a SHA256 8c6369476a4ef86a2af882e3c1edc3c096dd454b6302c003866ce13fb0f883f9
 DIST kde-baseapps-4.7.4.tar.bz2 2684721 RMD160 cedc577cb3449e36b7e7dab1192688c8014c46d1 SHA1 ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6 SHA256 0a59e87b0019bb5d80abbc9cb2fc691ec838d43e9b168e7a15b11d40ac1db51c
 DIST kde-baseapps-4.8.0.tar.bz2 2820730 RMD160 cac3dd1200a6a56ecc1641bf79793a3944074222 SHA1 25151b551793164c5eb1cb303d3031e63a6122e3 SHA256 9cd88a3cc2d782de13834ddab9fd3a887d89bb70c29172a1c61190315c2334e3
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
 EBUILD dolphin-4.6.3.ebuild 930 RMD160 5abdf0c271715f130c976ca1ca49e3c6e1e19fc5 SHA1 510db1a36f46ab0ede6caafb3534942fdf000f66 SHA256 2e31e0e0cccc8f655a26903d2c9666ca08526d917cc9dd2e8f24de113e322149
 EBUILD dolphin-4.7.4.ebuild 1082 RMD160 1d0194205ff455d192c08ff0ff934a79c55e8922 SHA1 6fa0a7ae34dfa7eab67c2dc53104b723cd1855ab SHA256 a6ee7a6edaab463fcd344a2275439e8df34eb64d79b19e582cf8d8db943efcfa
-EBUILD dolphin-4.8.0.ebuild 1061 RMD160 6b220064354d8d71d5a7f4d2b46c03ef4d80a79a SHA1 d98c0117b6f38fdbc1e610ce08a99cee8374d1dc SHA256 73c2bc933cca5406ac122990ecd4bdca5833624a18be97bf6e73ee4e89fc5c34
-MISC ChangeLog 16476 RMD160 5e3f2f2c0d08cb61188a14776f9ff9ce05234897 SHA1 3f650f0289bda4a1faf58b8dd18d9e10ce60679c SHA256 c330f05b15f50bc4bf90df2005798b9be4107481801c210665954b72edc97dd1
+EBUILD dolphin-4.8.0-r1.ebuild 1117 RMD160 307a11e83d2e48d7a6c856d70e816171738dca8a SHA1 7a6208abfeef576178547f00208a12619a645f15 SHA256 8ac6a7638fdcabd9828aa691001041b51625ba921c51e0d53c13bfcf614ca0ec
+MISC ChangeLog 16725 RMD160 b54d93607bbb74f9dc4d0fb6bb2cb12d166614cd SHA1 98ac5ddab7b5a31b4bc07483d16ea5b91b988cff SHA256 d32d73a50a9d06502784ff942598c5a235b67c4da8e6f2d0da9b11df50fe6485
 MISC metadata.xml 287 RMD160 6079a550c87093424f04a1d307864f6558608f59 SHA1 cd35c8ff7336bf936094660061f6ef58dd16276d SHA256 f8ca0fcb27fae3e13bce985f13164013ba54c573c50a047622953f03c48a6969
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPIEgoAAoJEO+t9ga+3I3aRcEH/33jfbpLkpqYrJk3/ezGYad0
-Hj+Ryxe7A+dMGVoSS46GNAPW0YL+xYBWZbpcGX0wyG4abwfD/Boep4TA1IyudTt1
-cxi9IpZS7rruudO76x9mYNxn/JuNETyK4deE4E7n+KZiRCvdUQa9Eik38M86pQ8w
-F9Xv8ouBOOOc9Sw3+erTYWc2u++JOb318DedxS1+vvBJ5T1gX5+NYU2OG48WIo2o
-0U+zWJ9ZRo3KAOmPwrZZcBy7+vFblrXr4wA61C8ZpziSEsgW49nf3YBJnn9+Sjsg
-LItPIi3WBRiXwVmrX2RTwVGf8+MFY/AOfHYEr2u0MG6+T5zncxhjaYewN6NnBJA=
-=qmJa
+iQEcBAEBCgAGBQJPImeiAAoJEO+t9ga+3I3aV74H/jhF01Fb0r2Tc88/jidYU+u5
+20fZVNaQVdVLy0iYvENtrCH9Bz63TOooleNgRkP70gntavuZAnlsieNaydMhTau6
+0O/lZJcsU3PSx8qE0D9Q1Q8ksGVZ9hnilZ9bP8UA3lNeSNcr9thHXlgbTPVFcNOG
+Y02dR/WJZ6vpd1Owrw/SYJwnmDK9iIt1Du1ya2KQ/7SXvRr3yNJWveK+8CSswboR
+AHMb52BDMKhrI/9SBmSqC9XZUlShxDcQF785/CS3ZW5zJ/1iNAVy3caxdg3W3qVO
+98Z82fQhWjHu8BSl6SMGLglioRhNaM8pqR6YOGDnfhiSF68C1etM0QiveX4F+tY=
+=gv93
 -----END PGP SIGNATURE-----
diff --git a/kde-base/dolphin/dolphin-4.8.0.ebuild b/kde-base/dolphin/dolphin-4.8.0-r1.ebuild
index 39f5c8a94778..35322d822418 100644
--- a/kde-base/dolphin/dolphin-4.8.0.ebuild
+++ b/kde-base/dolphin/dolphin-4.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.8.0.ebuild,v 1.1 2012/01/25 18:17:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.8.0-r1.ebuild,v 1.1 2012/01/27 09:01:13 johu Exp $
 
 EAPI=4
 
@@ -35,6 +35,10 @@ KMLOADLIBS="libkonq"
 RESTRICT="test"
 # bug 393129
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-selection.patch"
+)
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
diff --git a/kde-base/dolphin/files/dolphin-4.8.0-fix-selection.patch b/kde-base/dolphin/files/dolphin-4.8.0-fix-selection.patch
new file mode 100644
index 000000000000..4e194e8863e5
--- /dev/null
+++ b/kde-base/dolphin/files/dolphin-4.8.0-fix-selection.patch
@@ -0,0 +1,23 @@
+commit 84a9cc4bf6e9decc4c102102c4b04162369eb0fe
+Author: Frank Reininghaus <frank78ac@googlemail.com>
+Date:   Mon Jan 23 19:28:21 2012 +0100
+
+    Make sure that Control+click toggles the selection state
+    
+    This commit fixes a regression caused by the recent commit
+    9f711b5f2e1d1fd856cd6b033e6adb96f9b46d8a.
+    BUG: 292250
+
+diff --git a/dolphin/src/kitemviews/kitemlistcontroller.cpp b/dolphin/src/kitemviews/kitemlistcontroller.cpp
+index 0f22d70..560d160 100644
+--- a/dolphin/src/kitemviews/kitemlistcontroller.cpp
++++ b/dolphin/src/kitemviews/kitemlistcontroller.cpp
+@@ -471,7 +471,7 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
+                                 (!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.