From 0f737b3246bd8e4945d9b96b4733e6c04035f596 Mon Sep 17 00:00:00 2001 From: Dan Vrátil Date: Jun 25 2015 16:21:50 +0000 Subject: Plasma 5.3.2 --- diff --git a/.gitignore b/.gitignore index e3b9d40..78adb60 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /plasma-desktop-5.3.1.tar.xz +/plasma-desktop-5.3.2.tar.xz diff --git a/0014-Fix-dropping-files-onto-the-desktop-containment.patch b/0014-Fix-dropping-files-onto-the-desktop-containment.patch deleted file mode 100644 index a070f5c..0000000 --- a/0014-Fix-dropping-files-onto-the-desktop-containment.patch +++ /dev/null @@ -1,41 +0,0 @@ -From a44392b54ca3e8fa7250537c7d7a9f4004c6af03 Mon Sep 17 00:00:00 2001 -From: Kai Uwe Broulik -Date: Wed, 10 Jun 2015 13:07:27 +0200 -Subject: [PATCH 14/15] Fix dropping files onto the desktop containment - -REVIEW: 124055 -FIXED-IN: 5.3.2 -BUG: 346867 ---- - containments/desktop/package/contents/ui/main.qml | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml -index 7fd7481..1df2720 100644 ---- a/containments/desktop/package/contents/ui/main.qml -+++ b/containments/desktop/package/contents/ui/main.qml -@@ -180,9 +180,7 @@ DragDrop.DropArea { - folderViewLayer.view.scrollRight = (event.x > width - (units.largeSpacing * 3)); - folderViewLayer.view.scrollUp = (event.y < (units.largeSpacing * 3)); - folderViewLayer.view.scrollDown = (event.y > height - (units.largeSpacing * 3)); -- } -- -- if (isContainment && !event.mimeData.hasUrls) { -+ } else if (isContainment) { - placeHolder.width = LayoutManager.defaultAppletSize.width; - placeHolder.height = LayoutManager.defaultAppletSize.height; - placeHolder.x = event.x - placeHolder.width / 2; -@@ -216,9 +214,7 @@ DragDrop.DropArea { - folderViewLayer.view.scrollDown = false; - - folderViewLayer.view.drop(root, event, mapToItem(folderViewLayer.view, event.x, event.y)); -- } -- -- if (isContainment && !event.mimeData.hasUrls) { -+ } else if (isContainment) { - placeHolderPaint.opacity = 0; - plasmoid.processMimeData(event.mimeData, event.x - placeHolder.width / 2, event.y - placeHolder.height / 2); - } --- -2.4.3 - diff --git a/0015-Remove-X-KDE-Library-from-the-trash-library.patch b/0015-Remove-X-KDE-Library-from-the-trash-library.patch deleted file mode 100644 index 5c49165..0000000 --- a/0015-Remove-X-KDE-Library-from-the-trash-library.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f0d4cce819b3ce683a11b49a93ba81bafef7a4dd Mon Sep 17 00:00:00 2001 -From: Bhushan Shah -Date: Tue, 16 Jun 2015 17:35:00 +0530 -Subject: [PATCH 15/15] Remove X-KDE-Library from the trash library - -trash applet is not using the c++ applet part, so remove it - -BUG: 349207 ---- - applets/trash/package/metadata.desktop | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/applets/trash/package/metadata.desktop b/applets/trash/package/metadata.desktop -index 48f1da5..b0436d4 100644 ---- a/applets/trash/package/metadata.desktop -+++ b/applets/trash/package/metadata.desktop -@@ -82,7 +82,6 @@ X-KDE-ServiceTypes=Plasma/Applet - X-Plasma-API=declarativeappletscript - X-Plasma-MainScript=ui/main.qml - --X-KDE-Library=plasma_applet_trash - X-KDE-PluginInfo-Author=Heena - X-KDE-PluginInfo-Email=heena393@gmail.com - X-KDE-PluginInfo-Name=org.kde.plasma.trash --- -2.4.3 - diff --git a/0018-Don-t-overwrite-audio-profile-entries-with-same-prio.patch b/0018-Don-t-overwrite-audio-profile-entries-with-same-prio.patch deleted file mode 100644 index 3a8be30..0000000 --- a/0018-Don-t-overwrite-audio-profile-entries-with-same-prio.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4b576cd02867672069c8077a43bb7caf442de8cc Mon Sep 17 00:00:00 2001 -From: Bernie Innocenti -Date: Wed, 17 Jun 2015 10:26:46 -0700 -Subject: [PATCH 18/18] Don't overwrite audio profile entries with same - priority - -REVIEW: 124108 ---- - kcms/phonon/audiosetup.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kcms/phonon/audiosetup.h b/kcms/phonon/audiosetup.h -index dfb25bf..72fb2be 100644 ---- a/kcms/phonon/audiosetup.h -+++ b/kcms/phonon/audiosetup.h -@@ -33,7 +33,7 @@ typedef struct { - quint32 index; - QString name; - QString icon; -- QMap > profiles; -+ QMultiMap > profiles; - QString activeProfile; - } cardInfo; - --- -2.4.3 - diff --git a/plasma-desktop.spec b/plasma-desktop.spec index b4eea04..7ee2cff 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -1,6 +1,6 @@ Name: plasma-desktop -Version: 5.3.1 -Release: 7%{?dist} +Version: 5.3.2 +Release: 1%{?dist} Summary: Plasma Desktop shell License: GPLv2+ and (GPLv2 or GPLv3) @@ -23,9 +23,6 @@ Patch101: plasma-desktop-fix-fontinst-service-path.patch Patch102: plasma-desktop-fedora_layout.patch ## upstream patches -Patch14: 0014-Fix-dropping-files-onto-the-desktop-containment.patch -Patch15: 0015-Remove-X-KDE-Library-from-the-trash-library.patch -Patch18: 0018-Don-t-overwrite-audio-profile-entries-with-same-prio.patch ## upstreamable patches # https://bugzilla.redhat.com/show_bug.cgi?id=1199825#c11 @@ -287,6 +284,9 @@ fi %changelog +* Thu Jun 25 2015 Daniel Vrátil - 5.3.2-1 +- Plasma 5.3.2 + * Tue Jun 23 2015 Rex Dieter 5.3.1-7 - kcm_touchpad: No touchpad found (#1199825) diff --git a/sources b/sources index 49871f4..5f2e1b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df4a3fabb26c7aa4f87405185835c20c plasma-desktop-5.3.1.tar.xz +535e062e140b8eb25d557aba7eb1bc24 plasma-desktop-5.3.2.tar.xz