diff --git a/applications.keyring b/applications.keyring index 57c966e..48be415 100644 Binary files a/applications.keyring and b/applications.keyring differ diff --git a/kate-19.08.3.tar.xz b/kate-19.08.3.tar.xz deleted file mode 100644 index a20ea56..0000000 --- a/kate-19.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab9f076e7e825fca64252b366e637e34157f1f875aa573bdae333fc240e0ec71 -size 5844532 diff --git a/kate-19.08.3.tar.xz.sig b/kate-19.08.3.tar.xz.sig deleted file mode 100644 index f45d713..0000000 --- a/kate-19.08.3.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl3A/OMACgkQ29LOiT4t -HIeHRgf9FiJvbj5E0GkFROT1Vn1TeaBzonQpnWbz0yMtQQcCbsDqX7W2BCkAoygX -psNK/1t1zIRY00vluLoCmCgkIyZA1vHL/nLYfBOXk2gFH5WWG/SKSiij9xd92DRb -hRXneKGvg0wQN8jQKLyZbWTR2A+Av+iVo7wLdITNZQeUBv5oMSd47SUoJleRF4SN -rWGA0cp+BTjzvNB5rkznfiSWtu5OxVUQZwMWOTMio0DNdF+hFNwOIoeYGA3pjVPB -e3qEdMxr0jUM588BR6A26K9Ls1XCyCGck/lyYRVEQGgQIzB93bIwf+7E6ncTcW9f -lUFXFXWi3kBn8J/UcXbkkUWJDHLRGg== -=aKrY ------END PGP SIGNATURE----- diff --git a/kate-19.11.80.tar.xz b/kate-19.11.80.tar.xz new file mode 100644 index 0000000..0b19f43 --- /dev/null +++ b/kate-19.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fda7e964bb44a8d27a7f31f174439af88b93db82418219fc5a2c84e9db399f2 +size 5856780 diff --git a/kate-19.11.80.tar.xz.sig b/kate-19.11.80.tar.xz.sig new file mode 100644 index 0000000..14af697 --- /dev/null +++ b/kate-19.11.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl3ObwcACgkQOmpNuDnq +ptcK1g//atlzBpi/S1vmmYYOfmrjOim5Gld+UoHZvwpfv0CF2MHqzKsVhnKbUX78 +31MQSA9V6a3G4+6H1u2PcOAOzM5zM7bZfyc1GUob4qqatMC1hVMyIS+aBSBa7MU/ +uD3QJPQq/Y5FeN7MpMgf6nZBdProyhB/WlfI0lBAaHwt0sdH5jOY3aDJCaNh3JjX +kHv5KTiU6sAokZyF6inTMNitWMUSmrn/mUIugdrpjQvdEZz8JRjmi6ci/KwgGpu5 +fI9dtGdq/1cy4iIKP77B/d18ovn9tvpnSB6kLJCVrDIlvehIG7HdNDzqgtoTef8e +317vTXa/oCxXscWNHKV8E7DwkQON8lqNSG4S/b1omfDKsmq5vGjLbHAfXD6n4RPo +jktMnjIhUV+fKaaBDVUkoLGtkZle4Ghw4l5BnfJg2/Rm8UaaLuI6GgoNVFl9Bsv1 +m1xzBWI3jrEeyL79OhePAEKGtq2ayxF+c27ju6WdDAPUztwnumlD7/9USxRI/XUP +ZZIncRDlBPY6PZlWAvm84o4Hej4Ad10ipdFdvARJqF7DyybZmHARXkUu/DYyVZvT +oWaDREBd2ZdpivXTGXzTVblkQkKF3Z+pkzB1kbbAA1jAvdbN7HIfDA+l3M6POuLg +h4fWHTjeMR9cJFwQXWcSSMnWSK03gARJoSNSwlKLj/V3Nv+k0NQ= +=ZXT9 +-----END PGP SIGNATURE----- diff --git a/kate.changes b/kate.changes index fb26142..b889145 100644 --- a/kate.changes +++ b/kate.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sun Nov 24 13:29:10 UTC 2019 - Luca Beltrame + +- Update to 19.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.12-beta.php +- Too many changes since 19.08.3, only listing bugfixes: + * handle build path as relative to project path (kde#413306) + * disable ctags indexing per default (kde#412351) + * fix message extraction (kde#412358) + * External Tools: Support adding actions to toolbar (kde#261210) + * ensure view stack gets focus on startup BUG: 412227 (kde#412227) + * Added a line to set default sort order for the Symbolviewer. (kde#405895) + * allow ESC to be used as global application shortcut and still exit the quick open (kde#409856) + * fix dbus session registration BUG: 410742 (kde#410742) +- Add upstream patch to fix build: + * search-for-kf5i18n-kdoctools.patch + ------------------------------------------------------------------- Thu Nov 7 23:12:43 UTC 2019 - Luca Beltrame diff --git a/kate.spec b/kate.spec index 40e9528..3e36faa 100644 --- a/kate.spec +++ b/kate.spec @@ -17,52 +17,53 @@ %define _appstreamkpackage 0%(cat %{_kf5_cmakedir}/KF5Package/KF5PackageMacros.cmake | grep -q 'appstream-metainfo' && echo 1) -%define kf5_version 5.26.0 +%define kf5_version 5.60.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kate -Version: 19.08.3 +Version: 19.11.80 Release: 0 Summary: Advanced Text Editor License: GPL-3.0-or-later Group: Productivity/Text/Editors URL: http://www.kde.org -Source: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/unstable/applications/%{version}/src/%{name}-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif # PATCH-FIX-OPENSUSE Patch0: 0001-Defuse-root-block.patch -BuildRequires: kactivities5-devel -BuildRequires: kconfig-devel -BuildRequires: kcrash-devel -BuildRequires: kdbusaddons-devel -BuildRequires: kdoctools-devel -BuildRequires: kguiaddons-devel -BuildRequires: ki18n-devel -BuildRequires: kiconthemes-devel -BuildRequires: kio-devel -BuildRequires: kitemmodels-devel -BuildRequires: kjobwidgets-devel -BuildRequires: knewstuff-devel -BuildRequires: kparts-devel -BuildRequires: kservice-devel -BuildRequires: ktexteditor-devel -BuildRequires: kwallet-framework-devel -BuildRequires: kwindowsystem-devel -BuildRequires: kxmlgui-devel +# PATCH-FIX-UPSTREAM +Patch1: search-for-kf5i18n-kdoctools.patch +BuildRequires: cmake(KF5Activities) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5Crash) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5GuiAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5ItemModels) +BuildRequires: cmake(KF5JobWidgets) +BuildRequires: cmake(KF5NewStuff) +BuildRequires: cmake(KF5Parts) +BuildRequires: cmake(KF5Service) +BuildRequires: cmake(KF5TextEditor) +BuildRequires: cmake(KF5Wallet) +BuildRequires: cmake(KF5WindowSystem) +BuildRequires: cmake(KF5XmlGui) BuildRequires: libgit2-devel -BuildRequires: pkgconfig -BuildRequires: plasma-framework-devel -BuildRequires: threadweaver-devel -BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 -BuildRequires: pkgconfig(Qt5DBus) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Script) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Sql) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0 +BuildRequires: cmake(KF5Plasma) +BuildRequires: cmake(KF5ThreadWeaver) +BuildRequires: cmake(Qt5Core) >= 5.10.0 +BuildRequires: cmake(Qt5DBus) >= 5.10.0 +BuildRequires: cmake(Qt5Script) >= 5.10.0 +BuildRequires: cmake(Qt5Sql) >= 5.10.0 +BuildRequires: cmake(Qt5Test) >= 5.10.0 +BuildRequires: cmake(Qt5Widgets) >= 5.10.0 Requires: %{name}-plugins = %{version} Recommends: %{name}-lang Obsoletes: %{name}5 < %{version} diff --git a/search-for-kf5i18n-kdoctools.patch b/search-for-kf5i18n-kdoctools.patch new file mode 100644 index 0000000..e25d61d --- /dev/null +++ b/search-for-kf5i18n-kdoctools.patch @@ -0,0 +1,48 @@ +From 565fd945b52a107c4b7b89f96146bdf8acbd9757 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Tue, 19 Nov 2019 20:28:18 +0100 +Subject: Search for KF5I18n and KF5DocTools + +Summary: +KF5I18n is required anyway. If it isn't searched and found when the +ki18n_install call, which is injected by the release scripts, is +encountered the build will fail with "CMake Error: No script +specified for argument -P" because a variable usually set by +ki18n_install is not defined. +The same applies to KF5DocTools and kdoctools_install as well, but +it is guarded by a "if (KF5DocTools_FOUND)" so it doesn't error out +but just doesn't install any handbooks, even if KF5DocTools is found. + +Test Plan: The 19.11.80 tarball builds fine with the patch applied + +Reviewers: #kate, cullmann + +Subscribers: kwrite-devel + +Tags: #kate + +Differential Revision: https://phabricator.kde.org/D25411 +--- + CMakeLists.txt | 9 +++++++++ + 1 file changed, 9 insertions(+) + +Index: kate-19.11.80/CMakeLists.txt +=================================================================== +--- kate-19.11.80.orig/CMakeLists.txt 2019-11-15 01:26:28.000000000 +0100 ++++ kate-19.11.80/CMakeLists.txt 2019-11-28 07:03:33.482667194 +0100 +@@ -35,6 +35,15 @@ + # forbid some old things + add_definitions(-DQT_NO_FOREACH) + ++# Required here so that the ki18n_install/kdoctools_install calls injected by ++# the release scripts work. ++find_package(KF5I18n ${KF5_REQUIRED_VERSION} ++ REQUIRED COMPONENTS ++ I18n ++ OPTIONAL_COMPONENTS ++ DocTools ++) ++ + # Qt 5.13 deprecated QComboBox::currentIndexChanged(QString) and Qt 5.14 undid that... + if (Qt5Widgets_VERSION VERSION_GREATER_EQUAL 5.14.0) + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)