From 4ee9a49465903ad2c4ca28dbe2d7bd2095a59d2b9bffc6c3aed546d267d813da Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 25 Jan 2016 10:05:23 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=114 --- fix-kcookiejar-autoload.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 fix-kcookiejar-autoload.patch diff --git a/fix-kcookiejar-autoload.patch b/fix-kcookiejar-autoload.patch new file mode 100644 index 0000000..4544846 --- /dev/null +++ b/fix-kcookiejar-autoload.patch @@ -0,0 +1,24 @@ +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 +@@ -63,7 +63,7 @@ + }, + "X-KDE-DBus-ModuleName": "kcookiejar", + "X-KDE-DBus-ServiceName": "org.kde.kcookiejar5", +- "X-KDE-Kded-autoload": true, +- "X-KDE-Kded-load-on-demand": false ++ "X-KDE-Kded-autoload": false, ++ "X-KDE-Kded-load-on-demand": true + } + + From 694b6c51af38d76b4ed3b7d97a7921552ab73afa50e436474bc35a9ac95e40aa Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 25 Jan 2016 10:06:24 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=115 --- kio.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kio.spec b/kio.spec index 02ccccf..f299964 100644 --- a/kio.spec +++ b/kio.spec @@ -77,6 +77,8 @@ Source1: baselibs.conf 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 @@ -124,6 +126,7 @@ Development files. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %cmake_kf5 -d build From b079c4a242662bd0a31eeaaa9bdd2fa3ab5fde6cad3b1014cfa09f6d451cda5c Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 25 Jan 2016 10:07:44 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=116 --- kio.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kio.changes b/kio.changes index ea4bc7a..c5b1dc1 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jan 24 09:00:34 UTC 2016 - tittiatcoke@gmail.com + + +- Added fix-kcookiejar-autoload.patch to fix the swapped values + for the autoload. + ------------------------------------------------------------------- Thu Jan 7 12:54:34 UTC 2016 - wbauer@tmo.at From 5101bb158a04eecb525bbb44b3b6774e7192cf1e07cba51c6db7bf9700b17f81 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 25 Jan 2016 10:44:45 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=117 --- fix-kcookiejar-autoload.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fix-kcookiejar-autoload.patch b/fix-kcookiejar-autoload.patch index 4544846..91d4df8 100644 --- a/fix-kcookiejar-autoload.patch +++ b/fix-kcookiejar-autoload.patch @@ -11,14 +11,15 @@ Change-Id: Ide7bb18ea6b24b8c9221900b04040f0b6d743ce8 --- a/src/ioslaves/http/kcookiejar/kcookiejar.json +++ b/src/ioslaves/http/kcookiejar/kcookiejar.json -@@ -63,7 +63,7 @@ +@@ -62,6 +62,6 @@ + ] }, "X-KDE-DBus-ModuleName": "kcookiejar", - "X-KDE-DBus-ServiceName": "org.kde.kcookiejar5", - "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 - } - ++} From 211984fa3094bf53cf1b2e710a53d10ab8ad6fe65471cfa4b73551c311d1776b Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 25 Jan 2016 12:56:10 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=118 --- kio.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kio.spec b/kio.spec index f299964..6e1decf 100644 --- a/kio.spec +++ b/kio.spec @@ -122,11 +122,13 @@ 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 -%patch2 -p1 + %build %cmake_kf5 -d build