PR#1: Disable help/ghelp protocols for Flatpak builds - rpms/kf5-kio

rpms / kf5-kio

#1 Disable help/ghelp protocols for Flatpak builds

Merged 5 years ago by rdieter. Opened 5 years ago by otaylor.

rpms/ otaylor/kf5-kio flatpak-no-ghelp into master

Disable help/ghelp protocols for Flatpak builds

Owen W. Taylor • 5 years ago

e64a274

kf5-kio.spec

file modified

+12 -1

		`@@ -2,7 +2,7 @@`

		`Name: kf5-%{framework}`
		`Version: 5.50.0`
		`- Release: 2%{?dist}`
		`+ Release: 3%{?dist}`
		`Summary: KDE Frameworks 5 Tier 3 solution for filesystem abstraction`

		`License: GPLv2+ and MIT and BSD`
		`@@ -27,6 +27,12 @@`
		`# https://phabricator.kde.org/D8810`
		`Patch100: kio-slave_path.patch`

		`+ %if 0%{?flatpak}`
		`+ # Disable the help: and ghelp: protocol for Flatpak builds, to avoid depending`
		`+ # on the docbook stack.`
		`+ Patch101: kio-no-help-protocol.patch`
		`+ %endif`
		`+`
		`# filter plugin provides`
		`%global __provides_exclude_from ^(%{_kf5_qtplugindir}/.*\\.so)$`

		`@@ -58,8 +64,10 @@`

		`BuildRequires: krb5-devel`
		`BuildRequires: libacl-devel`
		`+ %if !0%{?flatpak}`
		`BuildRequires: libxml2-devel`
		`BuildRequires: libxslt-devel`
		`+ %endif`
		`BuildRequires: qt5-qtbase-devel`
		`BuildRequires: qt5-qtscript-devel`
		`BuildRequires: qt5-qtx11extras-devel`
		`@@ -294,6 +302,9 @@`


		`%changelog`
		`+ * Fri Sep 28 2018 Owen Taylor <otaylor@redhat.com> - 5.50.0-3`
		`+ - Disable help/ghelp protocols for Flatpak builds`
		`+`
		`* Fri Sep 21 2018 Jan Grulich <jgrulich@redhat.com> - 5.50.0-2`
		`- rebuild (qt5)`

kio-no-help-protocol.patch

file added

+10

		`@@ -0,0 +1,10 @@`
		`+ diff -up kio-5.50.0/src/ioslaves/CMakeLists.txt.no-help-protocol kio-5.50.0/src/ioslaves/CMakeLists.txt`
		`+ --- kio-5.50.0/src/ioslaves/CMakeLists.txt.no-help-protocol 2018-09-20 15:52:32.993328851 -0400`
		`+ +++ kio-5.50.0/src/ioslaves/CMakeLists.txt 2018-09-20 15:52:40.006176294 -0400`
		`+ @@ -1,6 +1,5 @@`
		`+`
		`+ add_subdirectory( file )`
		`+ -add_subdirectory( help )`
		`+ add_subdirectory( http )`
		`+ add_subdirectory( ftp )`
		`+ add_subdirectory( telnet )`

otaylor commented 5 years ago

The help/ghelp protocols use XSLT stylesheets and xmlto to dynamically
convert documentation to HTML. This pulls in some tricky dependencies,
and it is not clear that it useful to do inside an application sandbox.
For now, just patch out these protocols for a Flatpak build.