From 8daf2f1d1208bb23e6be9ae97c32c2c3296fc543 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sep 25 2014 11:57:20 +0000
Subject: 4.14.1-2


- pull in upstream fixes, particularly...
- Fix scrollbar appearing on FolderView (kde#294795)

---

diff --git a/0001-Do-not-allow-files-or-folders-inside-trash-to-be-add.patch b/0001-Do-not-allow-files-or-folders-inside-trash-to-be-add.patch
new file mode 100644
index 0000000..2b56eb5
--- /dev/null
+++ b/0001-Do-not-allow-files-or-folders-inside-trash-to-be-add.patch
@@ -0,0 +1,32 @@
+From dd4b4d5bcdea1b51a4ca2f448f92a47d5cc95b1f Mon Sep 17 00:00:00 2001
+From: Arjun AK <arjunak234@gmail.com>
+Date: Sun, 21 Sep 2014 17:01:51 +0530
+Subject: [PATCH 1/2] Do not allow files or folders inside trash to be added to
+ dolphin's places panel
+
+REVIEW: 120286
+BUG: 339204
+FIXED-IN: 4.14.2
+---
+ dolphin/src/panels/places/placesitemmodel.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/dolphin/src/panels/places/placesitemmodel.cpp b/dolphin/src/panels/places/placesitemmodel.cpp
+index 1f05e07..2ac2169 100644
+--- a/dolphin/src/panels/places/placesitemmodel.cpp
++++ b/dolphin/src/panels/places/placesitemmodel.cpp
+@@ -432,8 +432,9 @@ void PlacesItemModel::dropMimeDataBefore(int index, const QMimeData* mimeData)
+                 text = url.host();
+             }
+ 
+-            if (url.isLocalFile() && !QFileInfo(url.toLocalFile()).isDir()) {
+-                // Only directories are allowed
++            if ((url.isLocalFile() && !QFileInfo(url.toLocalFile()).isDir())
++                    || url.protocol() == "trash") {
++                // Only directories outside the trash are allowed
+                 continue;
+             }
+ 
+-- 
+2.1.0
+
diff --git a/0002-Fix-scrollbar-appearing-on-FolderView.patch b/0002-Fix-scrollbar-appearing-on-FolderView.patch
new file mode 100644
index 0000000..e545cc8
--- /dev/null
+++ b/0002-Fix-scrollbar-appearing-on-FolderView.patch
@@ -0,0 +1,37 @@
+From c844098d0e6097c6ce28afaac7e680b002f7521c Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter@math.unl.edu>
+Date: Thu, 25 Sep 2014 06:51:40 -0500
+Subject: [PATCH 2/2] Fix scrollbar appearing on FolderView
+
+BUG: 294795
+FIXED-IN: 4.14.2
+REVIEW: 120057
+
+Workaround for some kind of memory corruption error which can lead to
+availRect.bottom() being set to 0 after availableScreenRect returns.
+If this happens, use qdesktopwidget instead.
+---
+ plasma/applets/folderview/folderview.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/plasma/applets/folderview/folderview.cpp b/plasma/applets/folderview/folderview.cpp
+index f56cab1..002401a 100644
+--- a/plasma/applets/folderview/folderview.cpp
++++ b/plasma/applets/folderview/folderview.cpp
+@@ -1357,6 +1357,13 @@ void FolderView::updateScreenRegion()
+     if (c->metaObject()->indexOfSlot("availableScreenRect(int)") != -1) {
+         QMetaObject::invokeMethod(c, "availableScreenRect",
+                                   Qt::DirectConnection, Q_RETURN_ARG(QRect, availRect), Q_ARG(int, screen()));
++
++        // Workaround for bug 294795. Some kind of memory corruption error can lead to
++        // availRect.bottom() being set to 0 after availableScreenRect returns. If this
++        // happens, use qdesktopwidget instead.
++        if (availRect.bottom() == 0) {
++             availRect = QApplication::desktop()->availableGeometry(screen());
++        }
+     } else {
+         kDebug() << "using qdesktopwidget";
+         availRect = QApplication::desktop()->availableGeometry(screen());
+-- 
+2.1.0
+
diff --git a/kde-baseapps.spec b/kde-baseapps.spec
index d797222..c7ad9b0 100644
--- a/kde-baseapps.spec
+++ b/kde-baseapps.spec
@@ -5,7 +5,7 @@
 Name:    kde-baseapps
 Summary: KDE Core Applications 
 Version: 4.14.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2 and GFDL
 URL:     https://projects.kde.org/projects/kde/kde-baseapps 
@@ -32,6 +32,8 @@ Patch3: kdebase-4.4.0-konqueror-kde#228593.patch
 Patch5: kde-baseapps-4.9.2-konqueror-mimetyp.patch
 
 ## upstream patches
+Patch101: 0001-Do-not-allow-files-or-folders-inside-trash-to-be-add.patch
+Patch102: 0002-Fix-scrollbar-appearing-on-FolderView.patch
 
 # optional runtime dep for kcm_useraccount, see https://git.reviewboard.kde.org/r/110875/
 %if 0%{?fedora} || 0%{?rhel} > 6
@@ -238,6 +240,8 @@ Requires: libkonq%{?_isa} = %{version}-%{release}
 %patch2 -p2 -b .home-icon
 %patch3 -p2 -b .kde#228593
 %patch5 -p1 -b .mimetyp.patch
+%patch101 -p1 -b .0001
+%patch102 -p1 -b .0002
 
 
 %build
@@ -580,6 +584,10 @@ fi
 
 
 %changelog
+* Thu Sep 25 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.14.1-2
+- pull in upstream fixes, particularly...
+- Fix scrollbar appearing on FolderView (kde#294795)
+
 * Mon Sep 15 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.14.1-1
 - 4.14.1