1 |
commit: cd28e7b30b1a2c93e489974ce7c05bb127ce3fdf |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Dec 25 21:48:48 2015 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 29 16:09:58 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd28e7b3 |
7 |
|
8 |
kde-base/kdelibs: Add patch that should have been part of 4.14.15 already |
9 |
|
10 |
This reverts a change from 4.14.14 that supposedly fixed a crash in |
11 |
kde-base/akregator, but led to crashes on exit in other applications |
12 |
such as kopete. |
13 |
|
14 |
Package-Manager: portage-2.2.24 |
15 |
|
16 |
.../kdelibs/files/kdelibs-4.14.15-revert.patch | 52 ++++ |
17 |
kde-base/kdelibs/kdelibs-4.14.15-r1.ebuild | 304 +++++++++++++++++++++ |
18 |
2 files changed, 356 insertions(+) |
19 |
|
20 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.15-revert.patch b/kde-base/kdelibs/files/kdelibs-4.14.15-revert.patch |
21 |
new file mode 100644 |
22 |
index 0000000..3840331 |
23 |
--- /dev/null |
24 |
+++ b/kde-base/kdelibs/files/kdelibs-4.14.15-revert.patch |
25 |
@@ -0,0 +1,52 @@ |
26 |
+From: Alex Merry <alex.merry@×××.org> |
27 |
+Date: Tue, 15 Dec 2015 19:26:47 +0000 |
28 |
+Subject: Revert "backport commit b72fc5e56579035bf987075e16324ef95ef8e3d4" |
29 |
+X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=a02df05e4bd083f98147c86f88da2f818fc6c9f4 |
30 |
+--- |
31 |
+Revert "backport commit b72fc5e56579035bf987075e16324ef95ef8e3d4" |
32 |
+ |
33 |
+This reverts commit 4f7ea2f770cf062ef22293fbb21a086f3e0cbfcb. |
34 |
+ |
35 |
+This change seems to be causing more problems than it fixes - it's |
36 |
+probably just too big of a behaviour change for kdelibs. Which means |
37 |
+that akregator will probably keep randomly crashing, but the alternative |
38 |
+seems to be various other applications consistently crashing at exit. |
39 |
+ |
40 |
+If we can fix those applications (Kopete in particular), we can consider |
41 |
+re-applying this afterwards. |
42 |
+ |
43 |
+BUG: 355275 |
44 |
+--- |
45 |
+ |
46 |
+ |
47 |
+--- a/kparts/part.cpp |
48 |
++++ b/kparts/part.cpp |
49 |
+@@ -350,7 +350,7 @@ |
50 |
+ d->m_widget = 0; |
51 |
+ if (d->m_autoDeletePart) { |
52 |
+ kDebug(1000) << "deleting part" << objectName(); |
53 |
+- this->deleteLater(); |
54 |
++ delete this; // ouch, this should probably be deleteLater() |
55 |
+ } |
56 |
+ } |
57 |
+ |
58 |
+ |
59 |
+--- a/kparts/tests/parttest.cpp |
60 |
++++ b/kparts/tests/parttest.cpp |
61 |
+@@ -48,7 +48,6 @@ |
62 |
+ KParts::Part* part = new TestPart(0, 0); |
63 |
+ QPointer<KParts::Part> partPointer(part); |
64 |
+ delete part->widget(); |
65 |
+- QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); |
66 |
+ QVERIFY(partPointer.isNull()); |
67 |
+ } |
68 |
+ |
69 |
+@@ -58,7 +57,6 @@ |
70 |
+ QPointer<KParts::Part> partPointer(part); |
71 |
+ QPointer<QWidget> widgetPointer(part->widget()); |
72 |
+ delete part; |
73 |
+- QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); |
74 |
+ QVERIFY(widgetPointer.isNull()); |
75 |
+ } |
76 |
+ |
77 |
+ |
78 |
|
79 |
diff --git a/kde-base/kdelibs/kdelibs-4.14.15-r1.ebuild b/kde-base/kdelibs/kdelibs-4.14.15-r1.ebuild |
80 |
new file mode 100644 |
81 |
index 0000000..f0ded53 |
82 |
--- /dev/null |
83 |
+++ b/kde-base/kdelibs/kdelibs-4.14.15-r1.ebuild |
84 |
@@ -0,0 +1,304 @@ |
85 |
+# Copyright 1999-2015 Gentoo Foundation |
86 |
+# Distributed under the terms of the GNU General Public License v2 |
87 |
+# $Id$ |
88 |
+ |
89 |
+EAPI=5 |
90 |
+ |
91 |
+CMAKE_MIN_VERSION="3.3.1-r1" |
92 |
+CPPUNIT_REQUIRED="optional" |
93 |
+DECLARATIVE_REQUIRED="always" |
94 |
+OPENGL_REQUIRED="optional" |
95 |
+KDE_HANDBOOK="optional" |
96 |
+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic |
97 |
+ |
98 |
+EGIT_BRANCH="KDE/4.14" |
99 |
+ |
100 |
+DESCRIPTION="KDE libraries needed by all KDE programs" |
101 |
+ |
102 |
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
103 |
+LICENSE="LGPL-2.1" |
104 |
+IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k |
105 |
+kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell |
106 |
+cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf" |
107 |
+ |
108 |
+REQUIRED_USE=" |
109 |
+ udisks? ( udev ) |
110 |
+ upower? ( udev ) |
111 |
+" |
112 |
+ |
113 |
+# needs the kate regression testsuite from svn |
114 |
+RESTRICT="test" |
115 |
+ |
116 |
+COMMONDEPEND=" |
117 |
+ >=app-misc/strigi-0.7.7 |
118 |
+ app-text/docbook-xml-dtd:4.2 |
119 |
+ app-text/docbook-xsl-stylesheets |
120 |
+ >=dev-libs/libattica-0.4.2 |
121 |
+ >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)] |
122 |
+ dev-libs/libpcre[unicode] |
123 |
+ dev-libs/libxml2 |
124 |
+ dev-libs/libxslt |
125 |
+ media-libs/fontconfig |
126 |
+ media-libs/freetype:2 |
127 |
+ media-libs/giflib |
128 |
+ media-libs/libpng:0= |
129 |
+ media-libs/phonon[qt4] |
130 |
+ sys-libs/zlib |
131 |
+ virtual/jpeg:0 |
132 |
+ >=x11-misc/shared-mime-info-0.60 |
133 |
+ acl? ( virtual/acl ) |
134 |
+ alsa? ( media-libs/alsa-lib ) |
135 |
+ !aqua? ( |
136 |
+ x11-libs/libICE |
137 |
+ x11-libs/libSM |
138 |
+ x11-libs/libX11 |
139 |
+ x11-libs/libXau |
140 |
+ x11-libs/libXcursor |
141 |
+ x11-libs/libXdmcp |
142 |
+ x11-libs/libXext |
143 |
+ x11-libs/libXfixes |
144 |
+ x11-libs/libXft |
145 |
+ x11-libs/libXpm |
146 |
+ x11-libs/libXrender |
147 |
+ x11-libs/libXScrnSaver |
148 |
+ x11-libs/libXtst |
149 |
+ !kernel_SunOS? ( |
150 |
+ || ( |
151 |
+ sys-libs/libutempter |
152 |
+ >=sys-freebsd/freebsd-lib-9.0 |
153 |
+ ) |
154 |
+ ) |
155 |
+ ) |
156 |
+ bzip2? ( app-arch/bzip2 ) |
157 |
+ crypt? ( app-crypt/qca:2[qt4(+)] ) |
158 |
+ fam? ( virtual/fam ) |
159 |
+ jpeg2k? ( media-libs/jasper ) |
160 |
+ kerberos? ( virtual/krb5 ) |
161 |
+ openexr? ( |
162 |
+ media-libs/openexr:= |
163 |
+ media-libs/ilmbase:= |
164 |
+ ) |
165 |
+ policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] ) |
166 |
+ spell? ( app-text/enchant ) |
167 |
+ ssl? ( |
168 |
+ libressl? ( dev-libs/libressl ) |
169 |
+ !libressl? ( dev-libs/openssl:0 ) |
170 |
+ ) |
171 |
+ udev? ( virtual/udev ) |
172 |
+ zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) |
173 |
+" |
174 |
+DEPEND="${COMMONDEPEND} |
175 |
+ doc? ( app-doc/doxygen ) |
176 |
+ nls? ( virtual/libintl ) |
177 |
+" |
178 |
+RDEPEND="${COMMONDEPEND} |
179 |
+ !dev-qt/qtphonon |
180 |
+ !<=kde-base/plasma-workspace-4.7.1:4 |
181 |
+ !<=kde-base/kcontrol-4.4.50:4 |
182 |
+ >=app-crypt/gnupg-2.0.11 |
183 |
+ app-misc/ca-certificates |
184 |
+ $(add_kdebase_dep kde-env '' 4.14.3) |
185 |
+ sys-apps/dbus[X] |
186 |
+ !aqua? ( |
187 |
+ udisks? ( sys-fs/udisks:2 ) |
188 |
+ x11-apps/iceauth |
189 |
+ x11-apps/rgb |
190 |
+ >=x11-misc/xdg-utils-1.0.2-r3 |
191 |
+ upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) |
192 |
+ ) |
193 |
+ udev? ( app-misc/media-player-info ) |
194 |
+" |
195 |
+PDEPEND=" |
196 |
+ $(add_kdebase_dep katepart '' 4.14.3) |
197 |
+ || ( |
198 |
+ $(add_kdeapps_dep kfmclient '' 4.14.3) |
199 |
+ x11-misc/xdg-utils |
200 |
+ ) |
201 |
+ handbook? ( |
202 |
+ || ( |
203 |
+ $(add_kdebase_dep khelpcenter '' 4.14.3) |
204 |
+ kde-plasma/khelpcenter:5[compat(+)] |
205 |
+ ) |
206 |
+ ) |
207 |
+ policykit? ( || ( |
208 |
+ >=sys-auth/polkit-kde-agent-0.99 |
209 |
+ kde-plasma/polkit-kde-agent |
210 |
+ ) ) |
211 |
+" |
212 |
+ |
213 |
+PATCHES=( |
214 |
+ "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" |
215 |
+ "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" |
216 |
+ "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch" |
217 |
+ "${FILESDIR}/${PN}-4.14.5-mimetypes.patch" |
218 |
+ "${FILESDIR}/${PN}-4.4.90-xslt.patch" |
219 |
+ "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
220 |
+ "${FILESDIR}/${PN}-4.8.1-norpath.patch" |
221 |
+ "${FILESDIR}/${PN}-4.9.3-werror.patch" |
222 |
+ "${FILESDIR}/${PN}-4.10.0-udisks.patch" |
223 |
+ "${FILESDIR}/${PN}-4.14.13-FindQt4.patch" |
224 |
+ "${FILESDIR}/${PN}-4.14.15-revert.patch" |
225 |
+) |
226 |
+ |
227 |
+pkg_pretend() { |
228 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
229 |
+ [[ $(gcc-major-version) -lt 4 ]] || \ |
230 |
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ |
231 |
+ && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." |
232 |
+ fi |
233 |
+} |
234 |
+ |
235 |
+src_prepare() { |
236 |
+ kde4-base_src_prepare |
237 |
+ |
238 |
+ # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) |
239 |
+ sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ |
240 |
+ -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." |
241 |
+ |
242 |
+ if use aqua; then |
243 |
+ sed -i -e \ |
244 |
+ "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \ |
245 |
+ cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake" |
246 |
+ |
247 |
+ #if [[ ${CHOST} == *-darwin8 ]]; then |
248 |
+ sed -i -e \ |
249 |
+ "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \ |
250 |
+ cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake" |
251 |
+ #fi |
252 |
+ |
253 |
+ # solid/solid/backends/iokit doesn't properly link, so disable it. |
254 |
+ sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \ |
255 |
+ || die "disabling solid/solid/backends/iokit failed" |
256 |
+ sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \ |
257 |
+ || die "disabling solid/solid/backends/iokit failed" |
258 |
+ |
259 |
+ # There's no fdatasync on OSX and the check fails to detect that. |
260 |
+ sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \ |
261 |
+ || die "disabling fdatasync failed" |
262 |
+ |
263 |
+ # Fix nameser include to nameser8_compat |
264 |
+ sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \ |
265 |
+ || die "fixing nameser include failed" |
266 |
+ append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1 |
267 |
+ |
268 |
+ # Try to fix kkeyserver_mac |
269 |
+ epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch |
270 |
+ fi |
271 |
+} |
272 |
+ |
273 |
+src_configure() { |
274 |
+ local mycmakeargs=( |
275 |
+ -DWITH_HSPELL=OFF |
276 |
+ -DWITH_ASPELL=OFF |
277 |
+ -DWITH_DNSSD=OFF |
278 |
+ -DKDE_DEFAULT_HOME=.kde4 |
279 |
+ -DKAUTH_BACKEND=POLKITQT-1 |
280 |
+ -DBUILD_libkactivities=OFF |
281 |
+ -DWITH_Soprano=OFF |
282 |
+ -DWITH_SharedDesktopOntologies=OFF |
283 |
+ $(cmake-utils_use_build handbook doc) |
284 |
+ $(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW) |
285 |
+ $(cmake-utils_use_has altivec PPC_ALTIVEC) |
286 |
+ $(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX) |
287 |
+ $(cmake-utils_use_has cpu_flags_x86_sse X86_SSE) |
288 |
+ $(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2) |
289 |
+ $(cmake-utils_use_with acl) |
290 |
+ $(cmake-utils_use_with alsa) |
291 |
+ $(cmake-utils_use_with bzip2 BZip2) |
292 |
+ $(cmake-utils_use_with crypt QCA2) |
293 |
+ $(cmake-utils_use_with fam) |
294 |
+ $(cmake-utils_use_with jpeg2k Jasper) |
295 |
+ $(cmake-utils_use_with kerberos GSSAPI) |
296 |
+ $(cmake-utils_use_with lzma LibLZMA) |
297 |
+ $(cmake-utils_use_with nls Libintl) |
298 |
+ $(cmake-utils_use_with openexr OpenEXR) |
299 |
+ $(cmake-utils_use_with opengl OpenGL) |
300 |
+ $(cmake-utils_use_with policykit PolkitQt-1) |
301 |
+ $(cmake-utils_use_with spell ENCHANT) |
302 |
+ $(cmake-utils_use_with ssl OpenSSL) |
303 |
+ $(cmake-utils_use_with udev UDev) |
304 |
+ $(cmake-utils_use_with udisks SOLID_UDISKS2) |
305 |
+ $(cmake-utils_use_with zeroconf Avahi) |
306 |
+ ) |
307 |
+ kde4-base_src_configure |
308 |
+} |
309 |
+ |
310 |
+src_compile() { |
311 |
+ kde4-base_src_compile |
312 |
+ |
313 |
+ # The building of apidox is not managed anymore by the build system |
314 |
+ if use doc; then |
315 |
+ einfo "Building API documentation" |
316 |
+ cd "${S}"/doc/api/ |
317 |
+ ./doxygen.sh "${S}" || die "APIDOX generation failed" |
318 |
+ fi |
319 |
+} |
320 |
+ |
321 |
+src_install() { |
322 |
+ kde4-base_src_install |
323 |
+ |
324 |
+ # use system certificates |
325 |
+ rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die |
326 |
+ dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt |
327 |
+ |
328 |
+ if use doc; then |
329 |
+ einfo "Installing API documentation. This could take a bit of time." |
330 |
+ cd "${S}"/doc/api/ |
331 |
+ docinto /HTML/en/kdelibs-apidox |
332 |
+ dohtml -r ${P}-apidocs/* |
333 |
+ fi |
334 |
+ |
335 |
+ if use aqua; then |
336 |
+ einfo "fixing ${PN} plugins" |
337 |
+ |
338 |
+ local _PV=${PV:0:3}.0 |
339 |
+ local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script |
340 |
+ |
341 |
+ install_name_tool -id \ |
342 |
+ "${_dir}/libkrossqtsplugin.${_PV}.dylib" \ |
343 |
+ "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \ |
344 |
+ || die "failed fixing libkrossqtsplugin.${_PV}.dylib" |
345 |
+ |
346 |
+ einfo "fixing ${PN} cmake detection files" |
347 |
+ #sed -i -e \ |
348 |
+ # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ |
349 |
+ echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ |
350 |
+ "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \ |
351 |
+ || die "failed fixing FindXKB.cmake" |
352 |
+ fi |
353 |
+ |
354 |
+ einfo Installing environment file. |
355 |
+ # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. |
356 |
+ echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" |
357 |
+ echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" |
358 |
+ doenvd "${T}/77kde" |
359 |
+} |
360 |
+ |
361 |
+pkg_postinst() { |
362 |
+ fdo-mime_mime_database_update |
363 |
+ |
364 |
+ if use zeroconf; then |
365 |
+ echo |
366 |
+ elog "To make zeroconf support available in KDE make sure that the avahi daemon" |
367 |
+ elog "is running." |
368 |
+ echo |
369 |
+ einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" |
370 |
+ einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" |
371 |
+ einfo "to include 'mdns', e.g.:" |
372 |
+ einfo " hosts: files mdns dns" |
373 |
+ echo |
374 |
+ fi |
375 |
+ |
376 |
+ kde4-base_pkg_postinst |
377 |
+} |
378 |
+ |
379 |
+pkg_prerm() { |
380 |
+ # Remove ksycoca4 global database |
381 |
+ rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 |
382 |
+} |
383 |
+ |
384 |
+pkg_postrm() { |
385 |
+ fdo-mime_mime_database_update |
386 |
+ |
387 |
+ kde4-base_pkg_postrm |
388 |
+} |