Accepting request 490375 from KDE:Applications
KDE Applications 17.04.0 final OBS-URL: https://build.opensuse.org/request/show/490375 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kate?expand=0&rev=82
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
9d4dbfb740
31
enable-numericMode-in-filetree.patch
Normal file
31
enable-numericMode-in-filetree.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From eb9cab2e55ba9b7f9b86577ba12f673c40e07e67 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Wolfgang Bauer <wbauer@tmo.at>
|
||||||
|
Date: Fri, 14 Apr 2017 12:43:10 +0200
|
||||||
|
Subject: Enable numericMode for sorting document list in filetree
|
||||||
|
|
||||||
|
Turns on "natural" sorting for the document list in the filetree addon,
|
||||||
|
so that e.g. 10 comes after 9, not before.
|
||||||
|
That's how the KDE4 version behaved too.
|
||||||
|
|
||||||
|
BUG: 375676
|
||||||
|
FIXED-IN: 17.04.1
|
||||||
|
Differential Revision: https://phabricator.kde.org/D5448
|
||||||
|
---
|
||||||
|
addons/filetree/katefiletreeproxymodel.cpp | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/addons/filetree/katefiletreeproxymodel.cpp b/addons/filetree/katefiletreeproxymodel.cpp
|
||||||
|
index 13a4d0e..206dfb8 100644
|
||||||
|
--- a/addons/filetree/katefiletreeproxymodel.cpp
|
||||||
|
+++ b/addons/filetree/katefiletreeproxymodel.cpp
|
||||||
|
@@ -49,6 +49,7 @@ bool KateFileTreeProxyModel::lessThan(const QModelIndex &left, const QModelIndex
|
||||||
|
|
||||||
|
QCollator collate;
|
||||||
|
collate.setCaseSensitivity(Qt::CaseInsensitive);
|
||||||
|
+ collate.setNumericMode(true);
|
||||||
|
|
||||||
|
switch (sortRole()) {
|
||||||
|
case Qt::DisplayRole: {
|
||||||
|
--
|
||||||
|
cgit v0.11.2
|
||||||
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:19e8c40985392b5640c022ceb577aa16541fdd99d389645e38b22d621c6d79b9
|
|
||||||
size 1871900
|
|
||||||
3
kate-17.04.0.tar.xz
Normal file
3
kate-17.04.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:6c8d1936a2ec3a7c3c71e353da11e483251875f51846b9609667f9beee1a6042
|
||||||
|
size 5213352
|
||||||
42
kate.changes
42
kate.changes
@ -1,3 +1,45 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Apr 16 23:15:49 UTC 2017 - wbauer@tmo.at
|
||||||
|
|
||||||
|
- Add enable-numericMode-in-filetree.patch to sort the file names
|
||||||
|
in the "Documents" pane naturally, i.e. 10 comes after 9
|
||||||
|
instead of before (kde#375676)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Apr 16 10:44:51 CEST 2017 - lbeltrame@kde.org
|
||||||
|
|
||||||
|
- Update to 17.04.0
|
||||||
|
* New feature release
|
||||||
|
* For more details please see:
|
||||||
|
* https://www.kde.org/announcements/announce-applications-17.04.0.php
|
||||||
|
- Changes since 17.03.90:
|
||||||
|
* None
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 12 20:25:22 CEST 2017 - lbeltrame@kde.org
|
||||||
|
|
||||||
|
- Update to 17.03.90
|
||||||
|
* New bugfix release
|
||||||
|
* For more details please see:
|
||||||
|
* https://www.kde.org/announcements/announce-applications-17.04-rc.php
|
||||||
|
- Changes since 17.03.80:
|
||||||
|
* None
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 30 05:27:33 UTC 2017 - lbeltrame@kde.org
|
||||||
|
|
||||||
|
- Drop upstreamed patch: remove-popupapplet-servicetype.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Mar 25 23:10:16 CET 2017 - lbeltrame@kde.org
|
||||||
|
|
||||||
|
- Update to 17.03.80
|
||||||
|
* New feature release
|
||||||
|
* For more details please see:
|
||||||
|
* https://www.kde.org/announcements/announce-applications-17.03.80.php
|
||||||
|
- Changes since 16.12.3:
|
||||||
|
* Too many changes to list here
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Mar 9 12:35:33 CET 2017 - lbeltrame@kde.org
|
Thu Mar 9 12:35:33 CET 2017 - lbeltrame@kde.org
|
||||||
|
|
||||||
|
|||||||
27
kate.spec
27
kate.spec
@ -15,22 +15,23 @@
|
|||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
%bcond_without lang
|
||||||
|
|
||||||
%define _appstreamkpackage 0%(cat %{_kf5_libdir}/cmake/KF5Package/KF5PackageMacros.cmake | grep -q 'appstream-metainfo' && echo 1)
|
%define _appstreamkpackage 0%(cat %{_kf5_libdir}/cmake/KF5Package/KF5PackageMacros.cmake | grep -q 'appstream-metainfo' && echo 1)
|
||||||
Name: kate
|
Name: kate
|
||||||
Version: 16.12.3
|
Version: 17.04.0
|
||||||
Release: 0
|
Release: 0
|
||||||
%define kf5_version 5.26.0
|
%define kf5_version 5.26.0
|
||||||
# Latest stable Applications (e.g. 16.08 in KA, but 16.12.3 in KUA)
|
# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
|
||||||
%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
|
%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
|
||||||
Summary: Advanced Text Editor
|
Summary: Advanced Text Editor
|
||||||
License: GPL-2.0+
|
License: GPL-2.0+
|
||||||
# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
|
# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
|
||||||
Group: Productivity/Editors/Other
|
Group: Productivity/Editors/Other
|
||||||
Url: http://www.kde.org/
|
Url: http://www.kde.org
|
||||||
Source0: %{name}-%{version}.tar.xz
|
Source0: %{name}-%{version}.tar.xz
|
||||||
# PATCH-FIX-UPSTREAM remove-popupapplet-servicetype.patch -- Remove the depreciated Plasma PopupApplet servicetype
|
# PATCH-FIX-UPSTREAM
|
||||||
Patch1: remove-popupapplet-servicetype.patch
|
Patch: enable-numericMode-in-filetree.patch
|
||||||
BuildRequires: kactivities5-devel
|
BuildRequires: kactivities5-devel
|
||||||
BuildRequires: kconfig-devel
|
BuildRequires: kconfig-devel
|
||||||
BuildRequires: kcrash-devel
|
BuildRequires: kcrash-devel
|
||||||
@ -62,6 +63,7 @@ BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0
|
|||||||
Requires: %{name}-plugins = %{version}
|
Requires: %{name}-plugins = %{version}
|
||||||
Obsoletes: %{name}5 < %{version}
|
Obsoletes: %{name}5 < %{version}
|
||||||
Provides: %{name}5 = %{version}
|
Provides: %{name}5 = %{version}
|
||||||
|
Recommends: %{name}-lang
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -87,9 +89,13 @@ Obsoletes: kate5-plugins < %{version}
|
|||||||
Kate is an advanced text editor for KDE. This package contains
|
Kate is an advanced text editor for KDE. This package contains
|
||||||
plugins and data files for Kate and KWrite editors.
|
plugins and data files for Kate and KWrite editors.
|
||||||
|
|
||||||
|
%if %{with lang}
|
||||||
|
%lang_package
|
||||||
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1
|
%patch -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 -d build
|
%cmake_kf5 -d build
|
||||||
@ -97,6 +103,10 @@ plugins and data files for Kate and KWrite editors.
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
%kf5_makeinstall -C build
|
%kf5_makeinstall -C build
|
||||||
|
%if %{with lang}
|
||||||
|
%find_lang %{name} --with-man --all-name
|
||||||
|
%kf5_find_htmldocs
|
||||||
|
%endif
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%post -p /sbin/ldconfig
|
||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
@ -138,4 +148,9 @@ plugins and data files for Kate and KWrite editors.
|
|||||||
%{_kf5_sharedir}/plasma/
|
%{_kf5_sharedir}/plasma/
|
||||||
%{_kf5_servicesdir}/
|
%{_kf5_servicesdir}/
|
||||||
|
|
||||||
|
%if %{with lang}
|
||||||
|
%files lang -f %{name}.lang
|
||||||
|
%doc COPYING*
|
||||||
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|||||||
@ -1,22 +0,0 @@
|
|||||||
From a1f8e09413465969d10b198a6c3bb01e90ca440d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Raymond Wooninck <tittiatcoke@gmail.com>
|
|
||||||
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(-)
|
|
||||||
|
|
||||||
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
|
|
||||||
-X-KDE-ServiceTypes=Plasma/Applet,Plasma/PopupApplet
|
|
||||||
+X-KDE-ServiceTypes=Plasma/Applet
|
|
||||||
|
|
||||||
X-Plasma-API=declarativeappletscript
|
|
||||||
X-Plasma-MainScript=ui/katesessions.qml
|
|
||||||
Loading…
x
Reference in New Issue
Block a user