Accepting request 355765 from KDE:Frameworks5

Fix an openQA test

OBS-URL: https://build.opensuse.org/request/show/355765
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=28
This commit is contained in:
Dominique Leuenberger 2016-01-26 09:14:34 +00:00 committed by Git OBS Bridge
commit a71390ad58
3 changed files with 37 additions and 0 deletions

View File

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

View File

@ -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

View File

@ -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
@ -120,11 +122,14 @@ 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
%make_jobs