pool/kio
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 498966 from KDE:Frameworks5

Browse Source 
- Update to 5.34.0
  * New feature release
  * For more details please see:
  * https://www.kde.org/announcements/kde-frameworks-5.34.0.php
- Changes since 5.33.0:
  * Fix quoting of preprocessor-definition.
  * KDirSortFilterProxyModel: bring back natural sorting (kde#343452)
  * Fill UDS_CREATION_TIME with the value of st_birthtime on FreeBSD
  * http slave: send error page after authorization failure (kde#373323)
  * kioexec: delegate upload to a kded module (kde#252026, kde#370532)
  * Fix KDirlister Gui Test setting URL scheme twice
  * Delete kiod modules on exit
  * Don't apply the workaround before Qt 5.8.0
  * Generate a moc_predefs.h file for KIOCore (kde#371721)
  * kioexec: fix support for --suggestedfilename
- Remove patches, now upstream:
  * enable-natural-sorting-in-KDirSortFilterProxyModel.patch
- Use %find_lang --with-man --all-name
- Use %kf5_find_htmldocs

OBS-URL: https://build.opensuse.org/request/show/498966
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=48
This commit is contained in:
Dominique Leuenberger 2017-06-01 14:27:25 +00:00 committed by Git OBS Bridge
commit aa24d64ccb
5 changed files with 33 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
enable-natural-sorting-in-KDirSortFilterProxyModel.patch
View File

@ -1,40 +0,0 @@
From 77d5fa131d695f4813c3f7834c1fd27632eac57e Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Wed, 12 Apr 2017 14:06:37 +0200
Subject: [PATCH] Enable natural sorting on QCollator in
KDirSortFilterProxyModel
KDirSortFilterProxyModel is advertised in the header as performing a
"natural sort", ie. "7 8 9 10 11", instead of a lexical "10 11 7 8 9".
However, as far as I can tell this was never true from the start, since
the collator responsible for the actual sorting did not have the
requisite numeric mode enabled, and this setting has always been off by
default as far back as I can find docs for it (Qt 5.2).
(Dolphin, which offers "natural sort", did not run into this issue
because it does not actually use
KDirSortFilterProxyModel.)
BUG: 343452
REVIEW: 128574
---
src/filewidgets/kdirsortfilterproxymodel.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/filewidgets/kdirsortfilterproxymodel.cpp b/src/filewidgets/kdirsortfilterproxymodel.cpp
index 89505acf..494999ae 100644
--- a/src/filewidgets/kdirsortfilterproxymodel.cpp
+++ b/src/filewidgets/kdirsortfilterproxymodel.cpp
@@ -76,6 +76,9 @@ void KDirSortFilterProxyModel::KDirSortFilterProxyModelPrivate::slotNaturalSorti
{
KConfigGroup g(KSharedConfig::openConfig(), "KDE");
m_naturalSorting = g.readEntry("NaturalSorting", true);
+ if (m_naturalSorting) {
+ m_collator.setNumericMode(true);
+ }
}
KDirSortFilterProxyModel::KDirSortFilterProxyModel(QObject *parent)
--
2.12.0

3
kio-5.33.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8e15ff51931192da0ef4635c0fcf76ca821e75a580113db99aee7c38a52f9ade
size 3072192

3
kio-5.34.0.tar.xz Normal file
View File

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

23
kio.changes
View File

@ -4,6 +4,29 @@ Mon May 29 11:36:10 UTC 2017 - fabian@ritter-vogt.de
- Add patch to allow running PIE enabled binaries (kde#350018):
* 0001-Identify-PIE-binaries-application-x-sharedlib-as-exe.patch
-------------------------------------------------------------------
Mon May 15 13:53:16 CEST 2017 - fabian@ritter-vogt.de
- Update to 5.34.0
* New feature release
* For more details please see:
* https://www.kde.org/announcements/kde-frameworks-5.34.0.php
- Changes since 5.33.0:
* Fix quoting of preprocessor-definition.
* KDirSortFilterProxyModel: bring back natural sorting (kde#343452)
* Fill UDS_CREATION_TIME with the value of st_birthtime on FreeBSD
* http slave: send error page after authorization failure (kde#373323)
* kioexec: delegate upload to a kded module (kde#252026, kde#370532)
* Fix KDirlister Gui Test setting URL scheme twice
* Delete kiod modules on exit
* Don't apply the workaround before Qt 5.8.0
* Generate a moc_predefs.h file for KIOCore (kde#371721)
* kioexec: fix support for --suggestedfilename
- Remove patches, now upstream:
* enable-natural-sorting-in-KDirSortFilterProxyModel.patch
- Use %find_lang --with-man --all-name
- Use %kf5_find_htmldocs
-------------------------------------------------------------------
Sat Apr 15 10:11:51 CEST 2017 - lbeltrame@kde.org

38
kio.spec
View File

@ -17,9 +17,9 @@
%bcond_without lang
%define _tar_path 5.33
%define _tar_path 5.34
Name: kio
Version: 5.33.0
Version: 5.34.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 3.0
@ -75,8 +75,6 @@ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%
Source1: baselibs.conf
# PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5
Patch0: kio_help-fallback-to-kde4-docs.patch
# PATCH-FIX-UPSTREAM enable-natural-sorting-in-KDirSortFilterProxyModel.patch wbauer@tmo.at boo#1033668, kde#343452 -- use natural sorting by default in the KDE file dialog and gwenview
Patch1: enable-natural-sorting-in-KDirSortFilterProxyModel.patch
# PATCH-FIX-UPSTREAM
Patch2: 0001-Identify-PIE-binaries-application-x-sharedlib-as-exe.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -125,7 +123,6 @@ Development files.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
@ -137,15 +134,8 @@ Development files.
%fdupes %{buildroot}
%if %{with lang}
%find_lang %{name}5 %{name}5.lang
echo "%doc %lang(ca) %{_kf5_mandir}/ca" >>%{name}5.lang
echo "%doc %lang(de) %{_kf5_mandir}/de" >>%{name}5.lang
echo "%doc %lang(es) %{_kf5_mandir}/es" >>%{name}5.lang
echo "%doc %lang(it) %{_kf5_mandir}/it" >>%{name}5.lang
echo "%doc %lang(nl) %{_kf5_mandir}/nl" >>%{name}5.lang
echo "%doc %lang(pt_BR) %{_kf5_mandir}/pt_BR" >>%{name}5.lang
echo "%doc %lang(sv) %{_kf5_mandir}/sv" >>%{name}5.lang
echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang
%find_lang %{name} --with-man --all-name
%kf5_find_htmldocs
%endif
%post core -p /sbin/ldconfig
@ -157,23 +147,7 @@ echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang
%postun -p /sbin/ldconfig
%if %{with lang}
%files lang -f %{name}5.lang
%dir %{_kf5_htmldir}
%doc %lang(ca) %{_kf5_htmldir}/ca
%doc %lang(de) %{_kf5_htmldir}/de
%doc %lang(es) %{_kf5_htmldir}/es
%doc %lang(et) %{_kf5_htmldir}/et
%doc %lang(it) %{_kf5_htmldir}/it
%doc %lang(nb) %{_kf5_htmldir}/nb
%doc %lang(nl) %{_kf5_htmldir}/nl
%doc %lang(pt_BR) %{_kf5_htmldir}/pt_BR
%doc %lang(ru) %{_kf5_htmldir}/ru
%doc %lang(sr) %{_kf5_htmldir}/sr
%doc %lang(sr@latin) %{_kf5_htmldir}/sr@latin
%doc %lang(sv) %{_kf5_htmldir}/sv
%doc %lang(uk) %{_kf5_htmldir}/uk
%exclude %dir %{_kf5_htmldir}/en
%exclude %{_kf5_htmldir}/en/*/
%files lang -f %{name}.lang
%endif
%files core
@ -209,6 +183,7 @@ echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang
%dir %{_kf5_plugindir}/kf5/kiod
%{_kf5_plugindir}/kf5/kiod/kssld.so
%{_kf5_sharedir}/dbus-1/services/org.kde.kssld5.service
%{_kf5_sharedir}/dbus-1/services/org.kde.kioexecd.service
%files
%defattr(-,root,root)
@ -231,6 +206,7 @@ echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang
%{_kf5_plugindir}/kf5/kded/proxyscout.so
%{_kf5_plugindir}/kf5/kded/remotenotifier.so
%{_kf5_plugindir}/kf5/kiod/kpasswdserver.so
%{_kf5_plugindir}/kf5/kiod/kioexecd.so
%{_kf5_plugindir}/kf5/urifilters/
%{_kf5_plugindir}/kf5/kio/remote.so
%{_kf5_servicesdir}/cache.desktop