Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs: kdelibs-4.7.3-r1.ebuild ChangeLog
Date: Sun, 20 Nov 2011 22:18:56
Message-Id: 20111120221847.48DDD2004B@flycatcher.gentoo.org
1 dilfridge 11/11/20 22:18:47
2
3 Modified: ChangeLog
4 Added: kdelibs-4.7.3-r1.ebuild
5 Log:
6 No more windows hidden behind background, bug 365623
7
8 (Portage version: 2.1.10.36/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.803 kde-base/kdelibs/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.803&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.803&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.802&r2=1.803
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v
20 retrieving revision 1.802
21 retrieving revision 1.803
22 diff -u -r1.802 -r1.803
23 --- ChangeLog 2 Nov 2011 20:48:10 -0000 1.802
24 +++ ChangeLog 20 Nov 2011 22:18:47 -0000 1.803
25 @@ -1,6 +1,12 @@
26 # ChangeLog for kde-base/kdelibs
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.802 2011/11/02 20:48:10 alexxy Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.803 2011/11/20 22:18:47 dilfridge Exp $
30 +
31 +*kdelibs-4.7.3-r1 (20 Nov 2011)
32 +
33 + 20 Nov 2011; Andreas K. Huettel <dilfridge@g.o>
34 + +kdelibs-4.7.3-r1.ebuild, +files/kdelibs-4.7.3-customcont.patch:
35 + No more windows hidden behind background, bug 365623
36
37 *kdelibs-4.7.3 (02 Nov 2011)
38
39
40
41
42 1.1 kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild?rev=1.1&content-type=text/plain
46
47 Index: kdelibs-4.7.3-r1.ebuild
48 ===================================================================
49 # Copyright 1999-2011 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild,v 1.1 2011/11/20 22:18:47 dilfridge Exp $
52
53 EAPI=4
54
55 CPPUNIT_REQUIRED="optional"
56 DECLARATIVE_REQUIRED="always"
57 OPENGL_REQUIRED="optional"
58 KDE_SCM="git"
59 inherit kde4-base fdo-mime toolchain-funcs
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 +udev
68 +udisks +upower upnp zeroconf"
69
70 REQUIRED_USE="
71 udisks? ( udev )
72 upower? ( udev )
73 "
74
75 # needs the kate regression testsuite from svn
76 RESTRICT="test"
77
78 COMMONDEPEND="
79 app-crypt/qca:2
80 >=app-misc/strigi-0.7.6
81 app-text/docbook-xml-dtd:4.2
82 app-text/docbook-xsl-stylesheets
83 >=dev-libs/libattica-0.1.90
84 >=dev-libs/libdbusmenu-qt-0.3.2
85 dev-libs/libpcre[unicode]
86 dev-libs/libxml2
87 dev-libs/libxslt
88 media-libs/fontconfig
89 media-libs/freetype:2
90 media-libs/giflib
91 >=media-libs/libpng-1.4
92 >=media-libs/phonon-4.4.3
93 sys-libs/zlib
94 virtual/jpeg
95 >=x11-misc/shared-mime-info-0.60
96 acl? ( virtual/acl )
97 alsa? ( media-libs/alsa-lib )
98 !aqua? (
99 x11-libs/libICE
100 x11-libs/libSM
101 x11-libs/libX11
102 x11-libs/libXau
103 x11-libs/libXcursor
104 x11-libs/libXdmcp
105 x11-libs/libXext
106 x11-libs/libXfixes
107 x11-libs/libXft
108 x11-libs/libXpm
109 x11-libs/libXrender
110 x11-libs/libXScrnSaver
111 x11-libs/libXtst
112 !kernel_SunOS? ( sys-libs/libutempter )
113 )
114 bzip2? ( app-arch/bzip2 )
115 fam? ( virtual/fam )
116 jpeg2k? ( media-libs/jasper )
117 kerberos? ( virtual/krb5 )
118 lzma? ( app-arch/xz-utils )
119 openexr? (
120 media-libs/openexr
121 media-libs/ilmbase
122 )
123 policykit? ( >=sys-auth/polkit-qt-0.99 )
124 semantic-desktop? (
125 >=dev-libs/shared-desktop-ontologies-0.6.50
126 >=dev-libs/soprano-2.6.51[dbus,raptor,redland]
127 )
128 spell? ( app-text/enchant )
129 ssl? ( dev-libs/openssl )
130 udev? ( sys-fs/udev )
131 upnp? ( media-libs/herqq )
132 zeroconf? (
133 || (
134 net-dns/avahi[mdnsresponder-compat]
135 !bindist? ( net-misc/mDNSResponder )
136 )
137 )
138 "
139 DEPEND="${COMMONDEPEND}
140 doc? ( app-doc/doxygen )
141 nls? ( virtual/libintl )
142 "
143 RDEPEND="${COMMONDEPEND}
144 !x11-libs/qt-phonon
145 >=app-crypt/gnupg-2.0.11
146 app-misc/ca-certificates
147 $(add_kdebase_dep kde-env)
148 !aqua? (
149 x11-apps/iceauth
150 x11-apps/rgb
151 >=x11-misc/xdg-utils-1.0.2-r3
152 udisks? ( sys-fs/udisks )
153 upower? ( sys-power/upower )
154 )
155 "
156 PDEPEND="
157 $(add_kdebase_dep katepart)
158 || ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils )
159 handbook? ( $(add_kdebase_dep khelpcenter) )
160 policykit? (
161 >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127
162 >=sys-auth/polkit-kde-agent-0.99
163 )
164 semantic-desktop? ( $(add_kdebase_dep nepomuk) )
165 "
166
167 # Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
168 add_blocker plasma-workspace 4.7.1
169
170 PATCHES=(
171 "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
172 "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
173 "${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
174 "${FILESDIR}/${PN}-4.4.90-xslt.patch"
175 "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
176 "${FILESDIR}/${PN}-4.6.3-bytecode.patch"
177 "${FILESDIR}/${PN}-4.7.3-customcont.patch"
178 )
179
180 pkg_pretend() {
181 if [[ ${MERGE_TYPE} != binary ]]; then
182 [[ $(gcc-major-version) -lt 4 ]] || \
183 ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
184 && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
185 fi
186 }
187
188 src_prepare() {
189 kde4-base_src_prepare
190 use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
191
192 # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
193 sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
194 -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
195
196 if use aqua; then
197 sed -i -e \
198 "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
199 cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
200
201 #if [[ ${CHOST} == *-darwin8 ]]; then
202 sed -i -e \
203 "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
204 cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
205 #fi
206
207 # solid/solid/backends/iokit doesn't properly link, so disable it.
208 sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
209 || die "disabling solid/solid/backends/iokit failed"
210 sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
211 || die "disabling solid/solid/backends/iokit failed"
212
213 # There's no fdatasync on OSX and the check fails to detect that.
214 sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
215 || die "disabling fdatasync failed"
216
217 # Fix nameser include to nameser8_compat
218 sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
219 || die "fixing nameser include failed"
220 append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
221
222 # Try to fix kkeyserver_mac
223 epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
224 fi
225
226 if [[ ${CHOST} == *-solaris* ]] ; then
227 epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch"
228 # getgrouplist not in solaris libc
229 epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch"
230 # solaris has no d_type element in dir_ent
231 epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch"
232 fi
233 }
234
235 src_configure() {
236 if use zeroconf; then
237 if has_version net-dns/avahi; then
238 mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF)
239 elif has_version net-misc/mDNSResponder; then
240 mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON)
241 else
242 die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
243 fi
244 else
245 mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
246 fi
247 mycmakeargs+=(
248 -DWITH_HSPELL=OFF
249 -DWITH_ASPELL=OFF
250 -DKDE_DEFAULT_HOME=.kde4
251 -DKAUTH_BACKEND=POLKITQT-1
252 -DBUILD_libkactivities=OFF
253 $(cmake-utils_use_build handbook doc)
254 $(cmake-utils_use_has 3dnow X86_3DNOW)
255 $(cmake-utils_use_has altivec PPC_ALTIVEC)
256 $(cmake-utils_use_has mmx X86_MMX)
257 $(cmake-utils_use_has sse X86_SSE)
258 $(cmake-utils_use_has sse2 X86_SSE2)
259 $(cmake-utils_use_with acl)
260 $(cmake-utils_use_with alsa)
261 $(cmake-utils_use_with bzip2 BZip2)
262 $(cmake-utils_use_with fam)
263 $(cmake-utils_use_with jpeg2k Jasper)
264 $(cmake-utils_use_with kerberos GSSAPI)
265 $(cmake-utils_use_with lzma LibLZMA)
266 $(cmake-utils_use_with nls Libintl)
267 $(cmake-utils_use_with openexr OpenEXR)
268 $(cmake-utils_use_with opengl OpenGL)
269 $(cmake-utils_use_with policykit PolkitQt-1)
270 $(cmake-utils_use_with semantic-desktop Soprano)
271 $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
272 $(cmake-utils_use_with spell ENCHANT)
273 $(cmake-utils_use_with ssl OpenSSL)
274 $(cmake-utils_use_with udev UDev)
275 $(cmake-utils_use_with upnp HUpnp)
276 )
277 kde4-base_src_configure
278 }
279
280 src_compile() {
281 kde4-base_src_compile
282
283 # The building of apidox is not managed anymore by the build system
284 if use doc; then
285 einfo "Building API documentation"
286 cd "${S}"/doc/api/
287 ./doxygen.sh "${S}" || die "APIDOX generation failed"
288 fi
289 }
290
291 src_install() {
292 kde4-base_src_install
293
294 # use system certificates
295 rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
296 dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
297
298 if use doc; then
299 einfo "Installing API documentation. This could take a bit of time."
300 cd "${S}"/doc/api/
301 docinto /HTML/en/kdelibs-apidox
302 dohtml -r ${P}-apidocs/*
303 fi
304
305 if use aqua; then
306 einfo "fixing ${PN} plugins"
307
308 local _PV=${PV:0:3}.0
309 local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
310
311 install_name_tool -id \
312 "${_dir}/libkrossqtsplugin.${_PV}.dylib" \
313 "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
314 || die "failed fixing libkrossqtsplugin.${_PV}.dylib"
315
316 einfo "fixing ${PN} cmake detection files"
317 #sed -i -e \
318 # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
319 echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
320 "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
321 || die "failed fixing FindXKB.cmake"
322 fi
323
324 einfo Installing environment file.
325 # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
326 echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
327 echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
328 doenvd "${T}/77kde"
329 }
330
331 pkg_postinst() {
332 fdo-mime_mime_database_update
333
334 if use zeroconf; then
335 echo
336 elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
337 elog "is running."
338 echo
339 einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
340 einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
341 einfo "to include 'mdns', e.g.:"
342 einfo " hosts: files mdns dns"
343 echo
344 fi
345
346 elog "Your homedir is set to \${HOME}/.kde4"
347 echo
348
349 kde4-base_pkg_postinst
350 }
351
352 pkg_prerm() {
353 # Remove ksycoca4 global database
354 rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
355 }
356
357 pkg_postrm() {
358 fdo-mime_mime_database_update
359
360 kde4-base_pkg_postrm
361 }
Report Message
Find on MARC Find on Google Groups