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

Accepting request 360971 from KDE:Frameworks5

Browse Source 
Update to 5.19.0

OBS-URL: https://build.opensuse.org/request/show/360971
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=29
This commit is contained in:
Dominique Leuenberger 2016-02-24 17:55:43 +00:00 committed by Git OBS Bridge
commit 7989b8fc41
6 changed files with 68 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fix-kcookiejar-autoload.patch
View File

@ -1,25 +0,0 @@
From: David Faure <faure@kde.org>
Date: Sun, 10 Jan 2016 19:05:04 +0000
Subject: Repair kcookiejar autoload, the values got swapped in 6db255388532a4
X-Git-Url: http://quickgit.kde.org/?p=kio.git&a=commitdiff&h=c9f29601c444f174604eca0a4998d2f97436ecec
---
Repair kcookiejar autoload, the values got swapped in 6db255388532a4
Change-Id: Ide7bb18ea6b24b8c9221900b04040f0b6d743ce8
---
--- a/src/ioslaves/http/kcookiejar/kcookiejar.json
+++ b/src/ioslaves/http/kcookiejar/kcookiejar.json
@@ -62,6 +62,6 @@
]
},
"X-KDE-DBus-ModuleName": "kcookiejar",
- "X-KDE-Kded-autoload": true,
- "X-KDE-Kded-load-on-demand": false
-}
\ No newline at end of file
+ "X-KDE-Kded-autoload": false,
+ "X-KDE-Kded-load-on-demand": true
+}

3
kio-5.18.0.tar.xz
View File

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

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

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

44
kio.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Fri Feb 12 22:00:55 UTC 2016 - wbauer@tmo.at
- Install "Create New" templates to %{_kf5_sharedir}/templates/ as
a workaround until kde#356198 is fixed (boo#963680)
-------------------------------------------------------------------
Sat Feb 6 18:03:41 UTC 2016 - hrvoje.senjan@gmail.com
- Update to 5.19.0 (boo#967668)
* New class FavIconRequestJob in new lib KIOGui,
for favicons retrieval
* Fix KDirListerCache crash with two listers for an empty
dir in the cache (kde#278431)
* Make Windows implementation of KIO::stat for file:/ protocol
error out if the file doesn't exist
* Don't assume that files in read-only dir can't
be deleted on Windows
* Fix .pri file for KIOWidgets: it depends on KIOCore,
not on itself
* Repair kcookiejar autoload, the values got
swapped in 6db255388532a4
* Make kcookiejar accessible under the dbus
service name org.kde.kcookiejar5
* kssld: install DBus service file for org.kde.kssld5
* Provide a DBus service file for org.kde.kpasswdserver
* [kio_ftp] fix display of file/directory
modification time/date (boo#960500, kde#354597)
* [kio_help] fix garbage sent when serving static files
* [kio_http] Try NTLMv2 authentication if the
server denies NTLMv1
* [kio_http] fix porting bugs which broke caching
* [kio_http] Fix NTLMv2 stage 3 response creation
* [kio_http] fix waiting until the cache cleaner
listens to the socket
* kio_http_cache_cleaner: don't exit on startup if
cache dir doesn't exist yet
* Change DBus name of kio_http_cache_cleaner so it
doesn't exit if the kde4 one is running
* For more details please see:
https://www.kde.org/announcements/kde-frameworks-5.19.0.php
- Drop upstreamed patches: fix-kcookiejar-autoload.patch and
kio_ftp-fix-display-of-modification-time-date.patch
-------------------------------------------------------------------
Mon Jan 24 09:00:34 UTC 2016 - tittiatcoke@gmail.com

31
kio.spec
View File

@ -17,9 +17,9 @@
%bcond_without lang
%define _tar_path 5.18
%define _tar_path 5.19
Name: kio
Version: 5.18.0
Version: 5.19.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 2.8.12
@ -75,10 +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 kio_ftp-fix-display-of-modification-time-date boo#960500, kde#354597 -- fixes display of file/dir modification time in kio_ftp
Patch1: kio_ftp-fix-display-of-modification-time-date.patch
# PATCH-FIX-UPSTREAM fix-kcookiejar-autoload.patch -- Repair kcookiejar autoload, the values got swapped in 6db255388532a4
Patch2: fix-kcookiejar-autoload.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -122,13 +118,9 @@ file dialog also uses this to provide its network-enabled file management.
Development files.
%lang_package
%prep
%setup -q
%patch2 -p1
%patch0 -p1
%patch1 -p1
%build
%cmake_kf5 -d build
@ -149,6 +141,18 @@ echo "%doc %lang(sv) %{_kf5_mandir}/sv" >>%{name}5.lang
echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang
%endif
# install "Create New" templates to %{_kf5_sharedir}/templates/ as a workaround until kde#963680 is fixed (boo#963680)
mkdir -p %{buildroot}%{_kf5_sharedir}/templates/.source
cd src/new_file_templates
for i in link* Directory.desktop HTMLFile.desktop TextFile.desktop
do
cp $i %{buildroot}%{_kf5_sharedir}/templates/
done
for i in HTMLFile.html Program.desktop TextFile.txt URL.desktop
do
cp $i %{buildroot}%{_kf5_sharedir}/templates/.source/
done
%post core -p /sbin/ldconfig
%postun core -p /sbin/ldconfig
@ -204,10 +208,12 @@ echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang
%{_kf5_sharedir}/dbus-1/services/org.kde.kiod5.service
%dir %{_kf5_plugindir}/kf5/kiod
%{_kf5_plugindir}/kf5/kiod/kssld.so
%{_kf5_sharedir}/dbus-1/services/org.kde.kssld5.service
%files
%defattr(-,root,root)
%doc COPYING* README*
%{_kf5_libdir}/libKF5KIOGui.so.*
%{_kf5_libdir}/libKF5KIOWidgets.so.*
%{_kf5_libdir}/libKF5KIOFileWidgets.so.*
%{_kf5_configdir}/kshorturifilterrc
@ -239,6 +245,9 @@ echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang
%{_kf5_servicesdir}/useragent.desktop
%{_kf5_servicesdir}/useragentstrings/
%{_kf5_servicesdir}/webshortcuts.desktop
%{_kf5_sharedir}/dbus-1/services/org.kde.kpasswdserver.service
%{_kf5_sharedir}/dbus-1/services/org.kde.kcookiejar5.service
%{_kf5_sharedir}/templates/
%doc %lang(en) %{_kf5_mandir}/*/kcookiejar5.*
%dir %{_kf5_htmldir}/en
%dir %{_kf5_htmldir}
@ -248,6 +257,7 @@ echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang
%defattr(-,root,root)
%{_kf5_bindir}/protocoltojson
%{_kf5_libdir}/libKF5KIOCore.so
%{_kf5_libdir}/libKF5KIOGui.so
%{_kf5_libdir}/libKF5KIOWidgets.so
%{_kf5_libdir}/libKF5KIOFileWidgets.so
%{_kf5_libdir}/libKF5KIONTLM.so
@ -259,6 +269,7 @@ echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang
%{_kf5_dbusinterfacesdir}/kf5_org.kde.kio.FileUndoManager.xml
%{_kf5_dbusinterfacesdir}/kf5_org.kde.KCookieServer.xml
%{_kf5_mkspecsdir}/qt_KIOCore.pri
%{_kf5_mkspecsdir}/qt_KIOGui.pri
%{_kf5_mkspecsdir}/qt_KIOFileWidgets.pri
%{_kf5_mkspecsdir}/qt_KNTLM.pri
%{_kf5_mkspecsdir}/qt_KIOWidgets.pri

60
kio_ftp-fix-display-of-modification-time-date.patch
View File

@ -1,60 +0,0 @@
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Thu, 07 Jan 2016 12:38:55 +0000
Subject: [kio_ftp] fix display of file/directory modification time/date
X-Git-Url: http://quickgit.kde.org/?p=kio.git&a=commitdiff&h=68af1d7e89b7fed136d4cc62b76c1c6ded2d94eb
---
[kio_ftp] fix display of file/directory modification time/date
- QDate() treats the year literally (i.e. 90 is really year 90, not
1990), so subtracting 1900 is wrong.
- Use QDate::currentDate() instead of QDateTime::currentDateTime(), we
only need the current date anyway
- Initialize day, month, and year to the current date instead of 0. In
the case when no year is mentioned in the server's reply (the year is
implicit), it wasn't set to the current year at all, so the result was
either 0 or -1.
BUG: 354597
FIXED-IN: 5.19.0
REVIEW: 126659
---
--- a/src/ioslaves/ftp/ftp.cpp
+++ b/src/ioslaves/ftp/ftp.cpp
@@ -1763,18 +1763,16 @@
// Parsing the date is somewhat tricky
// Examples : "Oct 6 22:49", "May 13 1999"
- // First get current time - we need the current month and year
- QDateTime currentTime(QDateTime::currentDateTime());
- int currentMonth = currentTime.date().month();
+ // First get current date - we need the current month and year
+ QDate currentDate(QDate::currentDate());
+ int currentMonth = currentDate.month();
//qDebug() << "Current time :" << asctime( tmptr );
- // Reset time fields
- currentTime.setTime(QTime(0, 0, 0));
- // Get day number (always second field)
- int day = 0;
- int month = 0;
- int year = 0;
+ int day = currentDate.day();
+ int month = currentDate.month();
+ int year = currentDate.year();
int minute = 0;
int hour = 0;
+ // Get day number (always second field)
if (p_date_2) {
day = atoi(p_date_2);
}
@@ -1794,7 +1792,7 @@
// Parse third field
if (qstrlen(p_date_3) == 4) { // 4 digits, looks like a year
- year = atoi(p_date_3) - 1900;
+ year = atoi(p_date_3);
} else {
// otherwise, the year is implicit
// according to man ls, this happens when it is between than 6 months