From c374a7f41e27832a148edf9b80c3df35eb6188669960652f1f8303d0f8804a71 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 14 Jan 2017 08:52:18 +0000 Subject: [PATCH 1/5] update to (16.12.1) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=56 --- kate-16.12.0.tar.xz | 3 --- kate-16.12.1.tar.xz | 3 +++ kate.changes | 7 +++++++ kate.spec | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 kate-16.12.0.tar.xz create mode 100644 kate-16.12.1.tar.xz diff --git a/kate-16.12.0.tar.xz b/kate-16.12.0.tar.xz deleted file mode 100644 index f5e9c86..0000000 --- a/kate-16.12.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f332e19bd1d1ec7f08b6d7cd640b38498a3c8004b61ebe1af0129292c4fe658 -size 1871448 diff --git a/kate-16.12.1.tar.xz b/kate-16.12.1.tar.xz new file mode 100644 index 0000000..7e108eb --- /dev/null +++ b/kate-16.12.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:984a82005897b553eab0525715b626f7467bc1d664b29ac7944860cd1d7012dc +size 1871456 diff --git a/kate.changes b/kate.changes index 8b40d6d..61cc5b3 100644 --- a/kate.changes +++ b/kate.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Jan 14 08:52:14 UTC 2017 - lbeltrame@kde.org + +- - Update to KDE Applications 16.12.0 + * KDE Applications 16.12.0 + * https://www.kde.org/announcements/announce-applications-16.12.0.php + ------------------------------------------------------------------- Tue Dec 13 19:33:57 UTC 2016 - tittiatcoke@gmail.com diff --git a/kate.spec b/kate.spec index 19f563e..d756632 100644 --- a/kate.spec +++ b/kate.spec @@ -18,10 +18,10 @@ %define _appstreamkpackage 0%(cat %{_kf5_libdir}/cmake/KF5Package/KF5PackageMacros.cmake | grep -q 'appstream-metainfo' && echo 1) Name: kate -Version: 16.12.0 +Version: 16.12.1 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.0 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.12.1 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Advanced Text Editor License: GPL-2.0+ From 0c03243daca1dcb4ed066526b910fcd20c654cde0893ebd7eaf2382f2a6418c1 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 14 Jan 2017 10:31:55 +0000 Subject: [PATCH 2/5] Fixup version number OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=57 --- kate.changes | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kate.changes b/kate.changes index 61cc5b3..df60b17 100644 --- a/kate.changes +++ b/kate.changes @@ -1,9 +1,9 @@ ------------------------------------------------------------------- Sat Jan 14 08:52:14 UTC 2017 - lbeltrame@kde.org -- - Update to KDE Applications 16.12.0 - * KDE Applications 16.12.0 - * https://www.kde.org/announcements/announce-applications-16.12.0.php +- - Update to KDE Applications 16.12.1 + * KDE Applications 16.12.1 + * https://www.kde.org/announcements/announce-applications-16.12.1.php ------------------------------------------------------------------- Tue Dec 13 19:33:57 UTC 2016 - tittiatcoke@gmail.com From f4e60bb72df7eafca2dfd67bb74c3372cfcd53aba7a51a1c01463d19dc63211f Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 19 Jan 2017 19:19:53 +0000 Subject: [PATCH 3/5] - Add upstream patch to fix build with plasma-framework >= 5.30 * remove-popupapplet-servicetypet.patch - Update to KDE Applications 16.12.1 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=58 --- kate.changes | 8 +++++++- kate.spec | 3 +++ remove-popupapplet-servicetypet.patch | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 remove-popupapplet-servicetypet.patch diff --git a/kate.changes b/kate.changes index df60b17..976df22 100644 --- a/kate.changes +++ b/kate.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Thu Jan 19 19:19:16 UTC 2017 - fabian@ritter-vogt.de + +- Add upstream patch to fix build with plasma-framework >= 5.30 + * remove-popupapplet-servicetypet.patch + ------------------------------------------------------------------- Sat Jan 14 08:52:14 UTC 2017 - lbeltrame@kde.org -- - Update to KDE Applications 16.12.1 +- Update to KDE Applications 16.12.1 * KDE Applications 16.12.1 * https://www.kde.org/announcements/announce-applications-16.12.1.php diff --git a/kate.spec b/kate.spec index d756632..77d7439 100644 --- a/kate.spec +++ b/kate.spec @@ -29,6 +29,8 @@ License: GPL-2.0+ Group: Productivity/Editors/Other Url: http://www.kde.org/ Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM remove-popupapplet-servicetypet.patch -- Remove the depreciated Plasma PopupApplet servicetype +Patch1: remove-popupapplet-servicetypet.patch BuildRequires: kactivities5-devel BuildRequires: kconfig-devel BuildRequires: kcrash-devel @@ -87,6 +89,7 @@ plugins and data files for Kate and KWrite editors. %prep %setup -q +%patch1 -p1 %build %cmake_kf5 -d build diff --git a/remove-popupapplet-servicetypet.patch b/remove-popupapplet-servicetypet.patch new file mode 100644 index 0000000..8f03391 --- /dev/null +++ b/remove-popupapplet-servicetypet.patch @@ -0,0 +1,22 @@ +From a1f8e09413465969d10b198a6c3bb01e90ca440d Mon Sep 17 00:00:00 2001 +From: Raymond Wooninck +Date: Wed, 21 Dec 2016 11:22:36 +0100 +Subject: [PATCH] Remove the depreciated Plasma PopupApplet servicetype + +--- + addons/sessionapplet/applet/metadata.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/addons/sessionapplet/applet/metadata.desktop b/addons/sessionapplet/applet/metadata.desktop +index e63b770..54ea8dd 100644 +--- a/addons/sessionapplet/applet/metadata.desktop ++++ b/addons/sessionapplet/applet/metadata.desktop +@@ -96,7 +96,7 @@ Comment[zh_TW]=Kate 工作階段啟動器 + + Type=Service + Icon=kate +-X-KDE-ServiceTypes=Plasma/Applet,Plasma/PopupApplet ++X-KDE-ServiceTypes=Plasma/Applet + + X-Plasma-API=declarativeappletscript + X-Plasma-MainScript=ui/katesessions.qml From e26ddd4e050c49cfe9f2ce7139ced5a423dddbccb9f37c34a849df0f3cb46c76 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 19 Jan 2017 19:24:22 +0000 Subject: [PATCH 4/5] * remove-popupapplet-servicetype.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=59 --- kate.changes | 2 +- kate.spec | 4 ++-- ...servicetypet.patch => remove-popupapplet-servicetype.patch | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename remove-popupapplet-servicetypet.patch => remove-popupapplet-servicetype.patch (100%) diff --git a/kate.changes b/kate.changes index 976df22..a764a4a 100644 --- a/kate.changes +++ b/kate.changes @@ -2,7 +2,7 @@ Thu Jan 19 19:19:16 UTC 2017 - fabian@ritter-vogt.de - Add upstream patch to fix build with plasma-framework >= 5.30 - * remove-popupapplet-servicetypet.patch + * remove-popupapplet-servicetype.patch ------------------------------------------------------------------- Sat Jan 14 08:52:14 UTC 2017 - lbeltrame@kde.org diff --git a/kate.spec b/kate.spec index 77d7439..1ccdfec 100644 --- a/kate.spec +++ b/kate.spec @@ -29,8 +29,8 @@ License: GPL-2.0+ Group: Productivity/Editors/Other Url: http://www.kde.org/ Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM remove-popupapplet-servicetypet.patch -- Remove the depreciated Plasma PopupApplet servicetype -Patch1: remove-popupapplet-servicetypet.patch +# PATCH-FIX-UPSTREAM remove-popupapplet-servicetype.patch -- Remove the depreciated Plasma PopupApplet servicetype +Patch1: remove-popupapplet-servicetype.patch BuildRequires: kactivities5-devel BuildRequires: kconfig-devel BuildRequires: kcrash-devel diff --git a/remove-popupapplet-servicetypet.patch b/remove-popupapplet-servicetype.patch similarity index 100% rename from remove-popupapplet-servicetypet.patch rename to remove-popupapplet-servicetype.patch From f8b3e8de68d2b65edbb6fa48c3a4bdfd6d6324ddf3830f117b3673377615990a Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 19 Jan 2017 19:42:49 +0000 Subject: [PATCH 5/5] Refresh patch OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=60 --- remove-popupapplet-servicetype.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/remove-popupapplet-servicetype.patch b/remove-popupapplet-servicetype.patch index 8f03391..369f294 100644 --- a/remove-popupapplet-servicetype.patch +++ b/remove-popupapplet-servicetype.patch @@ -7,11 +7,11 @@ Subject: [PATCH] Remove the depreciated Plasma PopupApplet servicetype addons/sessionapplet/applet/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/addons/sessionapplet/applet/metadata.desktop b/addons/sessionapplet/applet/metadata.desktop -index e63b770..54ea8dd 100644 ---- a/addons/sessionapplet/applet/metadata.desktop -+++ b/addons/sessionapplet/applet/metadata.desktop -@@ -96,7 +96,7 @@ Comment[zh_TW]=Kate 工作階段啟動器 +Index: kate-16.12.1/addons/sessionapplet/applet/metadata.desktop +=================================================================== +--- kate-16.12.1.orig/addons/sessionapplet/applet/metadata.desktop ++++ kate-16.12.1/addons/sessionapplet/applet/metadata.desktop +@@ -98,7 +98,7 @@ Comment[zh_TW]=Kate å·¥ä½œéšŽæ®µå•Ÿå‹•å™ Type=Service Icon=kate