[kde-base/kdelibs] Added 4.3.3-r1 that backports plasma pixmap cache patch.

3 files changed, 242 insertions, 0 deletions

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 5f2b1837d0b..628d2f95ed2 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,8 +1,11 @@
 AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
 AUX dist/02_gentoo_append_xdg_config_dirs.patch 919 RMD160 1406b23f317710bf039aa6020f55781b6f2c2f6a SHA1 cc589b31277e5bb6322df0240389fa8423d8d942 SHA256 e0be8da02ea48eb6ad4dcb0d723bf2a619cc7ed57dd41f456018116fb05162f6
 AUX dist/23_solid_no_double_build.patch 838 RMD160 24bea0cd76edd2709edcdc654b74ebf1566e7ef7 SHA1 534aef07069b9b89ff3ff80619eb35f0fd588b61 SHA256 1ef6f6e7fe4b31b79126fd0cefaadab03f0e6a4bd9194fc8f4bee4750620c4ad
+AUX kdelibs-4.3.3-plasma-pixmap-cache.patch 656 RMD160 9b8173f035ab3cb1867c21f3d5ffc3f5e4d25578 SHA1 d83b15cc16e8638ef5402b82957a93c3acc48534 SHA256 d8e4fd4ad1a3c405d8beac05be53f8f028bc8974520707821fb99ee19ca13c7c
+DIST kdelibs-4.3.3.tar.bz2 10516364 RMD160 3d6a2c971cef12fb2cb9ba64a10200b2cf098043 SHA1 89b55982e007c44835a9da0f540dd57fa096df45 SHA256 bec0b11b9db010fb14e1bc438ef77dd417a429168eb7d14dc5dee50ea23b5fb3
 DIST kdelibs-4.3.4.tar.bz2 10518746 RMD160 1f3300e902c91c122a74bfba41bd71d5fff5094a SHA1 bb67c98bf7a0e448353ed5f75bc349a4003ae50a SHA256 3abb4001843e680fe221b15ee574b18b74ddc8c74b2c7f145849b99b569afa2f
 DIST kdelibs-4.3.77.tar.xz 10858972 RMD160 bb50e0e9d8efaaba2819ac6d8345013c2524dfd3 SHA1 82b94d65e63fda1d43b2085e1ca5721b479a3c43 SHA256 dee4d32fa0d7aa1bc3a9cd2721ecc39558deceb23e2deef19ff0dcb034dea4dd
+EBUILD kdelibs-4.3.3-r1.ebuild 6382 RMD160 ac1156458ca03edca6e1286d423c56a237efc06e SHA1 d23d036261b7c865d68d98e7a0a24235e9a44096 SHA256 10751814c125fe387b983ba30a29faab2e4fd34bc0daf7f05c1b300434611ff0
 EBUILD kdelibs-4.3.4.ebuild 6288 RMD160 138b16e4f75b9d2c5293eac979472e1af8279527 SHA1 467f979e569e0edbe1abef971688975962a25f2b SHA256 d53399055a3368aa929c72db617ec407b0ba4d44b53af378e01caabd2e084235
 EBUILD kdelibs-4.3.77.ebuild 6366 RMD160 e4755573849544b061eb4fcada3585a599c531bd SHA1 6985ccbdbbfa00decbe4bc36eb3141df6d6259a2 SHA256 b82c73d5c268cce3891a3380016973f1f5a8f08e8e57ef022222a00356f1215d
 EBUILD kdelibs-4.3.9999.ebuild 6246 RMD160 7715c0b8ef09d4a48cb0688bb3645f997c620945 SHA1 6f339aea714871c2bc4946c5e3441aef4f403751 SHA256 b8b729c7f57f78798cabf14980274fa8d8a3e6535651c0c0ad834fd948d2caa7
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.3-plasma-pixmap-cache.patch b/kde-base/kdelibs/files/kdelibs-4.3.3-plasma-pixmap-cache.patch
new file mode 100644
index 00000000000..59e28515571
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.3.3-plasma-pixmap-cache.patch
@@ -0,0 +1,13 @@
+--- branches/KDE/4.3/kdelibs/plasma/framesvg.cpp	2009/11/28 18:23:00	1055787
++++ branches/KDE/4.3/kdelibs/plasma/framesvg.cpp	2009/11/28 18:25:53	1055788
+@@ -625,8 +625,8 @@
+     }
+ 
+     QSizeF size = frameSize(frame);
+-    QString id = QString::fromLatin1("%7_%6_%5_%4_%3_%2_%1_").
+-        arg(overlayPos.y()).arg(overlayPos.x()).arg(frame->enabledBorders).arg(size.width()).arg(size.height()).arg(prefixToSave).arg(q->imagePath());
++    QString id = QString::fromLatin1("%5_%4_%3_%2_%1_").
++        arg(frame->enabledBorders).arg(size.width()).arg(size.height()).arg(prefixToSave).arg(q->imagePath());
+ 
+     //kDebug()<<"Saving to cache frame"<<id;
+ 
diff --git a/kde-base/kdelibs/kdelibs-4.3.3-r1.ebuild b/kde-base/kdelibs/kdelibs-4.3.3-r1.ebuild
new file mode 100644
index 00000000000..060d2141833
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.3.3-r1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.3.ebuild,v 1.2 2009/11/06 12:31:33 ssuominen Exp $
+
+EAPI="2"
+
+CPPUNIT_REQUIRED="optional"
+OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="always"
+inherit kde4-base fdo-mime
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+LICENSE="LGPL-2.1"
+IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos
+lzma mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+	>=app-misc/strigi-0.6.3[dbus,qt4]
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=kde-base/automoc-0.9.87
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/giflib
+	media-libs/jpeg
+	media-libs/libpng
+	>=media-sound/phonon-4.4_pre[xcb]
+	sys-apps/dbus[X]
+	sys-libs/libutempter
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrender
+	x11-libs/libXtst
+	>=x11-misc/shared-mime-info-0.60
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	bzip2? ( app-arch/bzip2 )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	lzma? ( app-arch/xz-utils )
+	openexr? (
+		media-libs/openexr
+		media-libs/ilmbase
+	)
+	semantic-desktop? ( >=dev-libs/soprano-2.3.0[dbus] )
+	spell? (
+		app-dicts/aspell-en
+		app-text/aspell
+		app-text/enchant
+	)
+	ssl? ( dev-libs/openssl )
+	zeroconf? (
+		|| (
+			net-dns/avahi[mdnsresponder-compat]
+			!bindist? ( net-misc/mDNSResponder )
+		)
+	)
+"
+DEPEND="${COMMONDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( virtual/libintl )
+"
+RDEPEND="${COMMONDEPEND}
+	!<=kde-misc/kdnssd-avahi-0.1.2:0
+	!x11-libs/qt-phonon
+	>=app-crypt/gnupg-2.0.11
+	x11-apps/iceauth
+	x11-apps/rgb
+	>=x11-misc/xdg-utils-1.0.2-r3
+"
+PDEPEND="
+	$(add_kdebase_dep kde-env)
+	$(add_kdebase_dep kdebase-data)
+	$(add_kdebase_dep ktimezoned)
+"
+
+# Blockers added due to packages from old versions, removed in the meanwhile
+# as well as for file collisions
+add_blocker kitchensync 4.1.50
+add_blocker knewsticker 4.1.50
+add_blocker kpercentage 4.1.50
+add_blocker ktnef 4.1.50
+add_blocker libkworkspace 4.2.50
+add_blocker libplasma
+# Block some old versions of KDE-3.5 packages that don't work well with KDE-4
+add_blocker kdebase 0 3.5.9-r4:3.5
+add_blocker kdebase-startkde 0 3.5.10:3.5
+add_blocker kdelibs 0 '<3.5.10'
+
+PATCHES=(
+	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch"
+	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs.patch"
+	"${FILESDIR}/dist/23_solid_no_double_build.patch"
+	"${FILESDIR}/${P}-glibc-2.11.patch"
+	"${FILESDIR}/${P}-plasma-pixmap-cache.patch"
+)
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix.patch to work)
+	local menu_prefix="kde-${SLOT}-"
+	sed -e "s|FILES[[:space:]]applications.menu|FILES applications.menu RENAME ${menu_prefix}applications.menu|g" \
+		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
+	sed -e "s|@REPLACE_MENU_PREFIX@|${menu_prefix}|" \
+		-i kded/vfolder_menu.cpp || die "Sed on vfolder_menu.cpp failed."
+
+	# FIXME Remove experimental folder from CMakeLists - we have
+	# kde-base/libknotificationitem for now
+	sed -e "/macro_optional_add_subdirectory( experimental )/ s:^:#:" \
+		-i CMakeLists.txt || die "Failed to sed-out experimental."
+}
+
+src_configure() {
+	if use zeroconf; then
+		if has_version net-dns/avahi; then
+			mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF"
+		elif has_version net-misc/mDNSResponder; then
+			mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON"
+		else
+			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
+		fi
+	else
+		mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=OFF"
+	fi
+	if use kdeprefix; then
+		HME=".kde${SLOT}"
+	else
+		HME=".kde4"
+	fi
+	mycmakeargs="${mycmakeargs}
+		-DWITH_HSPELL=OFF
+		-DKDE_DEFAULT_HOME=${HME}
+		$(cmake-utils_use_build handbook doc)
+		$(cmake-utils_use_has 3dnow X86_3DNOW)
+		$(cmake-utils_use_has altivec PPC_ALTIVEC)
+		$(cmake-utils_use_has mmx X86_MMX)
+		$(cmake-utils_use_has sse X86_SSE)
+		$(cmake-utils_use_has sse2 X86_SSE2)
+		$(cmake-utils_use_with acl)
+		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with fam)
+		$(cmake-utils_use_with jpeg2k Jasper)
+		$(cmake-utils_use_with kerberos GSSAPI)
+		$(cmake-utils_use_with lzma LibLZMA)
+		$(cmake-utils_use_with nls Libintl)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with spell ASPELL)
+		$(cmake-utils_use_with spell ENCHANT)
+		$(cmake-utils_use_with ssl OpenSSL)
+	"
+	kde4-base_src_configure
+}
+
+src_compile() {
+	kde4-base_src_compile
+
+	# The building of apidox is not managed anymore by the build system
+	if use doc; then
+		einfo "Building API documentation"
+		cd "${S}"/doc/api/
+		./doxygen.sh "${S}" || die "APIDOX generation failed"
+	fi
+}
+
+src_install() {
+	kde4-base_src_install
+
+	if use doc; then
+		einfo "Installing API documentation. This could take a bit of time."
+		cd "${S}"/doc/api/
+		docinto /HTML/en/kdelibs-apidox
+		dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed"
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+	if use zeroconf; then
+		echo
+		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
+		elog "is running. Make sure also that multicast dns lookups are enabled by editing"
+		elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
+		elog "	hosts: files mdns dns"
+		echo
+	fi
+	elog "Your homedir is set to "'${HOME}'"/${HME}"
+	elog
+	local config_path="${ROOT}usr/share/config"
+	[[ ${PREFIX} != "${ROOT}usr" ]] && config_path+=" ${PREFIX}/share/config"
+	elog "If you experience weird application behavior (missing texts, etc.) run as root:"
+	elog "# chmod 755 -R ${config_path}"
+
+	kde4-base_pkg_postinst
+}
+
+pkg_prerm() {
+	# Remove ksycoca4 global database
+	rm -f "${PREFIX}"/share/kde4/services/ksycoca4
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+
+	kde4-base_pkg_postrm
+}