[kde-base/kdelibs-4.3.0] added patch that fixes live webkit-kpart compilation

more info: http://mail.kde.org/pipermail/webkit-devel/2009-August/000148.html

3 files changed, 354 insertions, 0 deletions

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 950f27521ed..b7e322f0747 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -2,9 +2,11 @@ AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c0
 AUX dist/02_gentoo_append_xdg_config_dirs.patch 802 RMD160 24680dd53728bbaa22f56d7571c60117b6536c27 SHA1 d9fd0ba35fbf0fb7e24fd8956588a1305615f2af SHA256 32f5d6e45691cc70ded71b1f8fbe5daaa0a4cbfd3fbcd7993865c44d6727f3bc
 AUX dist/20_use_dejavu_as_default_font.patch 1543 RMD160 805f4c6e685b8b6598acb1c69b5f6d41fa6ce010 SHA1 09eeafca53dd1c4b9347fd9d295949d37022e2f5 SHA256 9a6b141d5eb5fd73700086fef591074674563a2e5b374d3af4c6cea52726fc03
 AUX dist/23_solid_no_double_build.patch 838 RMD160 24bea0cd76edd2709edcdc654b74ebf1566e7ef7 SHA1 534aef07069b9b89ff3ff80619eb35f0fd588b61 SHA256 1ef6f6e7fe4b31b79126fd0cefaadab03f0e6a4bd9194fc8f4bee4750620c4ad
+AUX kdelibs-4.3.0-webkit-kpart-build-fix.patch 3182 RMD160 3ef1d00c417f2b6da4ff1aaec2e2bfa8f9b39007 SHA1 a2df605f38aeda18ec6675fdbc03e68e933377ed SHA256 ed137741351610d47ade841755dd9d628bd71f06d74766f157270f0b37ab4b6e
 DIST kdelibs-4.3.0.tar.bz2 10505396 RMD160 32ebf5f5786e2f350e7ed12dce257bb74df85ba8 SHA1 39d6577530a22e46a03ec64d1e5c075a163ca7d8 SHA256 cf5714baeaf12242cbe4d950121ddda03612fcd53f953c15df3e9ee32c10c859
 DIST kdelibs-4.3.65.tar.lzma 10590625 RMD160 9954d8a838f274a5346d53471656d3609614e296 SHA1 989d62d67c87464903d62645a33982c847df60b8 SHA256 4df0e683a2445be20944e6a8c5db82b703d9e6db830bb368eb3ff7936b934f10
 EBUILD kdelibs-4.3.0-r1.ebuild 6287 RMD160 b470c4610b5ec2a55dea1a2adea10a0f62b2058f SHA1 c28c601fef743fc67e95cbb2e73137e386265a7c SHA256 67e54c718ceba9f9828d2017091247a07b6ca9611a6eb079e0f70b07dc0abdac
+EBUILD kdelibs-4.3.0-r2.ebuild 6445 RMD160 484d10b5cf8275f6cc143643085fef63249023be SHA1 ce3c4e9b7496bd15ad51549fe749437afb207352 SHA256 989b787608a67588f85fd9f0a70a040c61bd0ec8f9b58ad3c9367e8141b30878
 EBUILD kdelibs-4.3.65-r1.ebuild 6287 RMD160 b470c4610b5ec2a55dea1a2adea10a0f62b2058f SHA1 c28c601fef743fc67e95cbb2e73137e386265a7c SHA256 67e54c718ceba9f9828d2017091247a07b6ca9611a6eb079e0f70b07dc0abdac
 EBUILD kdelibs-4.3.9999.ebuild 6245 RMD160 9f16096845fac83b7c4f26b0735d2f3dee0d16ab SHA1 5327a03e12dfc51ce34f6bf1418f829e48086798 SHA256 b08e563a3fd39fc1a1d0335db4a8cb474e251298b0766cf9537b1367c297aa24
 EBUILD kdelibs-9999.ebuild 6245 RMD160 9f16096845fac83b7c4f26b0735d2f3dee0d16ab SHA1 5327a03e12dfc51ce34f6bf1418f829e48086798 SHA256 b08e563a3fd39fc1a1d0335db4a8cb474e251298b0766cf9537b1367c297aa24
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.0-webkit-kpart-build-fix.patch b/kde-base/kdelibs/files/kdelibs-4.3.0-webkit-kpart-build-fix.patch
new file mode 100644
index 00000000000..507ba14a9d0
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.3.0-webkit-kpart-build-fix.patch
@@ -0,0 +1,118 @@
+Index: kdelibs/kio/kio/global.cpp
+===================================================================
+--- kdelibs/kio/kio/global.cpp	(revision 1005372)
++++ kdelibs/kio/kio/global.cpp	(working copy)
+@@ -1242,3 +1242,47 @@
+ {
+     return globalJobTracker;
+ }
++
++
++/***************************************************************
++ *
++ * KIO::MetaData
++ *
++ ***************************************************************/
++KIO::MetaData::MetaData(const QMap<QString,QVariant>& map)
++{
++  *this = map;
++}
++
++KIO::MetaData & KIO::MetaData::operator += ( const QMap<QString,QVariant> &metaData )
++{
++  QMap<QString,QVariant>::ConstIterator it;
++  
++  for(it = metaData.constBegin(); it !=  metaData.constEnd(); ++it)
++     insert(it.key(), it.value().toString());
++
++  return *this;
++}
++
++KIO::MetaData & KIO::MetaData::operator = ( const QMap<QString,QVariant> &metaData )
++{
++  clear();
++
++  QMap<QString,QVariant>::ConstIterator it;
++  for(it = metaData.constBegin(); it !=  metaData.constEnd(); ++it)
++     insert(it.key(), it.value().toString());
++
++  return *this;
++}
++
++QVariant KIO::MetaData::toVariant() const
++{
++ QMap<QString, QVariant> map;
++ QMap<QString,QString>::ConstIterator it;
++ QMap<QString,QString>::ConstIterator itEnd = constEnd();
++
++ for(it = constBegin(); it != itEnd; ++it)
++   map.insert(it.key(), it.value());
++
++ return QVariant(map);
++}
+Index: kdelibs/kio/kio/global.h
+===================================================================
+--- kdelibs/kio/kio/global.h	(revision 1005372)
++++ kdelibs/kio/kio/global.h	(working copy)
+@@ -25,6 +25,7 @@
+ #include <QtCore/QHash>
+ #include <QtCore/QMap>
+ #include <QtCore/QList>
++#include <QtCore/QVariant>
+ 
+ #include <kiconloader.h>
+ #include <QtGui/QPixmap> // for pixmapForUrl
+@@ -389,11 +390,17 @@
+      QMap<QString, QString>(metaData) { }
+ 
+    /**
++    * Creates a meta data map from a QVaraint map.
++    * @since 4.3
++    */
++    MetaData(const QMap<QString,QVariant> &);
++
++   /**
+     * Adds the given meta data map to this map.
+     * @param metaData the map to add
+     * @return this map
+     */
+-   MetaData & operator+= ( const QMap<QString,QString> &metaData )
++   MetaData & operator += ( const QMap<QString,QString> &metaData )
+    {
+       QMap<QString,QString>::ConstIterator it;
+       for(it = metaData.constBegin(); it !=  metaData.constEnd(); ++it)
+@@ -402,6 +409,34 @@
+       }
+       return *this;
+    }
++
++   /**
++    * Same as above except the value in the map is a QVariant.
++    *
++    * This convenience function allows you to easily assign the values
++    * of a QVariant to this meta data class.
++    *
++    * @param metaData the map to add
++    * @return this map
++    * @since 4.3
++    */
++   MetaData & operator += ( const QMap<QString,QVariant> &metaData );
++
++   /**
++    * Sets the given meta data map to this map.
++    * @param metaData the map to add
++    * @return this map
++    * @since 4.3
++    */
++   MetaData & operator = ( const QMap<QString,QVariant> &metaData );
++
++   /**
++    * Returns the contents of the map as a QVariant.
++    *
++    * @return a QVariant representation of the meta data map.
++    * @since 4.3
++    */
++   QVariant toVariant() const;
+ };
+ 
+ }
diff --git a/kde-base/kdelibs/kdelibs-4.3.0-r2.ebuild b/kde-base/kdelibs/kdelibs-4.3.0-r2.ebuild
new file mode 100644
index 00000000000..2d7cf9fce12
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.3.0-r2.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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
+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.30
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	bzip2? ( app-arch/bzip2 )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	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 )
+"
+# Blockers added for !kdeprefix? due to packages from old versions,
+# removed in the meanwhile
+# kde-base/libplasma
+# kde-base/knewsticker
+# kde-base/kpercentage
+# kde-base/ktnef
+RDEPEND="${COMMONDEPEND}
+	!<=kde-base/kdebase-3.5.9-r4
+	!<=kde-base/kdebase-startkde-3.5.10
+	!<kde-base/kdelibs-3.5.10
+	!x11-libs/qt-phonon
+	!kdeprefix? (
+		!kde-base/kitchensync:4.1
+		!kde-base/knewsticker:4.1
+		!kde-base/kpercentage:4.1
+		!kde-base/ktnef:4.1
+		!kde-base/libplasma
+		!kde-base/libkworkspace:4.2[kdeprefix=]
+		!<=kde-misc/kdnssd-avahi-0.1.2:0
+	)
+	kdeprefix? (
+		!<=kde-misc/kdnssd-avahi-0.1.2:0
+	)
+	>=app-crypt/gnupg-2.0.11
+	x11-apps/iceauth
+	x11-apps/rgb
+	>=x11-misc/xdg-utils-1.0.2-r3
+"
+PDEPEND="
+	>=kde-base/kde-env-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kdebase-data-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libknotificationitem-${PV}:${SLOT}[kdeprefix=]
+"
+
+# first patch fixes live webkit-kpart:
+# http://mail.kde.org/pipermail/webkit-devel/2009-August/000148.html
+
+PATCHES=(
+	"${FILESDIR}/${P}-webkit-kpart-build-fix.patch"
+	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch"
+	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs.patch"
+	"${FILESDIR}/dist/20_use_dejavu_as_default_font.patch"
+	"${FILESDIR}/dist/23_solid_no_double_build.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 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
+}