diff --git a/0149-Fix-dropping-files-onto-the-desktop-containment.patch b/0014-Fix-dropping-files-onto-the-desktop-containment.patch similarity index 95% rename from 0149-Fix-dropping-files-onto-the-desktop-containment.patch rename to 0014-Fix-dropping-files-onto-the-desktop-containment.patch index 25d14d5..a070f5c 100644 --- a/0149-Fix-dropping-files-onto-the-desktop-containment.patch +++ b/0014-Fix-dropping-files-onto-the-desktop-containment.patch @@ -1,7 +1,7 @@ From a44392b54ca3e8fa7250537c7d7a9f4004c6af03 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Wed, 10 Jun 2015 13:07:27 +0200 -Subject: [PATCH 149/151] Fix dropping files onto the desktop containment +Subject: [PATCH 14/15] Fix dropping files onto the desktop containment REVIEW: 124055 FIXED-IN: 5.3.2 diff --git a/0015-Remove-X-KDE-Library-from-the-trash-library.patch b/0015-Remove-X-KDE-Library-from-the-trash-library.patch new file mode 100644 index 0000000..5c49165 --- /dev/null +++ b/0015-Remove-X-KDE-Library-from-the-trash-library.patch @@ -0,0 +1,27 @@ +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/plasma-desktop.spec b/plasma-desktop.spec index 684547f..dc41516 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -1,6 +1,6 @@ Name: plasma-desktop Version: 5.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Plasma Desktop shell License: GPLv2+ and (GPLv2 or GPLv3) @@ -23,7 +23,8 @@ Patch101: plasma-desktop-fix-fontinst-service-path.patch Patch102: plasma-desktop-fedora_layout.patch ## upstream patches -Patch149: 0149-Fix-dropping-files-onto-the-desktop-containment.patch +Patch14: 0014-Fix-dropping-files-onto-the-desktop-containment.patch +Patch15: 0015-Remove-X-KDE-Library-from-the-trash-library.patch BuildRequires: libusb-devel BuildRequires: fontconfig-devel @@ -281,6 +282,9 @@ fi %changelog +* Tue Jun 16 2015 Rex Dieter 5.3.1-5 +- backport trashcan applet fix (#1231972,kde#349207) + * Mon Jun 15 2015 Rex Dieter 5.3.1-4 - backport "Fix-dropping-files-onto-the-desktop-containment" - BR: kf5-kglobalaccel-devel