1 |
commit: b1bbf3f33cd335121071c733fc8195dfd158ba87 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 26 14:55:03 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 26 14:56:36 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1bbf3f3 |
7 |
|
8 |
kde-base/kdelibs: Remove DEPEND on app-misc/strigi |
9 |
|
10 |
Revision bump from upstream which moves hard requirement on app-misc/strigi to |
11 |
optional. |
12 |
|
13 |
https://git.reviewboard.kde.org/r/127823/ |
14 |
|
15 |
Gentoo-bug: 583716 |
16 |
|
17 |
Package-Manager: portage-2.3.0_rc1 |
18 |
|
19 |
.../files/kdelibs-4.14.20-strigi-optional.patch | 24 ++ |
20 |
kde-base/kdelibs/kdelibs-4.14.20-r2.ebuild | 301 +++++++++++++++++++++ |
21 |
2 files changed, 325 insertions(+) |
22 |
|
23 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch b/kde-base/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch |
24 |
new file mode 100644 |
25 |
index 0000000..c9e9655 |
26 |
--- /dev/null |
27 |
+++ b/kde-base/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch |
28 |
@@ -0,0 +1,24 @@ |
29 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
30 |
+index e7b2bea..87147b5 100644 |
31 |
+--- a/CMakeLists.txt |
32 |
++++ b/CMakeLists.txt |
33 |
+@@ -82,17 +82,10 @@ set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed |
34 |
+ ) |
35 |
+ |
36 |
+ find_package(Strigi 0.6.3) |
37 |
+-if (WIN32) |
38 |
+- set (STRIGI_TYPE "OPTIONAL") |
39 |
+- set (STRIGI_EXTRA_TEXT "") |
40 |
+-else (WIN32) |
41 |
+- set (STRIGI_TYPE "REQUIRED") |
42 |
+- set (STRIGI_EXTRA_TEXT "Required by some critical kioslaves") |
43 |
+-endif (WIN32) |
44 |
+ set_package_properties(Strigi PROPERTIES DESCRIPTION "Desktop indexing and search support" |
45 |
+ URL "http://strigi.sourceforge.net" |
46 |
+- TYPE ${STRIGI_TYPE} |
47 |
+- PURPOSE ${STRIGI_EXTRA_TEXT} |
48 |
++ TYPE OPTIONAL |
49 |
++ PURPOSE "Required by some kioslaves for metadata support" |
50 |
+ ) |
51 |
+ |
52 |
+ find_package(LibAttica 0.4.2) |
53 |
|
54 |
diff --git a/kde-base/kdelibs/kdelibs-4.14.20-r2.ebuild b/kde-base/kdelibs/kdelibs-4.14.20-r2.ebuild |
55 |
new file mode 100644 |
56 |
index 0000000..cdbb5a8 |
57 |
--- /dev/null |
58 |
+++ b/kde-base/kdelibs/kdelibs-4.14.20-r2.ebuild |
59 |
@@ -0,0 +1,301 @@ |
60 |
+# Copyright 1999-2016 Gentoo Foundation |
61 |
+# Distributed under the terms of the GNU General Public License v2 |
62 |
+# $Id$ |
63 |
+ |
64 |
+EAPI=6 |
65 |
+ |
66 |
+CMAKE_MIN_VERSION="3.3.1-r1" |
67 |
+CPPUNIT_REQUIRED="optional" |
68 |
+DECLARATIVE_REQUIRED="always" |
69 |
+OPENGL_REQUIRED="optional" |
70 |
+KDE_HANDBOOK="optional" |
71 |
+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic |
72 |
+ |
73 |
+EGIT_BRANCH="KDE/4.14" |
74 |
+APPS_VERSION="16.04.1" # Don't forget to bump this |
75 |
+ |
76 |
+DESCRIPTION="KDE libraries needed by all KDE programs" |
77 |
+[[ ${KDE_BUILD_TYPE} != live ]] && \ |
78 |
+SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz" |
79 |
+ |
80 |
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
81 |
+LICENSE="LGPL-2.1" |
82 |
+IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k |
83 |
+kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell |
84 |
+cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf" |
85 |
+ |
86 |
+REQUIRED_USE=" |
87 |
+ udisks? ( udev ) |
88 |
+ upower? ( udev ) |
89 |
+" |
90 |
+ |
91 |
+# needs the kate regression testsuite from svn |
92 |
+RESTRICT="test" |
93 |
+ |
94 |
+COMMONDEPEND=" |
95 |
+ app-text/docbook-xml-dtd:4.2 |
96 |
+ app-text/docbook-xsl-stylesheets |
97 |
+ >=dev-libs/libattica-0.4.2 |
98 |
+ >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)] |
99 |
+ dev-libs/libpcre[unicode] |
100 |
+ dev-libs/libxml2 |
101 |
+ dev-libs/libxslt |
102 |
+ media-libs/fontconfig |
103 |
+ media-libs/freetype:2 |
104 |
+ media-libs/giflib:= |
105 |
+ media-libs/libpng:0= |
106 |
+ media-libs/phonon[qt4] |
107 |
+ sys-libs/zlib |
108 |
+ virtual/jpeg:0 |
109 |
+ >=x11-misc/shared-mime-info-0.60 |
110 |
+ acl? ( virtual/acl ) |
111 |
+ !aqua? ( |
112 |
+ x11-libs/libICE |
113 |
+ x11-libs/libSM |
114 |
+ x11-libs/libX11 |
115 |
+ x11-libs/libXau |
116 |
+ x11-libs/libXcursor |
117 |
+ x11-libs/libXdmcp |
118 |
+ x11-libs/libXext |
119 |
+ x11-libs/libXfixes |
120 |
+ x11-libs/libXft |
121 |
+ x11-libs/libXpm |
122 |
+ x11-libs/libXrender |
123 |
+ x11-libs/libXScrnSaver |
124 |
+ x11-libs/libXtst |
125 |
+ !kernel_SunOS? ( |
126 |
+ || ( |
127 |
+ sys-libs/libutempter |
128 |
+ >=sys-freebsd/freebsd-lib-9.0 |
129 |
+ ) |
130 |
+ ) |
131 |
+ ) |
132 |
+ bzip2? ( app-arch/bzip2 ) |
133 |
+ crypt? ( app-crypt/qca:2[qt4(+)] ) |
134 |
+ fam? ( virtual/fam ) |
135 |
+ jpeg2k? ( media-libs/jasper ) |
136 |
+ kerberos? ( virtual/krb5 ) |
137 |
+ openexr? ( |
138 |
+ media-libs/openexr:= |
139 |
+ media-libs/ilmbase:= |
140 |
+ ) |
141 |
+ policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] ) |
142 |
+ spell? ( app-text/enchant ) |
143 |
+ ssl? ( |
144 |
+ libressl? ( dev-libs/libressl ) |
145 |
+ !libressl? ( dev-libs/openssl:0 ) |
146 |
+ ) |
147 |
+ udev? ( virtual/udev ) |
148 |
+ zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) |
149 |
+" |
150 |
+DEPEND="${COMMONDEPEND} |
151 |
+ doc? ( app-doc/doxygen ) |
152 |
+ nls? ( virtual/libintl ) |
153 |
+" |
154 |
+RDEPEND="${COMMONDEPEND} |
155 |
+ !dev-qt/qtphonon |
156 |
+ !<=kde-base/plasma-workspace-4.7.1:4 |
157 |
+ !<=kde-base/kcontrol-4.4.50:4 |
158 |
+ >=app-crypt/gnupg-2.0.11 |
159 |
+ app-misc/ca-certificates |
160 |
+ $(add_kdebase_dep kde-env '' 4.14.3) |
161 |
+ sys-apps/dbus[X] |
162 |
+ !aqua? ( |
163 |
+ udisks? ( sys-fs/udisks:2 ) |
164 |
+ x11-apps/iceauth |
165 |
+ x11-apps/rgb |
166 |
+ >=x11-misc/xdg-utils-1.0.2-r3 |
167 |
+ upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) |
168 |
+ ) |
169 |
+ udev? ( app-misc/media-player-info ) |
170 |
+" |
171 |
+PDEPEND=" |
172 |
+ $(add_kdebase_dep katepart '' 4.14.3) |
173 |
+ || ( |
174 |
+ $(add_kdeapps_dep kfmclient '' 4.14.3) |
175 |
+ x11-misc/xdg-utils |
176 |
+ ) |
177 |
+ handbook? ( kde-apps/khelpcenter:* ) |
178 |
+ policykit? ( || ( |
179 |
+ >=sys-auth/polkit-kde-agent-0.99 |
180 |
+ kde-plasma/polkit-kde-agent |
181 |
+ ) ) |
182 |
+" |
183 |
+ |
184 |
+PATCHES=( |
185 |
+ "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" |
186 |
+ "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" |
187 |
+ "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch" |
188 |
+ "${FILESDIR}/${PN}-4.14.5-mimetypes.patch" |
189 |
+ "${FILESDIR}/${PN}-4.4.90-xslt.patch" |
190 |
+ "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
191 |
+ "${FILESDIR}/${PN}-4.8.1-norpath.patch" |
192 |
+ "${FILESDIR}/${PN}-4.9.3-werror.patch" |
193 |
+ "${FILESDIR}/${PN}-4.10.0-udisks.patch" |
194 |
+ "${FILESDIR}/${PN}-4.14.20-FindQt4.patch" |
195 |
+ "${FILESDIR}/${PN}-4.14.20-strigi-optional.patch" |
196 |
+) |
197 |
+ |
198 |
+pkg_pretend() { |
199 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
200 |
+ [[ $(gcc-major-version) -lt 4 ]] || \ |
201 |
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ |
202 |
+ && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." |
203 |
+ fi |
204 |
+} |
205 |
+ |
206 |
+src_prepare() { |
207 |
+ kde4-base_src_prepare |
208 |
+ |
209 |
+ # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) |
210 |
+ sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ |
211 |
+ -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." |
212 |
+ |
213 |
+ if use aqua; then |
214 |
+ sed -i -e \ |
215 |
+ "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \ |
216 |
+ cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake" |
217 |
+ |
218 |
+ #if [[ ${CHOST} == *-darwin8 ]]; then |
219 |
+ sed -i -e \ |
220 |
+ "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \ |
221 |
+ cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake" |
222 |
+ #fi |
223 |
+ |
224 |
+ # solid/solid/backends/iokit doesn't properly link, so disable it. |
225 |
+ sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \ |
226 |
+ || die "disabling solid/solid/backends/iokit failed" |
227 |
+ sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \ |
228 |
+ || die "disabling solid/solid/backends/iokit failed" |
229 |
+ |
230 |
+ # There's no fdatasync on OSX and the check fails to detect that. |
231 |
+ sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \ |
232 |
+ || die "disabling fdatasync failed" |
233 |
+ |
234 |
+ # Fix nameser include to nameser8_compat |
235 |
+ sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \ |
236 |
+ || die "fixing nameser include failed" |
237 |
+ append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1 |
238 |
+ |
239 |
+ # Try to fix kkeyserver_mac |
240 |
+ epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch |
241 |
+ fi |
242 |
+} |
243 |
+ |
244 |
+src_configure() { |
245 |
+ local mycmakeargs=( |
246 |
+ -DWITH_HSPELL=OFF |
247 |
+ -DWITH_ASPELL=OFF |
248 |
+ -DWITH_DNSSD=OFF |
249 |
+ -DKDE_DEFAULT_HOME=.kde4 |
250 |
+ -DKAUTH_BACKEND=POLKITQT-1 |
251 |
+ -DBUILD_libkactivities=OFF |
252 |
+ -DWITH_Soprano=OFF |
253 |
+ -DWITH_SharedDesktopOntologies=OFF |
254 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_Strigi=ON |
255 |
+ -DBUILD_doc=$(usex handbook) |
256 |
+ -DHAVE_X86_3DNOW=$(usex cpu_flags_x86_3dnow) |
257 |
+ -DHAVE_PPC_ALTIVEC=$(usex altivec) |
258 |
+ -DHAVE_X86_MMX=$(usex cpu_flags_x86_mmx) |
259 |
+ -DHAVE_X86_SSE=$(usex cpu_flags_x86_sse) |
260 |
+ -DHAVE_X86_SSE2=$(usex cpu_flags_x86_sse2) |
261 |
+ -DWITH_ACL=$(usex acl) |
262 |
+ -DWITH_BZip2=$(usex bzip2) |
263 |
+ -DWITH_QCA2=$(usex crypt) |
264 |
+ -DWITH_FAM=$(usex fam) |
265 |
+ -DWITH_Jasper=$(usex jpeg2k) |
266 |
+ -DWITH_GSSAPI=$(usex kerberos) |
267 |
+ -DWITH_LibLZMA=$(usex lzma) |
268 |
+ -DWITH_Libintl=$(usex nls) |
269 |
+ -DWITH_OpenEXR=$(usex openexr) |
270 |
+ -DWITH_OpenGL=$(usex opengl) |
271 |
+ -DWITH_PolkitQt-1=$(usex policykit) |
272 |
+ -DWITH_ENCHANT=$(usex spell) |
273 |
+ -DWITH_OpenSSL=$(usex ssl) |
274 |
+ -DWITH_UDev=$(usex udev) |
275 |
+ -DWITH_SOLID_UDISKS2=$(usex udisks) |
276 |
+ -DWITH_Avahi=$(usex zeroconf) |
277 |
+ ) |
278 |
+ |
279 |
+ kde4-base_src_configure |
280 |
+} |
281 |
+ |
282 |
+src_compile() { |
283 |
+ kde4-base_src_compile |
284 |
+ |
285 |
+ # The building of apidox is not managed anymore by the build system |
286 |
+ if use doc; then |
287 |
+ einfo "Building API documentation" |
288 |
+ cd "${S}"/doc/api/ |
289 |
+ ./doxygen.sh "${S}" || die "APIDOX generation failed" |
290 |
+ fi |
291 |
+} |
292 |
+ |
293 |
+src_install() { |
294 |
+ kde4-base_src_install |
295 |
+ |
296 |
+ # use system certificates |
297 |
+ rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die |
298 |
+ dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt |
299 |
+ |
300 |
+ if use doc; then |
301 |
+ einfo "Installing API documentation. This could take a bit of time." |
302 |
+ cd "${S}"/doc/api/ |
303 |
+ docinto /HTML/en/kdelibs-apidox |
304 |
+ dohtml -r ${P}-apidocs/* |
305 |
+ fi |
306 |
+ |
307 |
+ if use aqua; then |
308 |
+ einfo "fixing ${PN} plugins" |
309 |
+ |
310 |
+ local _PV=${PV:0:3}.0 |
311 |
+ local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script |
312 |
+ |
313 |
+ install_name_tool -id \ |
314 |
+ "${_dir}/libkrossqtsplugin.${_PV}.dylib" \ |
315 |
+ "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \ |
316 |
+ || die "failed fixing libkrossqtsplugin.${_PV}.dylib" |
317 |
+ |
318 |
+ einfo "fixing ${PN} cmake detection files" |
319 |
+ #sed -i -e \ |
320 |
+ # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ |
321 |
+ echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ |
322 |
+ "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \ |
323 |
+ || die "failed fixing FindXKB.cmake" |
324 |
+ fi |
325 |
+ |
326 |
+ einfo Installing environment file. |
327 |
+ # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. |
328 |
+ echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" |
329 |
+ echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" |
330 |
+ doenvd "${T}/77kde" |
331 |
+} |
332 |
+ |
333 |
+pkg_postinst() { |
334 |
+ fdo-mime_mime_database_update |
335 |
+ |
336 |
+ if use zeroconf; then |
337 |
+ echo |
338 |
+ elog "To make zeroconf support available in KDE make sure that the avahi daemon" |
339 |
+ elog "is running." |
340 |
+ echo |
341 |
+ einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" |
342 |
+ einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" |
343 |
+ einfo "to include 'mdns', e.g.:" |
344 |
+ einfo " hosts: files mdns dns" |
345 |
+ echo |
346 |
+ fi |
347 |
+ |
348 |
+ kde4-base_pkg_postinst |
349 |
+} |
350 |
+ |
351 |
+pkg_prerm() { |
352 |
+ # Remove ksycoca4 global database |
353 |
+ rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 |
354 |
+} |
355 |
+ |
356 |
+pkg_postrm() { |
357 |
+ fdo-mime_mime_database_update |
358 |
+ |
359 |
+ kde4-base_pkg_postrm |
360 |
+} |