From 299cdd99b56f88f5d80f049a9c21a2e5e6700453261bc3543658b1ff959e2522 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 16 Mar 2015 11:57:34 +0000 Subject: [PATCH 1/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=65 --- kio.changes | 6 ++++++ kio.spec | 3 +++ 2 files changed, 9 insertions(+) diff --git a/kio.changes b/kio.changes index 9cdcce9..aafaf7e 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 16 11:58:09 UTC 2015 - hrvoje.senjan@gmail.com + +- Add missing requires to devel subpackage: kcoreaddons-devel, + kconfig-devel and kitemviews-devel + ------------------------------------------------------------------- Sat Mar 7 16:58:54 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kio.spec b/kio.spec index 7241cd7..10ed12e 100644 --- a/kio.spec +++ b/kio.spec @@ -84,6 +84,9 @@ Requires: %{name} = %{version} Requires: extra-cmake-modules Requires: kbookmarks-devel >= %{kf5_version} Requires: kcompletion-devel >= %{kf5_version} +Requires: kconfig-devel >= %{kf5_version} +Requires: kcoreaddons-devel >= %{kf5_version} +Requires: kitemviews-devel >= %{kf5_version} Requires: kjobwidgets-devel >= %{kf5_version} Requires: kservice-devel >= %{kf5_version} Requires: kxmlgui-devel >= %{kf5_version} From dd5cb498af6de92dbd2a1686019f2cf89dd5d608a4ac01d9f0e8dcf106fe76c3 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 16 Mar 2015 12:06:15 +0000 Subject: [PATCH 2/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=66 --- kio.changes | 1 + kio.spec | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/kio.changes b/kio.changes index aafaf7e..5f94476 100644 --- a/kio.changes +++ b/kio.changes @@ -3,6 +3,7 @@ Mon Mar 16 11:58:09 UTC 2015 - hrvoje.senjan@gmail.com - Add missing requires to devel subpackage: kcoreaddons-devel, kconfig-devel and kitemviews-devel +- Drop unneeded kcrash-devel BuildRequires ------------------------------------------------------------------- Sat Mar 7 16:58:54 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kio.spec b/kio.spec index 10ed12e..f435026 100644 --- a/kio.spec +++ b/kio.spec @@ -29,7 +29,6 @@ BuildRequires: kbookmarks-devel >= %{kf5_version} BuildRequires: kcompletion-devel >= %{kf5_version} BuildRequires: kconfigwidgets-devel >= %{kf5_version} BuildRequires: kcoreaddons-devel >= %{kf5_version} -BuildRequires: kcrash-devel >= %{kf5_version} BuildRequires: kdbusaddons-devel >= %{kf5_version} BuildRequires: kdoctools-devel >= %{kf5_version} BuildRequires: kf5-filesystem From f08c87742fdee5f188a9ec2e345c1dae8dd3476eab8984022e476ab47cd3edc5 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 5 Apr 2015 11:47:37 +0000 Subject: [PATCH 3/7] 5.9.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=67 --- baselibs.conf | 4 ++ kio-5.8.0.tar.xz | 3 -- kio-5.9.0.tar.xz | 3 ++ kio.changes | 10 +++++ kio.spec | 108 ++++++++++++++++++++++++++++++++++++++++------- 5 files changed, 109 insertions(+), 19 deletions(-) delete mode 100644 kio-5.8.0.tar.xz create mode 100644 kio-5.9.0.tar.xz diff --git a/baselibs.conf b/baselibs.conf index 584d6b4..1b7ddfa 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,7 @@ +kio-core + conflicts "kio- <= 5.8.0" kio + requires "kio-core- = " kio-devel + requires "kio-core- = " requires "kio- = " diff --git a/kio-5.8.0.tar.xz b/kio-5.8.0.tar.xz deleted file mode 100644 index e091a6b..0000000 --- a/kio-5.8.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a89b0e5125013d9c34a75e572fb7c81f4b0e6e041d43850301423e6b0d5ff21 -size 2841752 diff --git a/kio-5.9.0.tar.xz b/kio-5.9.0.tar.xz new file mode 100644 index 0000000..5e52b8f --- /dev/null +++ b/kio-5.9.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c423c335ab05d6b8dd1162535a28fd8a33219fb7345db8c1dfd1d38fc4711359 +size 2844868 diff --git a/kio.changes b/kio.changes index 5f94476..08941c4 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Apr 4 14:40:53 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.9.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.9.0.php +- Split the core modules/daemons/libraries into core subpackage; + based on upstream KIOCORE_ONLY build option, which only concerns + the buildsystem, not the code (i.e. no ifdefs) + ------------------------------------------------------------------- Mon Mar 16 11:58:09 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kio.spec b/kio.spec index f435026..5d75fb0 100644 --- a/kio.spec +++ b/kio.spec @@ -16,13 +16,13 @@ # -%define _tar_path 5.8 +%define _tar_path 5.9 Name: kio Version: %{_tar_path}.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.8.0 +BuildRequires: extra-cmake-modules >= %{version} BuildRequires: fdupes BuildRequires: karchive-devel >= %{kf5_version} BuildRequires: kbookmarks-devel >= %{kf5_version} @@ -59,6 +59,7 @@ BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0 BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(x11) +Requires: %{name}-core = %{version} Recommends: %{name}-lang = %{version} Recommends: kio-extras5 # KIO/FileDialog uses klauncher directly, but we can't add Requires, as that would introduce dep cycle @@ -76,10 +77,23 @@ This framework implements almost all the file management functions you will ever need. In fact, the KDE file manager (Dolphin) and the KDE file dialog also uses this to provide its network-enabled file management. +%package core +Summary: Network transparent access to files and data +Group: System/GUI/KDE +# core subpackage created with 5.9.0 +Conflicts: kio <= 5.8.0 + +%description core +This framework implements almost all the file management functions you +will ever need. In fact, the KDE file manager (Dolphin) and the KDE +file dialog also uses this to provide its network-enabled file management. +KIO core libraries, ioslave and daemons. + %package devel Summary: Network transparent access to files and data Group: Development/Libraries/KDE Requires: %{name} = %{version} +Requires: %{name}-core = %{version} Requires: extra-cmake-modules Requires: kbookmarks-devel >= %{kf5_version} Requires: kcompletion-devel >= %{kf5_version} @@ -110,7 +124,15 @@ Development files. %kf5_makeinstall -C build %fdupes -s %{buildroot} - %find_lang %{name}5 %{name}5.lang +if [ -e po ]; then +%find_lang %{name}5 %{name}5.lang +else +touch %{name}5.lang +fi + +%post core -p /sbin/ldconfig + +%postun core -p /sbin/ldconfig %post -p /sbin/ldconfig @@ -124,32 +146,86 @@ Development files. %doc %lang(sv) %{_kf5_mandir}/sv %doc %lang(uk) %{_kf5_mandir}/uk +%files core +%doc COPYING* README* +%{_kf5_libdir}/libKF5KIOCore.so.* +%{_kf5_configdir}/accept-languages.codes +%{_kf5_libdir}/libKF5KIONTLM.so.* +%dir %{_kf5_plugindir}/kf5 +%dir %{_kf5_plugindir}/kf5/kio +%{_kf5_plugindir}/kf5/kio/file.so +%{_kf5_servicesdir}/file.protocol +%{_kf5_plugindir}/kf5/kio/ftp.so +%{_kf5_servicesdir}/ftp.protocol +%{_kf5_plugindir}/kf5/kio/help.so +%{_kf5_plugindir}/kf5/kio/ghelp.so +%{_kf5_servicesdir}/help.protocol +%{_kf5_servicesdir}/ghelp.protocol +%{_kf5_libexecdir}/kio_http_cache_cleaner +%{_kf5_plugindir}/kf5/kio/http.so +%{_kf5_servicesdir}/http_cache_cleaner.desktop +%{_kf5_servicesdir}/http.protocol +%{_kf5_servicesdir}/https.protocol +%{_kf5_servicesdir}/webdav.protocol +%{_kf5_servicesdir}/webdavs.protocol +%{_kf5_bindir}/kmailservice5 +%{_kf5_applicationsdir}/kmailservice5.desktop +%{_kf5_servicesdir}/data.protocol +%{_kf5_servicesdir}/rtsp.protocol +%{_kf5_servicesdir}/mms.protocol +%{_kf5_servicesdir}/mmst.protocol +%{_kf5_servicesdir}/mmsu.protocol +%{_kf5_servicesdir}/pnm.protocol +%{_kf5_servicesdir}/rtspt.protocol +%{_kf5_servicesdir}/rtspu.protocol +%{_kf5_bindir}/ktelnetservice5 +%{_kf5_applicationsdir}/ktelnetservice5.desktop +%{_kf5_plugindir}/kf5/kio/trash.so +%{_kf5_bindir}/ktrash5 +%{_kf5_plugindir}/kcm_trash.so +%{_kf5_servicesdir}/trash.protocol +%{_kf5_servicesdir}/kcmtrash.desktop +%{_kf5_libexecdir}/kiod5 +%{_kf5_sharedir}/dbus-1/services/org.kde.kiod5.service +%dir %{_kf5_plugindir}/kf5/kiod +%{_kf5_plugindir}/kf5/kiod/kssld.so + %files %defattr(-,root,root) %doc COPYING* README* -%{_kf5_bindir}/ktrash5 -%{_kf5_bindir}/ktelnetservice5 -%{_kf5_bindir}/kmailservice5 -%{_kf5_libdir}/libKF5KIOCore.so.* %{_kf5_libdir}/libKF5KIOWidgets.so.* %{_kf5_libdir}/libKF5KIOFileWidgets.so.* -%{_kf5_libdir}/libKF5KIONTLM.so.* -%{_kf5_configdir}/accept-languages.codes %{_kf5_configdir}/kshorturifilterrc %{_kf5_servicetypesdir}/ -%{_kf5_plugindir}/ -%{_kf5_servicesdir}/ -%{_kf5_libexecdir}/kio_http_cache_cleaner %{_kf5_bindir}/kcookiejar5 %{_kf5_datadir}/kcookiejar/ -%{_kf5_applicationsdir}/kmailservice5.desktop -%{_kf5_applicationsdir}/ktelnetservice5.desktop %{_kf5_libexecdir}/kpac_dhcp_helper %{_kf5_libexecdir}/kioslave %{_kf5_libexecdir}/kioexec %{_kf5_notifydir}/proxyscout.notifyrc -%{_kf5_libexecdir}/kiod5 -%{_kf5_sharedir}/dbus-1/services/org.kde.kiod5.service +%{_kf5_plugindir}/kcm_kio.so +%{_kf5_plugindir}/kcm_webshortcuts.so +%dir %{_kf5_plugindir}/kf5/kded +%{_kf5_plugindir}/kf5/kded/kcookiejar.so +%{_kf5_plugindir}/kf5/kded/kpasswdserver.so +%{_kf5_plugindir}/kf5/kded/proxyscout.so +%{_kf5_plugindir}/kf5/urifilters/ +%{_kf5_servicesdir}/cache.desktop +%{_kf5_servicesdir}/cookies.desktop +%{_kf5_servicesdir}/fixhosturifilter.desktop +%dir %{_kf5_servicesdir}/kded +%{_kf5_servicesdir}/kded/proxyscout.desktop +%{_kf5_servicesdir}/kshorturifilter.desktop +%{_kf5_servicesdir}/kuriikwsfilter.desktop +%{_kf5_servicesdir}/kurisearchfilter.desktop +%{_kf5_servicesdir}/localdomainurifilter.desktop +%{_kf5_servicesdir}/netpref.desktop +%{_kf5_servicesdir}/proxy.desktop +%{_kf5_servicesdir}/searchproviders/ +%{_kf5_servicesdir}/smb.desktop +%{_kf5_servicesdir}/useragent.desktop +%{_kf5_servicesdir}/useragentstrings/ +%{_kf5_servicesdir}/webshortcuts.desktop %doc %lang(en) %{_kf5_mandir}/*/kcookiejar5.* %dir %{_kf5_htmldir}/en %dir %{_kf5_htmldir} From fa647af20735d62dbebdd7da78b3b1197c82589440086cde15bc00d7f00a9d56 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 10 Apr 2015 10:38:09 +0000 Subject: [PATCH 4/7] changelogs OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=68 --- kio.changes | 5 +++++ kio.spec | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/kio.changes b/kio.changes index 08941c4..38c0f66 100644 --- a/kio.changes +++ b/kio.changes @@ -2,6 +2,11 @@ Sat Apr 4 14:40:53 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.9.0 + * Enable KPropertiesDialog to show free space information of + remote file systems as well (e.g. smb) + * Fix KUrlNavigator with high DPI pixmaps + * Make KFileItemDelegate handle non default devicePixelRatio + in animations * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.9.0.php - Split the core modules/daemons/libraries into core subpackage; diff --git a/kio.spec b/kio.spec index 5d75fb0..f6f6c4f 100644 --- a/kio.spec +++ b/kio.spec @@ -126,6 +126,11 @@ Development files. if [ -e po ]; then %find_lang %{name}5 %{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 else touch %{name}5.lang fi @@ -139,12 +144,6 @@ fi %postun -p /sbin/ldconfig %files lang -f %{name}5.lang -%defattr(-,root,root) -%doc %lang(it) %{_kf5_mandir}/it -%doc %lang(nl) %{_kf5_mandir}/nl -%doc %lang(pt_BR) %{_kf5_mandir}/pt_BR -%doc %lang(sv) %{_kf5_mandir}/sv -%doc %lang(uk) %{_kf5_mandir}/uk %files core %doc COPYING* README* From b11a7fa73a9176d27d2c265ef641640842f98d7d78aebb98bf433d4a5a495e5d Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 10 Apr 2015 16:28:21 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=69 --- kio.spec | 73 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/kio.spec b/kio.spec index f6f6c4f..421c7f6 100644 --- a/kio.spec +++ b/kio.spec @@ -16,38 +16,39 @@ # +%bcond_without lang %define _tar_path 5.9 Name: kio -Version: %{_tar_path}.0 +Version: 5.9.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= %{version} +BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes -BuildRequires: karchive-devel >= %{kf5_version} -BuildRequires: kbookmarks-devel >= %{kf5_version} -BuildRequires: kcompletion-devel >= %{kf5_version} -BuildRequires: kconfigwidgets-devel >= %{kf5_version} -BuildRequires: kcoreaddons-devel >= %{kf5_version} -BuildRequires: kdbusaddons-devel >= %{kf5_version} -BuildRequires: kdoctools-devel >= %{kf5_version} +BuildRequires: karchive-devel >= %{_tar_path} +BuildRequires: kbookmarks-devel >= %{_tar_path} +BuildRequires: kcompletion-devel >= %{_tar_path} +BuildRequires: kconfigwidgets-devel >= %{_tar_path} +BuildRequires: kcoreaddons-devel >= %{_tar_path} +BuildRequires: kdbusaddons-devel >= %{_tar_path} +BuildRequires: kdoctools-devel >= %{_tar_path} BuildRequires: kf5-filesystem -BuildRequires: kguiaddons-devel >= %{kf5_version} -BuildRequires: ki18n-devel >= %{kf5_version} -BuildRequires: kiconthemes-devel >= %{kf5_version} -BuildRequires: kitemviews-devel >= %{kf5_version} -BuildRequires: kjobwidgets-devel >= %{kf5_version} -BuildRequires: knotifications-devel >= %{kf5_version} +BuildRequires: kguiaddons-devel >= %{_tar_path} +BuildRequires: ki18n-devel >= %{_tar_path} +BuildRequires: kiconthemes-devel >= %{_tar_path} +BuildRequires: kitemviews-devel >= %{_tar_path} +BuildRequires: kjobwidgets-devel >= %{_tar_path} +BuildRequires: knotifications-devel >= %{_tar_path} BuildRequires: krb5-devel -BuildRequires: kservice-devel >= %{kf5_version} -BuildRequires: ktextwidgets-devel >= %{kf5_version} -BuildRequires: kwallet-devel >= %{kf5_version} -BuildRequires: kwidgetsaddons-devel >= %{kf5_version} -BuildRequires: kwindowsystem-devel >= %{kf5_version} -BuildRequires: kxmlgui-devel >= %{kf5_version} +BuildRequires: kservice-devel >= %{_tar_path} +BuildRequires: ktextwidgets-devel >= %{_tar_path} +BuildRequires: kwallet-devel >= %{_tar_path} +BuildRequires: kwidgetsaddons-devel >= %{_tar_path} +BuildRequires: kwindowsystem-devel >= %{_tar_path} +BuildRequires: kxmlgui-devel >= %{_tar_path} BuildRequires: libacl-devel BuildRequires: libattr-devel -BuildRequires: solid-devel >= %{kf5_version} +BuildRequires: solid-devel >= %{_tar_path} BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 @@ -60,7 +61,9 @@ BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(x11) Requires: %{name}-core = %{version} +%if %{with lang} Recommends: %{name}-lang = %{version} +%endif Recommends: kio-extras5 # KIO/FileDialog uses klauncher directly, but we can't add Requires, as that would introduce dep cycle Recommends: kinit @@ -95,15 +98,15 @@ Group: Development/Libraries/KDE Requires: %{name} = %{version} Requires: %{name}-core = %{version} Requires: extra-cmake-modules -Requires: kbookmarks-devel >= %{kf5_version} -Requires: kcompletion-devel >= %{kf5_version} -Requires: kconfig-devel >= %{kf5_version} -Requires: kcoreaddons-devel >= %{kf5_version} -Requires: kitemviews-devel >= %{kf5_version} -Requires: kjobwidgets-devel >= %{kf5_version} -Requires: kservice-devel >= %{kf5_version} -Requires: kxmlgui-devel >= %{kf5_version} -Requires: solid-devel >= %{kf5_version} +Requires: kbookmarks-devel >= %{_tar_path} +Requires: kcompletion-devel >= %{_tar_path} +Requires: kconfig-devel >= %{_tar_path} +Requires: kcoreaddons-devel >= %{_tar_path} +Requires: kitemviews-devel >= %{_tar_path} +Requires: kjobwidgets-devel >= %{_tar_path} +Requires: kservice-devel >= %{_tar_path} +Requires: kxmlgui-devel >= %{_tar_path} +Requires: solid-devel >= %{_tar_path} Requires: pkgconfig(Qt5Network) >= 5.2.0 %description devel @@ -124,16 +127,14 @@ Development files. %kf5_makeinstall -C build %fdupes -s %{buildroot} -if [ -e po ]; then +%if %{with lang} %find_lang %{name}5 %{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 -else -touch %{name}5.lang -fi +%endif %post core -p /sbin/ldconfig @@ -143,7 +144,9 @@ fi %postun -p /sbin/ldconfig +%if %{with lang} %files lang -f %{name}5.lang +%endif %files core %doc COPYING* README* From cbf477b562138c557bc948baf214e7fd70375d85dbc397c5709e72d18344b297 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 10 Apr 2015 16:48:26 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=70 --- kio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kio.spec b/kio.spec index 421c7f6..9ea7e23 100644 --- a/kio.spec +++ b/kio.spec @@ -125,7 +125,7 @@ Development files. %install %kf5_makeinstall -C build - %fdupes -s %{buildroot} + %fdupes %{buildroot} %if %{with lang} %find_lang %{name}5 %{name}5.lang From 755ebb7c88a6284b8fb3c0a40f5d3135bda345759dc4397f50c35499f3dd8457 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 12 Apr 2015 09:53:55 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=71 --- kio.changes | 2 ++ kio.spec | 3 +++ kio_help-fallback-to-kde4-docs.patch | 15 +++++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 kio_help-fallback-to-kde4-docs.patch diff --git a/kio.changes b/kio.changes index 38c0f66..39fd0c9 100644 --- a/kio.changes +++ b/kio.changes @@ -12,6 +12,8 @@ Sat Apr 4 14:40:53 UTC 2015 - hrvoje.senjan@gmail.com - Split the core modules/daemons/libraries into core subpackage; based on upstream KIOCORE_ONLY build option, which only concerns the buildsystem, not the code (i.e. no ifdefs) +- Add kio_help-fallback-to-kde4-docs.patch: allow kio_help to see + into kde4 documentation ------------------------------------------------------------------- Mon Mar 16 11:58:09 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kio.spec b/kio.spec index 9ea7e23..8069229 100644 --- a/kio.spec +++ b/kio.spec @@ -73,6 +73,8 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -118,6 +120,7 @@ Development files. %lang_package %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build diff --git a/kio_help-fallback-to-kde4-docs.patch b/kio_help-fallback-to-kde4-docs.patch new file mode 100644 index 0000000..6aa8887 --- /dev/null +++ b/kio_help-fallback-to-kde4-docs.patch @@ -0,0 +1,15 @@ +diff --git a/src/ioslaves/help/kio_help.cpp b/src/ioslaves/help/kio_help.cpp +index 5abd4c8..5bc692b 100644 +--- a/src/ioslaves/help/kio_help.cpp ++++ b/src/ioslaves/help/kio_help.cpp +@@ -49,7 +49,9 @@ QString HelpProtocol::langLookup(const QString &fname) + QStringList search; + + // assemble the local search paths +- const QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/HTML", QStandardPaths::LocateDirectory); ++ QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/HTML", QStandardPaths::LocateDirectory); ++ QStringList fallbacklocalDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/kde/HTML", QStandardPaths::LocateDirectory); ++ localDoc.append(fallbacklocalDoc); + + QStringList langs = QLocale().uiLanguages(); + langs.append("en");