1 |
dilfridge 10/12/30 17:35:23 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: kdelibs-4.4.5-r2.ebuild |
5 |
Log: |
6 |
Added upstream patch to kill the multitudes of QPainter::...: Painter not active error messages. Should fix bug 341289, please test. |
7 |
|
8 |
(Portage version: 2.1.9.26/cvs/Linux i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.711 kde-base/kdelibs/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.711&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.711&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.710&r2=1.711 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v |
20 |
retrieving revision 1.710 |
21 |
retrieving revision 1.711 |
22 |
diff -u -r1.710 -r1.711 |
23 |
--- ChangeLog 14 Dec 2010 21:59:46 -0000 1.710 |
24 |
+++ ChangeLog 30 Dec 2010 17:35:23 -0000 1.711 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for kde-base/kdelibs |
27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.710 2010/12/14 21:59:46 dilfridge Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.711 2010/12/30 17:35:23 dilfridge Exp $ |
30 |
+ |
31 |
+*kdelibs-4.4.5-r2 (30 Dec 2010) |
32 |
+ |
33 |
+ 30 Dec 2010; Andreas K. Huettel <dilfridge@g.o> |
34 |
+ +kdelibs-4.4.5-r2.ebuild, +files/kdelibs-4.4.5-formpainter.patch: |
35 |
+ Added upstream patch to kill the multitudes of QPainter::...: Painter not |
36 |
+ active error messages. Should fix bug 341289, please test. |
37 |
|
38 |
*kdelibs-4.4.5-r1 (14 Dec 2010) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 kde-base/kdelibs/kdelibs-4.4.5-r2.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.5-r2.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.5-r2.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: kdelibs-4.4.5-r2.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2010 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.5-r2.ebuild,v 1.1 2010/12/30 17:35:23 dilfridge Exp $ |
53 |
|
54 |
EAPI="3" |
55 |
|
56 |
CPPUNIT_REQUIRED="optional" |
57 |
OPENGL_REQUIRED="optional" |
58 |
WEBKIT_REQUIRED="always" |
59 |
inherit kde4-base fdo-mime |
60 |
|
61 |
DESCRIPTION="KDE libraries needed by all KDE programs." |
62 |
HOMEPAGE="http://www.kde.org/" |
63 |
|
64 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
65 |
LICENSE="LGPL-2.1" |
66 |
IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos |
67 |
lzma mmx nls openexr policykit semantic-desktop spell sse sse2 ssl zeroconf" |
68 |
|
69 |
# needs the kate regression testsuite from svn |
70 |
RESTRICT="test" |
71 |
|
72 |
COMMONDEPEND=" |
73 |
app-crypt/qca:2 |
74 |
>=app-misc/strigi-0.6.3 |
75 |
~dev-libs/libattica-0.1.2 |
76 |
dev-libs/libpcre[unicode] |
77 |
dev-libs/libxml2 |
78 |
dev-libs/libxslt |
79 |
media-libs/fontconfig |
80 |
media-libs/freetype:2 |
81 |
media-libs/giflib |
82 |
>=media-libs/libpng-1.4 |
83 |
sys-libs/zlib |
84 |
virtual/jpeg |
85 |
>=x11-misc/shared-mime-info-0.60 |
86 |
acl? ( virtual/acl ) |
87 |
alsa? ( media-libs/alsa-lib ) |
88 |
aqua? ( >=media-sound/phonon-4.3.80 ) |
89 |
!aqua? ( |
90 |
>=media-sound/phonon-4.3.80[xcb] |
91 |
x11-libs/libICE |
92 |
x11-libs/libSM |
93 |
x11-libs/libX11 |
94 |
x11-libs/libXau |
95 |
x11-libs/libXcursor |
96 |
x11-libs/libXdmcp |
97 |
x11-libs/libXext |
98 |
x11-libs/libXfixes |
99 |
x11-libs/libXft |
100 |
x11-libs/libXpm |
101 |
x11-libs/libXrender |
102 |
x11-libs/libXtst |
103 |
!kernel_SunOS? ( sys-libs/libutempter ) |
104 |
) |
105 |
bzip2? ( app-arch/bzip2 ) |
106 |
fam? ( virtual/fam ) |
107 |
jpeg2k? ( media-libs/jasper ) |
108 |
kerberos? ( virtual/krb5 ) |
109 |
lzma? ( app-arch/xz-utils ) |
110 |
openexr? ( |
111 |
media-libs/openexr |
112 |
media-libs/ilmbase |
113 |
) |
114 |
policykit? ( sys-auth/polkit-qt ) |
115 |
semantic-desktop? ( |
116 |
>=dev-libs/shared-desktop-ontologies-0.2 |
117 |
>=dev-libs/soprano-2.3.73[dbus,raptor,redland] |
118 |
) |
119 |
spell? ( app-text/enchant ) |
120 |
ssl? ( dev-libs/openssl ) |
121 |
zeroconf? ( |
122 |
|| ( |
123 |
net-dns/avahi[mdnsresponder-compat] |
124 |
!bindist? ( net-misc/mDNSResponder ) |
125 |
) |
126 |
) |
127 |
" |
128 |
DEPEND="${COMMONDEPEND} |
129 |
doc? ( app-doc/doxygen ) |
130 |
nls? ( virtual/libintl ) |
131 |
" |
132 |
RDEPEND="${COMMONDEPEND} |
133 |
!dev-libs/conversion |
134 |
!dev-libs/kunitconversion |
135 |
!x11-libs/qt-phonon |
136 |
!<=kde-misc/kdnssd-avahi-0.1.2:0 |
137 |
>=app-crypt/gnupg-2.0.11 |
138 |
app-misc/ca-certificates |
139 |
$(add_kdebase_dep kde-env) |
140 |
!aqua? ( |
141 |
x11-apps/iceauth |
142 |
x11-apps/rgb |
143 |
>=x11-misc/xdg-utils-1.0.2-r3 |
144 |
) |
145 |
" |
146 |
PDEPEND=" |
147 |
handbook? ( $(add_kdebase_dep khelpcenter) ) |
148 |
policykit? ( >=sys-auth/polkit-kde-0.95.1 ) |
149 |
semantic-desktop? ( $(add_kdebase_dep nepomuk) ) |
150 |
" |
151 |
|
152 |
# Blockers added due to packages from old versions, removed in the meanwhile |
153 |
# as well as for file collisions |
154 |
add_blocker libknotificationitem |
155 |
add_blocker libkworkspace '<4.3.66' |
156 |
# @since 4.4 - kpilot is gone (blocker added to help upgrades) |
157 |
add_blocker kpilot |
158 |
# Block some old versions of KDE-3.5 packages that don't work well with KDE-4 |
159 |
add_blocker kdebase 0 3.5.9-r4:3.5 |
160 |
add_blocker kdebase-startkde 0 3.5.10:3.5 |
161 |
add_blocker kdelibs 0 '<3.5.10:3.5' |
162 |
# libnepomukquery moved to kdelibs from plasma-workspace between 4.3.74 -> 4.3.75 |
163 |
add_blocker plasma-workspace '<4.3.75' |
164 |
|
165 |
PATCHES=( |
166 |
"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch" |
167 |
"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs.patch" |
168 |
"${FILESDIR}/dist/23_solid_no_double_build.patch" |
169 |
"${FILESDIR}/${PN}-4.3.80-module-suffix.patch" |
170 |
"${FILESDIR}/${PN}-4.4.66-macos-unbundle.patch" |
171 |
"${FILESDIR}/${PN}-4.3.3-klauncher_kdeinit.patch" |
172 |
"${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch" |
173 |
"${FILESDIR}/${PN}-4.3.3-klauncher_mac.patch" |
174 |
"${FILESDIR}/${PN}-4.4.3-mimetypes.patch" |
175 |
"${FILESDIR}/${PN}-4.4.90-xslt.patch" |
176 |
"${FILESDIR}/${PN}-4.4.5-qt471.patch" |
177 |
"${FILESDIR}/${PN}-4.4.5-formpainter.patch" |
178 |
) |
179 |
|
180 |
src_prepare() { |
181 |
kde4-base_src_prepare |
182 |
|
183 |
# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix.patch to work) |
184 |
local menu_prefix="kde-${SLOT}-" |
185 |
sed -e "s|FILES[[:space:]]applications.menu|FILES applications.menu RENAME ${menu_prefix}applications.menu|g" \ |
186 |
-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." |
187 |
sed -e "s|@REPLACE_MENU_PREFIX@|${menu_prefix}|g" \ |
188 |
-i kded/vfolder_menu.cpp || die "Sed on vfolder_menu.cpp failed." |
189 |
|
190 |
if use aqua; then |
191 |
sed -i -e \ |
192 |
"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \ |
193 |
cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake" |
194 |
|
195 |
#if [[ ${CHOST} == *-darwin8 ]]; then |
196 |
sed -i -e \ |
197 |
"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \ |
198 |
cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake" |
199 |
#fi |
200 |
|
201 |
# solid/solid/backends/iokit doesn't properly link, so disable it. |
202 |
sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \ |
203 |
|| die "disabling solid/solid/backends/iokit failed" |
204 |
sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \ |
205 |
|| die "disabling solid/solid/backends/iokit failed" |
206 |
|
207 |
# There's no fdatasync on OSX and the check fails to detect that. |
208 |
sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \ |
209 |
|| die "disabling fdatasync failed" |
210 |
|
211 |
# Fix nameser include to nameser8_compat |
212 |
sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \ |
213 |
|| die "fixing nameser include failed" |
214 |
append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1 |
215 |
|
216 |
# Try to fix kkeyserver_mac |
217 |
epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch |
218 |
fi |
219 |
|
220 |
if [[ ${CHOST} == *-solaris* ]] ; then |
221 |
epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch" |
222 |
# getgrouplist not in solaris libc |
223 |
epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch" |
224 |
# solaris has no d_type element in dir_ent |
225 |
epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch" |
226 |
fi |
227 |
} |
228 |
|
229 |
src_configure() { |
230 |
if use zeroconf; then |
231 |
if has_version net-dns/avahi; then |
232 |
mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF) |
233 |
elif has_version net-misc/mDNSResponder; then |
234 |
mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON) |
235 |
else |
236 |
die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." |
237 |
fi |
238 |
else |
239 |
mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF) |
240 |
fi |
241 |
if use kdeprefix; then |
242 |
HME=".kde${SLOT}" |
243 |
else |
244 |
HME=".kde4" |
245 |
fi |
246 |
mycmakeargs+=( |
247 |
-DWITH_HSPELL=OFF |
248 |
-DWITH_ASPELL=OFF |
249 |
-DKDE_DEFAULT_HOME=${HME} |
250 |
-DKAUTH_BACKEND=POLKITQT-1 |
251 |
$(cmake-utils_use_build handbook doc) |
252 |
$(cmake-utils_use_has 3dnow X86_3DNOW) |
253 |
$(cmake-utils_use_has altivec PPC_ALTIVEC) |
254 |
$(cmake-utils_use_has mmx X86_MMX) |
255 |
$(cmake-utils_use_has sse X86_SSE) |
256 |
$(cmake-utils_use_has sse2 X86_SSE2) |
257 |
$(cmake-utils_use_with acl) |
258 |
$(cmake-utils_use_with alsa) |
259 |
$(cmake-utils_use_with bzip2 BZip2) |
260 |
$(cmake-utils_use_with fam) |
261 |
$(cmake-utils_use_with jpeg2k Jasper) |
262 |
$(cmake-utils_use_with kerberos GSSAPI) |
263 |
$(cmake-utils_use_with lzma LibLZMA) |
264 |
$(cmake-utils_use_with nls Libintl) |
265 |
$(cmake-utils_use_with openexr OpenEXR) |
266 |
$(cmake-utils_use_with opengl OpenGL) |
267 |
$(cmake-utils_use_with policykit PolkitQt-1) |
268 |
$(cmake-utils_use_with semantic-desktop Soprano) |
269 |
$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) |
270 |
$(cmake-utils_use_with spell ENCHANT) |
271 |
$(cmake-utils_use_with ssl OpenSSL) |
272 |
) |
273 |
kde4-base_src_configure |
274 |
} |
275 |
|
276 |
src_compile() { |
277 |
kde4-base_src_compile |
278 |
|
279 |
# The building of apidox is not managed anymore by the build system |
280 |
if use doc; then |
281 |
einfo "Building API documentation" |
282 |
cd "${S}"/doc/api/ |
283 |
./doxygen.sh "${S}" || die "APIDOX generation failed" |
284 |
fi |
285 |
} |
286 |
|
287 |
src_install() { |
288 |
kde4-base_src_install |
289 |
|
290 |
# use system certificates |
291 |
rm -f "${ED}/${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die |
292 |
dosym /etc/ssl/certs/ca-certificates.crt \ |
293 |
"${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die |
294 |
|
295 |
if use doc; then |
296 |
einfo "Installing API documentation. This could take a bit of time." |
297 |
cd "${S}"/doc/api/ |
298 |
docinto /HTML/en/kdelibs-apidox |
299 |
dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed" |
300 |
fi |
301 |
|
302 |
if use aqua; then |
303 |
einfo "fixing ${PN} plugins" |
304 |
|
305 |
local _PV=${PV:0:3}.0 |
306 |
local _dir=${EKDEDIR}/$(get_libdir)/kde4/plugins/script |
307 |
|
308 |
install_name_tool -id \ |
309 |
"${_dir}/libkrossqtsplugin.${_PV}.dylib" \ |
310 |
"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \ |
311 |
|| die "failed fixing libkrossqtsplugin.${_PV}.dylib" |
312 |
|
313 |
einfo "fixing ${PN} cmake detection files" |
314 |
#sed -i -e \ |
315 |
# "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ |
316 |
echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ |
317 |
"${ED}"/${KDEDIR}/share/apps/cmake/modules/FindXKB.cmake \ |
318 |
|| die "failed fixing FindXKB.cmake" |
319 |
fi |
320 |
} |
321 |
|
322 |
pkg_postinst() { |
323 |
fdo-mime_mime_database_update |
324 |
|
325 |
if use zeroconf; then |
326 |
echo |
327 |
elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon" |
328 |
elog "is running." |
329 |
echo |
330 |
einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" |
331 |
einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" |
332 |
einfo "to include 'mdns', e.g.:" |
333 |
einfo " hosts: files mdns dns" |
334 |
echo |
335 |
fi |
336 |
|
337 |
elog "Your homedir is set to \${HOME}/${HME}" |
338 |
echo |
339 |
|
340 |
if ! has_version sys-apps/hal; then |
341 |
echo |
342 |
ewarn "You need sys-apps/hal for new device notifications, power management and any" |
343 |
ewarn "other hardware related functionalities to work." |
344 |
echo |
345 |
fi |
346 |
|
347 |
kde4-base_pkg_postinst |
348 |
} |
349 |
|
350 |
pkg_prerm() { |
351 |
# Remove ksycoca4 global database |
352 |
rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 |
353 |
} |
354 |
|
355 |
pkg_postrm() { |
356 |
fdo-mime_mime_database_update |
357 |
|
358 |
kde4-base_pkg_postrm |
359 |
} |