From 2ae81faf2bf64d03d3e8bc356b909590b5824a8e8c6a9360f1e3d9f3259b1e9d Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 6 Feb 2016 18:04:27 +0000 Subject: [PATCH 1/5] start with 5.19.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=119 --- kio-5.18.0.tar.xz | 3 --- kio-5.19.0.tar.xz | 3 +++ kio.changes | 7 +++++++ kio.spec | 18 ++++++++---------- 4 files changed, 18 insertions(+), 13 deletions(-) delete mode 100644 kio-5.18.0.tar.xz create mode 100644 kio-5.19.0.tar.xz diff --git a/kio-5.18.0.tar.xz b/kio-5.18.0.tar.xz deleted file mode 100644 index 51ab97e..0000000 --- a/kio-5.18.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da526bb9b7f02b9670cf6bea54645a89a5b32d008204a4f2253bdd5e74df0f08 -size 2877312 diff --git a/kio-5.19.0.tar.xz b/kio-5.19.0.tar.xz new file mode 100644 index 0000000..28fe34f --- /dev/null +++ b/kio-5.19.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db26d787efd4b9f7da1970fb9814bca130f6d3adc578a847e93b4ac5ceadfa30 +size 2889500 diff --git a/kio.changes b/kio.changes index c5b1dc1..0537d11 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Feb 6 18:03:41 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.19.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.19.0.php + ------------------------------------------------------------------- Mon Jan 24 09:00:34 UTC 2016 - tittiatcoke@gmail.com diff --git a/kio.spec b/kio.spec index 6e1decf..0a46d16 100644 --- a/kio.spec +++ b/kio.spec @@ -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 @@ -204,10 +196,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 +233,8 @@ 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 %doc %lang(en) %{_kf5_mandir}/*/kcookiejar5.* %dir %{_kf5_htmldir}/en %dir %{_kf5_htmldir} @@ -248,6 +244,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 +256,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 From 75865f0944062112ef3a77f27dc9b0d4c1c414dd6b47339df0e27f117578b34b Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 6 Feb 2016 18:20:59 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=120 --- fix-kcookiejar-autoload.patch | 25 -------- kio.changes | 2 + ...ix-display-of-modification-time-date.patch | 60 ------------------- 3 files changed, 2 insertions(+), 85 deletions(-) delete mode 100644 fix-kcookiejar-autoload.patch delete mode 100644 kio_ftp-fix-display-of-modification-time-date.patch diff --git a/fix-kcookiejar-autoload.patch b/fix-kcookiejar-autoload.patch deleted file mode 100644 index 91d4df8..0000000 --- a/fix-kcookiejar-autoload.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: David Faure -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 -+} - diff --git a/kio.changes b/kio.changes index 0537d11..56159a5 100644 --- a/kio.changes +++ b/kio.changes @@ -4,6 +4,8 @@ Sat Feb 6 18:03:41 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.19.0 * 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 diff --git a/kio_ftp-fix-display-of-modification-time-date.patch b/kio_ftp-fix-display-of-modification-time-date.patch deleted file mode 100644 index db6ec45..0000000 --- a/kio_ftp-fix-display-of-modification-time-date.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: Wolfgang Bauer -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 - From d10e30e5a10ad72cbad3490d48bb041dfca8bf7eef3328f47482072b5c6b5f52 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 13 Feb 2016 00:37:51 +0000 Subject: [PATCH 3/5] Accepting request 359119 from home:wolfi323:test - Install "Create New" templates to %{_kf5_sharedir}/templates/ as a workaround until kde#356198 is fixed (boo#963680) OBS-URL: https://build.opensuse.org/request/show/359119 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=121 --- kio.changes | 6 ++++++ kio.spec | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/kio.changes b/kio.changes index 56159a5..abb668d 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/kio.spec b/kio.spec index 0a46d16..b94c7bd 100644 --- a/kio.spec +++ b/kio.spec @@ -141,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 @@ -235,6 +247,7 @@ echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang %{_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} From 6efe9c6b359d55661622eb0da844767b1cf1056ef7da7bd3321234ed02bf8a9c Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 13 Feb 2016 19:26:38 +0000 Subject: [PATCH 4/5] changelogs OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=122 --- kio.changes | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/kio.changes b/kio.changes index abb668d..4d7cfce 100644 --- a/kio.changes +++ b/kio.changes @@ -8,6 +8,35 @@ Fri Feb 12 22:00:55 UTC 2016 - wbauer@tmo.at Sat Feb 6 18:03:41 UTC 2016 - hrvoje.senjan@gmail.com - Update to 5.19.0 + * 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 From dc6bc6307eaf39c3aef87d51f3a691205d2da5fc092f0a6220e9cb2c790a0a5f Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 22 Feb 2016 16:41:41 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=123 --- kio.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kio.changes b/kio.changes index 4d7cfce..d1d4eb5 100644 --- a/kio.changes +++ b/kio.changes @@ -7,7 +7,7 @@ Fri Feb 12 22:00:55 UTC 2016 - wbauer@tmo.at ------------------------------------------------------------------- Sat Feb 6 18:03:41 UTC 2016 - hrvoje.senjan@gmail.com -- Update to 5.19.0 +- 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