From a7b7683dacfba446f463f1e50ebbdb57bf573f0d Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Wed, 17 Jan 2018 21:27:12 +0100
Subject: [PATCH] Update to Plasma 5.11.5

Also add a script to add/remove versions.
---
 .../{breeze_5.11.3.bb => breeze_5.11.5.bb}    |  0
 ...{discover_5.11.3.bb => discover_5.11.5.bb} |  0
 ..._5.11.3.bb => kactivitymanagerd_5.11.5.bb} |  0
 ...ools_5.11.3.bb => kde-cli-tools_5.11.5.bb} |  0
 ...ration_5.11.3.bb => kdecoration_5.11.5.bb} |  0
 ...cker_5.11.3.bb => kscreenlocker_5.11.5.bb} |  0
 ...11.3.bb => kwayland-integration_5.11.5.bb} |  0
 recipes-plasma/kwin/0001-compile-fix.patch    | 14 --------
 .../{kwin_5.11.3.bb => kwin_5.11.5.bb}        |  0
 ...kscreen_5.11.3.bb => libkscreen_5.11.5.bb} |  0
 ...guard_5.11.3.bb => libksysguard_5.11.5.bb} |  0
 .../{milou_5.11.3.bb => milou_5.11.5.bb}      |  0
 ...5.11.3.bb => plasma-integration_5.11.5.bb} |  0
 ...lasma-nm_5.11.3.bb => plasma-nm_5.11.5.bb} |  0
 ...lasma-pa_5.11.3.bb => plasma-pa_5.11.5.bb} |  0
 ...e_5.11.3.bb => plasma-workspace_5.11.5.bb} |  0
 ...5.11.3.bb => polkit-kde-agent-1_5.11.5.bb} |  0
 ...erdevil_5.11.3.bb => powerdevil_5.11.5.bb} |  0
 ...ngs_5.11.3.bb => systemsettings_5.11.5.bb} |  0
 scripts/plasma-release.sh                     | 36 +++++++++++++++++++
 20 files changed, 36 insertions(+), 14 deletions(-)
 rename recipes-plasma/{breeze_5.11.3.bb => breeze_5.11.5.bb} (100%)
 rename recipes-plasma/{discover_5.11.3.bb => discover_5.11.5.bb} (100%)
 rename recipes-plasma/{kactivitymanagerd_5.11.3.bb => kactivitymanagerd_5.11.5.bb} (100%)
 rename recipes-plasma/{kde-cli-tools_5.11.3.bb => kde-cli-tools_5.11.5.bb} (100%)
 rename recipes-plasma/{kdecoration_5.11.3.bb => kdecoration_5.11.5.bb} (100%)
 rename recipes-plasma/{kscreenlocker_5.11.3.bb => kscreenlocker_5.11.5.bb} (100%)
 rename recipes-plasma/{kwayland-integration_5.11.3.bb => kwayland-integration_5.11.5.bb} (100%)
 rename recipes-plasma/{kwin_5.11.3.bb => kwin_5.11.5.bb} (100%)
 rename recipes-plasma/{libkscreen_5.11.3.bb => libkscreen_5.11.5.bb} (100%)
 rename recipes-plasma/{libksysguard_5.11.3.bb => libksysguard_5.11.5.bb} (100%)
 rename recipes-plasma/{milou_5.11.3.bb => milou_5.11.5.bb} (100%)
 rename recipes-plasma/{plasma-integration_5.11.3.bb => plasma-integration_5.11.5.bb} (100%)
 rename recipes-plasma/{plasma-nm_5.11.3.bb => plasma-nm_5.11.5.bb} (100%)
 rename recipes-plasma/{plasma-pa_5.11.3.bb => plasma-pa_5.11.5.bb} (100%)
 rename recipes-plasma/{plasma-workspace_5.11.3.bb => plasma-workspace_5.11.5.bb} (100%)
 rename recipes-plasma/{polkit-kde-agent-1_5.11.3.bb => polkit-kde-agent-1_5.11.5.bb} (100%)
 rename recipes-plasma/{powerdevil_5.11.3.bb => powerdevil_5.11.5.bb} (100%)
 rename recipes-plasma/{systemsettings_5.11.3.bb => systemsettings_5.11.5.bb} (100%)
 create mode 100755 scripts/plasma-release.sh

diff --git a/recipes-plasma/breeze_5.11.3.bb b/recipes-plasma/breeze_5.11.5.bb
similarity index 100%
rename from recipes-plasma/breeze_5.11.3.bb
rename to recipes-plasma/breeze_5.11.5.bb
diff --git a/recipes-plasma/discover_5.11.3.bb b/recipes-plasma/discover_5.11.5.bb
similarity index 100%
rename from recipes-plasma/discover_5.11.3.bb
rename to recipes-plasma/discover_5.11.5.bb
diff --git a/recipes-plasma/kactivitymanagerd_5.11.3.bb b/recipes-plasma/kactivitymanagerd_5.11.5.bb
similarity index 100%
rename from recipes-plasma/kactivitymanagerd_5.11.3.bb
rename to recipes-plasma/kactivitymanagerd_5.11.5.bb
diff --git a/recipes-plasma/kde-cli-tools_5.11.3.bb b/recipes-plasma/kde-cli-tools_5.11.5.bb
similarity index 100%
rename from recipes-plasma/kde-cli-tools_5.11.3.bb
rename to recipes-plasma/kde-cli-tools_5.11.5.bb
diff --git a/recipes-plasma/kdecoration_5.11.3.bb b/recipes-plasma/kdecoration_5.11.5.bb
similarity index 100%
rename from recipes-plasma/kdecoration_5.11.3.bb
rename to recipes-plasma/kdecoration_5.11.5.bb
diff --git a/recipes-plasma/kscreenlocker_5.11.3.bb b/recipes-plasma/kscreenlocker_5.11.5.bb
similarity index 100%
rename from recipes-plasma/kscreenlocker_5.11.3.bb
rename to recipes-plasma/kscreenlocker_5.11.5.bb
diff --git a/recipes-plasma/kwayland-integration_5.11.3.bb b/recipes-plasma/kwayland-integration_5.11.5.bb
similarity index 100%
rename from recipes-plasma/kwayland-integration_5.11.3.bb
rename to recipes-plasma/kwayland-integration_5.11.5.bb
diff --git a/recipes-plasma/kwin/0001-compile-fix.patch b/recipes-plasma/kwin/0001-compile-fix.patch
index 95ecc47..fec5527 100644
--- a/recipes-plasma/kwin/0001-compile-fix.patch
+++ b/recipes-plasma/kwin/0001-compile-fix.patch
@@ -34,17 +34,3 @@ index 302bac7f4..27b70810d 100644
  
  namespace KWin
  {
-diff --git a/wayland_server.cpp b/wayland_server.cpp
-index dd4727727..a64bd10d5 100644
---- a/wayland_server.cpp
-+++ b/wayland_server.cpp
-@@ -33,7 +33,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include <KWayland/Client/surface.h>
- // Server
- #include <KWayland/Server/compositor_interface.h>
-+#include <KWayland/Server/datadevice_interface.h>
- #include <KWayland/Server/datadevicemanager_interface.h>
-+#include <KWayland/Server/datasource_interface.h>
- #include <KWayland/Server/display.h>
- #include <KWayland/Server/dpms_interface.h>
- #include <KWayland/Server/idle_interface.h>
diff --git a/recipes-plasma/kwin_5.11.3.bb b/recipes-plasma/kwin_5.11.5.bb
similarity index 100%
rename from recipes-plasma/kwin_5.11.3.bb
rename to recipes-plasma/kwin_5.11.5.bb
diff --git a/recipes-plasma/libkscreen_5.11.3.bb b/recipes-plasma/libkscreen_5.11.5.bb
similarity index 100%
rename from recipes-plasma/libkscreen_5.11.3.bb
rename to recipes-plasma/libkscreen_5.11.5.bb
diff --git a/recipes-plasma/libksysguard_5.11.3.bb b/recipes-plasma/libksysguard_5.11.5.bb
similarity index 100%
rename from recipes-plasma/libksysguard_5.11.3.bb
rename to recipes-plasma/libksysguard_5.11.5.bb
diff --git a/recipes-plasma/milou_5.11.3.bb b/recipes-plasma/milou_5.11.5.bb
similarity index 100%
rename from recipes-plasma/milou_5.11.3.bb
rename to recipes-plasma/milou_5.11.5.bb
diff --git a/recipes-plasma/plasma-integration_5.11.3.bb b/recipes-plasma/plasma-integration_5.11.5.bb
similarity index 100%
rename from recipes-plasma/plasma-integration_5.11.3.bb
rename to recipes-plasma/plasma-integration_5.11.5.bb
diff --git a/recipes-plasma/plasma-nm_5.11.3.bb b/recipes-plasma/plasma-nm_5.11.5.bb
similarity index 100%
rename from recipes-plasma/plasma-nm_5.11.3.bb
rename to recipes-plasma/plasma-nm_5.11.5.bb
diff --git a/recipes-plasma/plasma-pa_5.11.3.bb b/recipes-plasma/plasma-pa_5.11.5.bb
similarity index 100%
rename from recipes-plasma/plasma-pa_5.11.3.bb
rename to recipes-plasma/plasma-pa_5.11.5.bb
diff --git a/recipes-plasma/plasma-workspace_5.11.3.bb b/recipes-plasma/plasma-workspace_5.11.5.bb
similarity index 100%
rename from recipes-plasma/plasma-workspace_5.11.3.bb
rename to recipes-plasma/plasma-workspace_5.11.5.bb
diff --git a/recipes-plasma/polkit-kde-agent-1_5.11.3.bb b/recipes-plasma/polkit-kde-agent-1_5.11.5.bb
similarity index 100%
rename from recipes-plasma/polkit-kde-agent-1_5.11.3.bb
rename to recipes-plasma/polkit-kde-agent-1_5.11.5.bb
diff --git a/recipes-plasma/powerdevil_5.11.3.bb b/recipes-plasma/powerdevil_5.11.5.bb
similarity index 100%
rename from recipes-plasma/powerdevil_5.11.3.bb
rename to recipes-plasma/powerdevil_5.11.5.bb
diff --git a/recipes-plasma/systemsettings_5.11.3.bb b/recipes-plasma/systemsettings_5.11.5.bb
similarity index 100%
rename from recipes-plasma/systemsettings_5.11.3.bb
rename to recipes-plasma/systemsettings_5.11.5.bb
diff --git a/scripts/plasma-release.sh b/scripts/plasma-release.sh
new file mode 100755
index 0000000..157b4eb
--- /dev/null
+++ b/scripts/plasma-release.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# add/remove Plasma release recipes
+#
+
+function usage()
+{
+    echo "$1 [add|remove] <version>"
+    exit 1
+}
+
+command=$1
+if [ -z "$command" ]; then usage $0; fi
+
+version=$2
+if [ -z "$version" ]; then usage $0; fi
+
+base=`dirname $0`/../recipes-plasma
+
+case $command in
+add)
+    for recipe in `find $base -name "*.inc" | grep -v /staging/`; do
+        name=`echo $recipe | sed -e "s,\.inc,_${version}.bb,"`
+        echo -e 'require ${PN}.inc\nSRCREV = "v${PV}"' > $name
+        git add $name
+    done
+    ;;
+remove)
+    for recipe in `find $base -name "*_$version.bb"`; do
+        git rm -f $recipe
+    done
+    ;;
+*)
+    usage $0
+    ;;
+esac