Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdebase-kioslaves/, kde-apps/kdebase-kioslaves/files/
Date: Wed, 27 Jul 2016 15:56:05
Message-Id: 1469634939.00a2febe4eea1570748bac6bed13b74e56098d46.kensington@gentoo
1 commit: 00a2febe4eea1570748bac6bed13b74e56098d46
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Tue Jul 26 16:27:51 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 27 15:55:39 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00a2febe
7
8 kde-apps/kdebase-kioslaves: Make kdewebkit optional
9
10 Package-Manager: portage-2.2.28
11
12 .../files/kdebase-kioslaves-16.04.3-webkit.patch | 50 +++++++++++++++++++
13 .../kdebase-kioslaves-16.04.3-r1.ebuild | 56 ++++++++++++++++++++++
14 2 files changed, 106 insertions(+)
15
16 diff --git a/kde-apps/kdebase-kioslaves/files/kdebase-kioslaves-16.04.3-webkit.patch b/kde-apps/kdebase-kioslaves/files/kdebase-kioslaves-16.04.3-webkit.patch
17 new file mode 100644
18 index 0000000..0a4d19e
19 --- /dev/null
20 +++ b/kde-apps/kdebase-kioslaves/files/kdebase-kioslaves-16.04.3-webkit.patch
21 @@ -0,0 +1,50 @@
22 +commit 7209a3d7aa400f6dec72eb40ff21077a40110927
23 +Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
24 +Date: Tue Jul 26 18:22:02 2016 +0200
25 +
26 + [kioslave] Make KDEWEBKIT optional
27 +
28 +diff --git a/CMakeLists.txt b/CMakeLists.txt
29 +index 8b4d0f2..520c00a 100644
30 +--- a/CMakeLists.txt
31 ++++ b/CMakeLists.txt
32 +@@ -62,6 +62,8 @@ set_package_properties(LibGcrypt PROPERTIES DESCRIPTION "Libgcrypt is a general
33 + # Build options
34 + option(KDERUNTIME_BUILD_NEPOMUK "Build the Nepomuk KCM and kioslaves" FALSE)
35 +
36 ++option(WITH_KDEWEBKIT "Build features depending on KDEWEBKIT (currently HTML thumbnailer)" TRUE)
37 ++
38 + check_include_files(sys/wait.h HAVE_SYS_WAIT_H)
39 + check_include_files(sys/time.h HAVE_SYS_TIME_H)
40 +
41 +diff --git a/kioslave/thumbnail/CMakeLists.txt b/kioslave/thumbnail/CMakeLists.txt
42 +index 8f28a4e..2d37906 100644
43 +--- a/kioslave/thumbnail/CMakeLists.txt
44 ++++ b/kioslave/thumbnail/CMakeLists.txt
45 +@@ -89,7 +89,7 @@ install(TARGETS textthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
46 +
47 + ########### next target ###############
48 +
49 +-if(NOT WINCE)
50 ++if(NOT WINCE AND WITH_KDEWEBKIT)
51 + set(htmlthumbnail_PART_SRCS htmlcreator.cpp)
52 +
53 + kde4_add_plugin(htmlthumbnail ${htmlthumbnail_PART_SRCS})
54 +@@ -97,7 +97,8 @@ kde4_add_plugin(htmlthumbnail ${htmlthumbnail_PART_SRCS})
55 + target_link_libraries(htmlthumbnail ${KDE4_KDEWEBKIT_LIBS})
56 +
57 + install(TARGETS htmlthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
58 +-endif(NOT WINCE)
59 ++install(FILES htmlthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR})
60 ++endif(NOT WINCE AND WITH_KDEWEBKIT)
61 +
62 + ########### next target ###############
63 +
64 +@@ -189,7 +190,6 @@ install(FILES
65 + imagethumbnail.desktop
66 + jpegthumbnail.desktop
67 + textthumbnail.desktop
68 +- htmlthumbnail.desktop
69 + djvuthumbnail.desktop
70 + desktopthumbnail.desktop
71 + comicbookthumbnail.desktop
72
73 diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r1.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r1.ebuild
74 new file mode 100644
75 index 0000000..ba3a176
76 --- /dev/null
77 +++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r1.ebuild
78 @@ -0,0 +1,56 @@
79 +# Copyright 1999-2016 Gentoo Foundation
80 +# Distributed under the terms of the GNU General Public License v2
81 +# $Id$
82 +
83 +EAPI=6
84 +
85 +KDE_HANDBOOK="optional"
86 +KMNAME="kde-runtime"
87 +KMMODULE="kioslave"
88 +WEBKIT_REQUIRED="optional"
89 +inherit kde4-meta
90 +
91 +KEYWORDS="~amd64 ~arm ~x86"
92 +DESCRIPTION="KDE VFS framework - kioslaves present a filesystem-like view of arbitrary data"
93 +IUSE="+bzip2 exif debug lzma openexr samba +sftp"
94 +
95 +# tests hang, last checked for 4.2.96
96 +RESTRICT="test"
97 +
98 +DEPEND="
99 + virtual/jpeg:0
100 + !aqua? ( x11-libs/libXcursor )
101 + bzip2? ( app-arch/bzip2 )
102 + exif? ( media-gfx/exiv2:= )
103 + openexr? ( media-libs/openexr:= )
104 + samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) )
105 + sftp? ( >=net-libs/libssh-0.4.0:=[sftp] )
106 +"
107 +RDEPEND="${DEPEND}
108 + $(add_kdebase_dep kdelibs 'bzip2?,lzma?')
109 + $(add_kdeapps_dep kdialog)
110 + virtual/ssh
111 + !aqua? ( !kernel_SunOS? ( virtual/eject ) )
112 +"
113 +
114 +KMEXTRA="
115 + kioexec
116 + kdeeject
117 +"
118 +
119 +PATCHES=( "${FILESDIR}/${P}-webkit.patch" )
120 +
121 +src_configure() {
122 + local mycmakeargs=(
123 + -DWITH_SLP=OFF
124 + -DWITH_BZip2=$(usex bzip2)
125 + -DWITH_Exiv2=$(usex exif)
126 + -DWITH_LibLZMA=$(usex lzma)
127 + -DWITH_OpenEXR=$(usex openexr)
128 + -DWITH_Samba=$(usex samba)
129 + -DWITH_LibSSH=$(usex sftp)
130 + -DWITH_KDEWEBKIT=$(usex webkit)
131 + )
132 +
133 + kde4-meta_src_configure
134 +}