KDE Applications 17.04.1 checkin

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kate?expand=0&rev=73
This commit is contained in:
Luca Beltrame 2017-05-17 19:57:51 +00:00 committed by Git OBS Bridge
parent 836d18cf1a
commit d9df5e03b6
5 changed files with 18 additions and 38 deletions

View File

@ -1,31 +0,0 @@
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6c8d1936a2ec3a7c3c71e353da11e483251875f51846b9609667f9beee1a6042
size 5213352

3
kate-17.04.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:34eee6c384e2c2776c7d0ab65e7217e730cdbdecb82578c9dc90380cb82affd2
size 5214608

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed May 17 20:35:54 CEST 2017 - lbeltrame@kde.org
- Update to 17.04.1
* New bugfix release
* For more details please see:
* https://www.kde.org/announcements/announce-applications-17.04.1.php
- Changes since 17.04.0:
* Don't repeat work of KAboutData::setupCommandLine()
* Don't repeat work of KAboutData::setApplicationData()
* Enable numericMode for sorting document list in filetree (kde#375676)
- Drop upstreamed patches:
* enable-numericMode-in-filetree.patch
-------------------------------------------------------------------
Sun Apr 16 23:15:49 UTC 2017 - wbauer@tmo.at

View File

@ -19,7 +19,7 @@
%define _appstreamkpackage 0%(cat %{_kf5_libdir}/cmake/KF5Package/KF5PackageMacros.cmake | grep -q 'appstream-metainfo' && echo 1)
Name: kate
Version: 17.04.0
Version: 17.04.1
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
@ -30,8 +30,6 @@ License: GPL-2.0+
Group: Productivity/Editors/Other
Url: http://www.kde.org
Source0: %{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM
Patch: enable-numericMode-in-filetree.patch
BuildRequires: kactivities5-devel
BuildRequires: kconfig-devel
BuildRequires: kcrash-devel
@ -95,7 +93,6 @@ plugins and data files for Kate and KWrite editors.
%prep
%setup -q
%patch -p1
%build
%cmake_kf5 -d build