diff --git a/kate-19.11.80.tar.xz b/kate-19.11.80.tar.xz deleted file mode 100644 index 0b19f43..0000000 --- a/kate-19.11.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 14af697..0000000 --- a/kate-19.11.80.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------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-19.11.90.tar.xz b/kate-19.11.90.tar.xz new file mode 100644 index 0000000..72f14e2 --- /dev/null +++ b/kate-19.11.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0541d7ca47a8fe7619db2f2304dcaa5dcb30593298b55594e8256225e5465b90 +size 5856148 diff --git a/kate-19.11.90.tar.xz.sig b/kate-19.11.90.tar.xz.sig new file mode 100644 index 0000000..137bd51 --- /dev/null +++ b/kate-19.11.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl3gfRAACgkQ29LOiT4t +HIeRrwf/UYDn7pGKwRq/bqEw7QCKrCq+0lhXt1yyk9tKmrI5wNaQ2UGd//PvSphP +m6ifbjGZnPQvOTY7HPKGd4i+1q9DX8qw715dDfQBOxYMxs4fgsQH9CJ4sirlrYKz +j4JkcxlTm9lWGgIyKtDXG8m1m/7n+9eRnMMHtXiR4CcrwIcp3ompzT9/gmxSr0Te +V931kjiKbMixjrybYE9qofAtbcfhxS2TVWk/HQ3EzR7wCcG+2lR7mfvon9bixNrJ +cw8razp+2htaz/ohlXDhvcchsAO6FUDRPeeDoX3F3QNAxJRY8rZSXYtWC7OVI3wz +ovfz9rBRQ1f8/rPNvtkM1tNymhVwPw== +=3KOH +-----END PGP SIGNATURE----- diff --git a/kate.changes b/kate.changes index 1e8d141..4475fed 100644 --- a/kate.changes +++ b/kate.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sat Nov 30 09:11:39 UTC 2019 - Luca Beltrame + +Update to 19.11.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.12-rc.php +- Changes since 19.11.80: + * Read the user visible name of the default color scheme + * Fix tyop in find_package call + * Respect KF5_MIN_VER and QT_MIN_VER + * Search for KF5I18n and KF5DocTools + * Search for Qt5Widgets to make a version comparison work +- Dropped patches, now upstream: + * search-for-kf5i18n-kdoctools.patch + ------------------------------------------------------------------- Sun Nov 24 13:29:10 UTC 2019 - Luca Beltrame diff --git a/kate.spec b/kate.spec index 3e36faa..663024d 100644 --- a/kate.spec +++ b/kate.spec @@ -22,7 +22,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kate -Version: 19.11.80 +Version: 19.11.90 Release: 0 Summary: Advanced Text Editor License: GPL-3.0-or-later @@ -35,8 +35,6 @@ Source2: applications.keyring %endif # PATCH-FIX-OPENSUSE Patch0: 0001-Defuse-root-block.patch -# PATCH-FIX-UPSTREAM -Patch1: search-for-kf5i18n-kdoctools.patch BuildRequires: cmake(KF5Activities) BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5Crash) diff --git a/search-for-kf5i18n-kdoctools.patch b/search-for-kf5i18n-kdoctools.patch deleted file mode 100644 index e25d61d..0000000 --- a/search-for-kf5i18n-kdoctools.patch +++ /dev/null @@ -1,48 +0,0 @@ -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)