From 1fc99d0eb5f441b5672817d94fcddbda5979c13572b13c0095d4dc578fccacfc Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 29 Nov 2019 11:39:12 +0000 Subject: [PATCH 1/8] KDE Applications 19.12 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=128 --- applications.keyring | Bin 2388 -> 3491 bytes kate-19.08.3.tar.xz | 3 -- kate-19.08.3.tar.xz.sig | 11 ----- kate-19.11.80.tar.xz | 3 ++ kate-19.11.80.tar.xz.sig | 16 ++++++++ kate.changes | 19 +++++++++ kate.spec | 63 +++++++++++++++-------------- search-for-kf5i18n-kdoctools.patch | 48 ++++++++++++++++++++++ 8 files changed, 118 insertions(+), 45 deletions(-) delete mode 100644 kate-19.08.3.tar.xz delete mode 100644 kate-19.08.3.tar.xz.sig create mode 100644 kate-19.11.80.tar.xz create mode 100644 kate-19.11.80.tar.xz.sig create mode 100644 search-for-kf5i18n-kdoctools.patch diff --git a/applications.keyring b/applications.keyring index 57c966e85c0e3392c05dfd4a0db1e4d89b2cb1f9fb7b681e7385e08eccadd927..48be415fb86f1ea3eaacc154493673fc1b0b31605881758000cc70a628447769 100644 GIT binary patch delta 1646 zcmV-!29f#H5~CZl$^>u%e_d0y+XV>+XNDaB3JDN8YE8H~>ZaGep%4F17}tiIMHl^l z4`ZW@YIQCPn`QkHHpY%wZOJi#DNQN|VYp9WaNywMkey58^6# z4s6{IF~;|}!Ot%i3=y$uxViyT84=ws5CwB`6tC=yVDdRCA8-9V+5!yWbDY$*3#vXd8&4K!*+^;H z=LDt6N*fBd5g5H@51cr!UW_PG0!dU1=6gEVw&v2+lG3bze*qYsHVxZox)QbixWg$q zK};W3Jz=>F(V9-^vvZD$PB`FDX&8SX5{Efyco1kdTgHOOuISngN30u2OL&160S5CFY< zc?U<_Ap=qXVB|#Qi{HKX^-t@j#5^K`%wYO|ug+0+%TyKY({Zy5oWZZA{L03bF&^B} zWx^;|`%|B{K#nZ+FlBPd$HuOG-;L)c9hR_8Tywrwe;!xL!pFPsH21dX-LqpONEr6t zZY+}zQ5`9`nnyc&#?A0xkVFGGfk^NYj`~S^)xzZpVWh1zwY&_X+8i8BHOXY&|K#n3 zW>$?mx&Q9+@&X-R;Tp3nc9Atr^zEX5>HOfqfNUl~&$zpvt6$?&RZ3IL`NK9>Q zSaT5If2`-J*d4vG7MximYk@ttJDSY2Z%Yc!ZzJKbdy|pHse!xcLYE$52yxq ztj7%V- zE`J+3pabVF-ekIu=WF|5SeV$`K`!feP_%~WJ%j52xwiP@3i044-qWD$dlWHr66O#p zK1T8X@uL-?Zt9H5U4qzTUY2xUf<3~=E*$_70RRDs z0z3p50SEvl0vimIAqN?MT~oGE1qladg_8gZ2@pDJO}IJgrq_Fp5CEl!({fc(o@83W zuaF&p&jMUJ1J%AVO6=m#)#LJ7B_7;ILhj(A_2dEL2Q-%JtkB6UAoeZUXLP|wJ&I(r zN!e-IiRXF|Vfq|OvSP(f$bd1oe0+i|ec% zZyaA`Ya1#BUk-^NgITSd2OXO8xPDK{ik$rGtx}1-m7nmS<#vE z6sG`|NBlQ_XAHf=68H-O=_-pkCkOh69Lda|=d8gzAd7GSDNoTkbi<6k&nAkd0bG5+ z;v$pB(=vNWyPbA_pH@6Wp@I9jd_k2CCRd16W=q)Z(lzgYsr5+NQG}Pd8D!_)FZ@=& z(;=>)j$Xc=j$|Ps+7&sd{!6!saU*!TfrdyJd&5>E`zK}Iml!t_sk4v$uojttKQ>jD za0`@WAHLqN$0SYOK{a6PsS1X8lbMK0ipZerE4`#U5 so4hak3N42oL7;U4|J40yS*}%c?E0D4$umu&TLWOXjMS=4UOlkN1lGzM6951J delta 555 zcmV+`0@VGZ8`KiB*$B!6uy6u@TVTmD1qlUom~;RN2@pDJO}IJgrq}o<5B@ayITlf! zkS#a=yLoU5jZta|hUmCDE7xZ?jN?zX8&9niQOM_v|1~@yiUpt%SAEXUR8E_@^CEgY zP!>u3b1Qod9|@y&vY;ZJ0%;A#EIc^;DT4bh;AZEVnAZ~-bQMQPo&0Kl$ons>-;e8Y zyuK@Hf_`;?X4`_cKa6$se2Jj4=FUDSqI{Z@u$>71ebFu@TnsjwdN{Tz4H7rLV^$Xe zVt?a&`J@U+eN8Nq!QN|P=}UzoK+qN{pzs{5BH#i*Xu{|G zBI|Kto~j!epr^wjm>>Xy%X=bha|kRDQh^1_UIjOFOB(RKt(Jj*_Nuj(#r7JOG8gu3 z@O4A@EWdxP$*I=N!E9^|4atzMV0Zf4GV;OvS0r0qz1ffP-3_aa`!r!@RH@~>awg8d ze)DE56<(BBN{(Fe*Wm1Gcqn6)011(FQ-i0;1K8IR=}hM#t`6DRuBi11ODrc?_>(O( t*tcQUDo3TWQwl8}`2Ym2n0d=iqmb-G>o<#pN~ts*6@8RQCC(wM27Ukl 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) From b8066ca4f2b377e4d6bdcdc4ac503a65424bba15572b0b05a07b32bf27186ce3 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 29 Nov 2019 12:29:39 +0000 Subject: [PATCH 2/8] Remove non-existing link OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=129 --- kate.changes | 2 -- 1 file changed, 2 deletions(-) diff --git a/kate.changes b/kate.changes index b889145..89e4899 100644 --- a/kate.changes +++ b/kate.changes @@ -3,8 +3,6 @@ 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) From 1baea1d48fc1a582625bb93b835d5ddde0298d14e606a346bffe2fa9ea340fec Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 29 Nov 2019 13:35:44 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=130 --- kate.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kate.changes b/kate.changes index 89e4899..1e8d141 100644 --- a/kate.changes +++ b/kate.changes @@ -8,10 +8,10 @@ Sun Nov 24 13:29:10 UTC 2019 - Luca Beltrame * 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) + * ensure view stack gets focus on startup (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) + * fix dbus session registration (kde#410742) - Add upstream patch to fix build: * search-for-kf5i18n-kdoctools.patch From f66ac4483602ef8007267bfc28b2936a9d2db8fa6512c7d07d3116d548309fb7 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 3 Dec 2019 10:59:49 +0000 Subject: [PATCH 4/8] KDE Applications 19.12 RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=131 --- kate-19.11.80.tar.xz | 3 -- kate-19.11.80.tar.xz.sig | 16 ---------- kate-19.11.90.tar.xz | 3 ++ kate-19.11.90.tar.xz.sig | 11 +++++++ kate.changes | 16 ++++++++++ kate.spec | 4 +-- search-for-kf5i18n-kdoctools.patch | 48 ------------------------------ 7 files changed, 31 insertions(+), 70 deletions(-) delete mode 100644 kate-19.11.80.tar.xz delete mode 100644 kate-19.11.80.tar.xz.sig create mode 100644 kate-19.11.90.tar.xz create mode 100644 kate-19.11.90.tar.xz.sig delete mode 100644 search-for-kf5i18n-kdoctools.patch 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) From 46150e2e787eff17606a58526b0783942d6d5692b3975c76444652fc446b97ae Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 3 Dec 2019 11:27:17 +0000 Subject: [PATCH 5/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=132 --- kate.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kate.changes b/kate.changes index 4475fed..486d7ab 100644 --- a/kate.changes +++ b/kate.changes @@ -4,7 +4,7 @@ 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 + * https://kde.org/announcements/releases/19.12-rc - Changes since 19.11.80: * Read the user visible name of the default color scheme * Fix tyop in find_package call From 966af8eef4ea4c889b6857117b992d9c7f047a4c0a6870a209e90fd7dd0fc07e Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 6 Dec 2019 15:29:32 +0000 Subject: [PATCH 6/8] Add missing '- ' in changelog OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=133 --- kate.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kate.changes b/kate.changes index 486d7ab..18df495 100644 --- a/kate.changes +++ b/kate.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Sat Nov 30 09:11:39 UTC 2019 - Luca Beltrame -Update to 19.11.90 +- Update to 19.11.90 * New feature release * For more details please see: * https://kde.org/announcements/releases/19.12-rc From b2c8d427f2e49bf7b5c19a4248aeaad99c1ec921a9b74483ad24460448ac9a84 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 11 Dec 2019 13:02:58 +0000 Subject: [PATCH 7/8] KDE Applications 19.12.0 final (release on Thursday) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=134 --- kate-19.11.90.tar.xz | 3 --- kate-19.11.90.tar.xz.sig | 11 ----------- kate-19.12.0.tar.xz | 3 +++ kate-19.12.0.tar.xz.sig | 11 +++++++++++ kate.changes | 13 +++++++++++++ kate.spec | 6 +++--- 6 files changed, 30 insertions(+), 17 deletions(-) delete mode 100644 kate-19.11.90.tar.xz delete mode 100644 kate-19.11.90.tar.xz.sig create mode 100644 kate-19.12.0.tar.xz create mode 100644 kate-19.12.0.tar.xz.sig diff --git a/kate-19.11.90.tar.xz b/kate-19.11.90.tar.xz deleted file mode 100644 index 72f14e2..0000000 --- a/kate-19.11.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 137bd51..0000000 --- a/kate-19.11.90.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------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-19.12.0.tar.xz b/kate-19.12.0.tar.xz new file mode 100644 index 0000000..19ed052 --- /dev/null +++ b/kate-19.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e3d9a83508a77adb5262b58411004ade37599d36f6207b20af7ba3ff81ba153 +size 5695096 diff --git a/kate-19.12.0.tar.xz.sig b/kate-19.12.0.tar.xz.sig new file mode 100644 index 0000000..0d7c27f --- /dev/null +++ b/kate-19.12.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl3puGgACgkQ29LOiT4t +HIfdnwgAnaLX638LyjgBpgIS1GznVMmvxGpnGSYQdQ+SqskhX4wjXrmsW5Oc+lIl +yta1LasGgyVNKNImzJhZOvcV12q2mFM4eKcEZswvcBhyw4PaL066b0ELI0mSpJVa +30CX7oHCE7ACz4dSfq4WEdvjjLR0Y/FWxqcdZB4vgqdPpEMb7mxj4vwvzoSb1tj5 +H8QuA6hu7W2PlNRBiB6xR3dgNvzkSYL8nThvjgpgpoefALj38jaFpa65i4BsLCap +ZNHKang5VJFAATv+3mbLzmd+yWg6p1WKgTfx8RAt63CZQC4dPg3hd9W/AcIeW3Sh +BM6gGj5dGZN4AEurXGNliT9xMZU73Q== +=XW1d +-----END PGP SIGNATURE----- diff --git a/kate.changes b/kate.changes index 18df495..e661d7c 100644 --- a/kate.changes +++ b/kate.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Dec 10 06:38:18 UTC 2019 - Luca Beltrame + +Update to 19.12.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/releases/19.12.0 +- Changes since 19.11.90: + * Update Appstream for new release + * Make the strings translatable, fix typo + * Fix translation of external tools (kde#181528) + * Fix: Do not translate KActionCollection identifier + ------------------------------------------------------------------- Sat Nov 30 09:11:39 UTC 2019 - Luca Beltrame diff --git a/kate.spec b/kate.spec index 663024d..8f075cb 100644 --- a/kate.spec +++ b/kate.spec @@ -22,15 +22,15 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kate -Version: 19.11.90 +Version: 19.12.0 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/unstable/applications/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/unstable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif # PATCH-FIX-OPENSUSE From 13335dacb2238e06144d1bd2501c3d895291e06d502fbd80e8f1f31104435892 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Wed, 11 Dec 2019 13:37:03 +0000 Subject: [PATCH 8/8] Add missing '- ' in changelog OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=135 --- kate.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kate.changes b/kate.changes index e661d7c..b5df0d0 100644 --- a/kate.changes +++ b/kate.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Dec 10 06:38:18 UTC 2019 - Luca Beltrame -Update to 19.12.0 +- Update to 19.12.0 * New feature release * For more details please see: * https://www.kde.org/announcements/releases/19.12.0