Added upstream patch to kill the multitudes of QPainter::...: Painter not active error messages. Should fix bug 341289, please test.

Package-Manager: portage-2.1.9.26/cvs/Linux i686

4 files changed, 343 insertions, 2 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 15bca331c969..ff75db4f655c 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.710 2010/12/14 21:59:46 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.711 2010/12/30 17:35:23 dilfridge Exp $
+
+*kdelibs-4.4.5-r2 (30 Dec 2010)
+
+  30 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdelibs-4.4.5-r2.ebuild, +files/kdelibs-4.4.5-formpainter.patch:
+  Added upstream patch to kill the multitudes of QPainter::...: Painter not
+  active error messages. Should fix bug 341289, please test.
 
 *kdelibs-4.4.5-r1 (14 Dec 2010)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 9abf281e0443..a6881eb979a7 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -10,6 +10,7 @@ AUX kdelibs-4.3.3-klauncher_mac.patch 1126 RMD160 073d2ce7fc431257dec40617f7269f
 AUX kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch 2210 RMD160 c7f53343cb8713bb2c7d195563d5fe399adb9939 SHA1 03e60a01c7665e9074ddc412c90f157a044ce9ba SHA256 3602e079a4788feceff27f7f6bcaeff33828c259a81d0357f7df092000f98a6a
 AUX kdelibs-4.3.80-module-suffix.patch 3919 RMD160 ed225d685594d53df9792b1472925a371bbc41da SHA1 efa963a74c60dcc23c3f925a479cf753b6247ccf SHA256 06fedf486f3a459cb3366fe1865583863924b48f78f0d5f6b327a42438c83976
 AUX kdelibs-4.4.3-mimetypes.patch 1887 RMD160 f1f371f6b405ce93b12a7ebc2631142fa1fa20a9 SHA1 64005d1d00ffb1e58572327a8aece9761e8008ab SHA256 4c724b2c3a569661b3b6035b8011293543d6c3cc6d59fe74310d9d1716e0881d
+AUX kdelibs-4.4.5-formpainter.patch 727 RMD160 1c6613f5e5f6ede529b5988252c93fa7e22223c3 SHA1 9db99158c61afe6569c54e32833e22d7e047c625 SHA256 b2e48ad5256c749fc9de455696bbcdc0f67e9cbd0d6d57676c98840bba6e5c33
 AUX kdelibs-4.4.5-qt471.patch 362 RMD160 54ea903b795f65ea21719c9e8bb30af342a783ab SHA1 14a189d9e95ea5c9feebb81c81544ba322a98116 SHA256 6ae79f4880dbf7aa86888d1eefb3e2868ef5eaa2a367696ad44d1566dcf70d41
 AUX kdelibs-4.4.66-macos-unbundle.patch 4618 RMD160 a968d41e3b8c3f05e3b64a7487b0da0ae34fa8cc SHA1 36412cbe6b50b8b3ac5ae598910ac51dd37a48b7 SHA256 3a3b753af670cfadfb67a591c6cca5ed62ceffb97dcb326b9f2e684db1ba596d
 AUX kdelibs-4.4.90-xslt.patch 553 RMD160 b667c3330a2721ab0de237f50af81ec830954c0f SHA1 24faa51f5d3645858ca55c744b9b76952eb383c6 SHA256 ffb7b7f44d3e840d1fe5e3b1d859db74f6bf534d44160f48e0f91993200ab55b
@@ -18,8 +19,9 @@ DIST kdelibs-4.4.5.tar.bz2 14088335 RMD160 533a627116524d5365ba45f5eb17c972426f5
 DIST kdelibs-4.5.3.tar.bz2 13871121 RMD160 08779952d7338c5c1f7928b866dbeffa873cbee0 SHA1 f76e54dd033bff548557c277811501b56d1c6bf0 SHA256 6d6354e6694e716354207338da50752dad2c56658fffb03b839bc008cbb4d9ac
 DIST kdelibs-4.5.4.tar.bz2 13870865 RMD160 b2f0c37872d4024203d8cdebe12ab7070d5e4821 SHA1 6378c8d1a2b71e19713fbc7830518359868be4bd SHA256 f03601750c7c1f675c9fea52e488f9a1cf11f051dac88acca6ab0dde6e5e9e30
 EBUILD kdelibs-4.4.5-r1.ebuild 9351 RMD160 063b3771d83c6c77fc617326fa9cfe0d97ee09c5 SHA1 9ac2282429b01104ca9166f06fb72413f8d9484c SHA256 9d884916dffa1ef47ee4147a2b1b6096f8b039090e795dbc5a68682575d01792
+EBUILD kdelibs-4.4.5-r2.ebuild 9396 RMD160 921d67f590ef5c1bdf027061250864fee6413e12 SHA1 76b6d1e09cb91d2ddd5aca22d5a40faec9f4419f SHA256 7af782c93c9d280ae78d50c76304a8ace6d6cb59c81dac755e465a669008620f
 EBUILD kdelibs-4.4.5.ebuild 9306 RMD160 a28e36dc41ca15c7246fc23654198ef50bfed98d SHA1 646d831c40529d7dab0ec914bc6a54dd2921dc7f SHA256 870d7fd624e4aa75874e11de6f38e552f392191a7f5077c30aebf9a05d3f51b4
 EBUILD kdelibs-4.5.3.ebuild 9356 RMD160 fa7ef8d00b2b6e4839bce9b76601c29733d956a4 SHA1 82b3b9140bc06812936a96c9b4c07daa340f87d1 SHA256 6396e86f9463a7438b4849315c48e747fd11820a3e0bdc4ad18c35030421f07e
 EBUILD kdelibs-4.5.4.ebuild 9353 RMD160 ef10e3974300e5c964732b14e9dd02da2852bf01 SHA1 d328a36f49592944463178603efd91833d0b9bc6 SHA256 e9dc652078ab0c5ae10c71eae6092dc50c41c1aa9c7f6d1406096fe0ce12c9e3
-MISC ChangeLog 118177 RMD160 7e2946746ab39cf90b72de4167b28323090402c1 SHA1 ea4364a831a356a0b6067dd3e39eaa5247e570cb SHA256 6324a32b3a684ecc5f2d08f57a88f6f621759439b342a5bd14951ae1e764c9e3
+MISC ChangeLog 118473 RMD160 02fad50d4ee7faf5ed3cf007331a883af24953e9 SHA1 cb198586c82133a2365f174269776360bee92c39 SHA256 871d38a3953b6b52b230ae30faddfd57a45b38d91976cc883ccf4c475fa4b67d
 MISC metadata.xml 250 RMD160 1cf3a68b9ec97616d8ad515fba750a045cd261e5 SHA1 e13cc9329dd1557d621d84e042a3cfac56490548 SHA256 01ebccaddc9d829aec527fdcfd6d81dc72b5034d0eb59881838ecc10131c12a7
diff --git a/kde-base/kdelibs/files/kdelibs-4.4.5-formpainter.patch b/kde-base/kdelibs/files/kdelibs-4.4.5-formpainter.patch
new file mode 100644
index 000000000000..8fd94b269913
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.4.5-formpainter.patch
@@ -0,0 +1,22 @@
+Index: kdelibs/khtml/khtmlview.cpp
+===================================================================
+--- kdelibs/khtml/khtmlview.cpp	(Revision 1185321)
++++ kdelibs/khtml/khtmlview.cpp	(Revision 1185322)
+@@ -2135,17 +2135,6 @@
+       case QEvent::DragLeave:
+       case QEvent::Drop:
+         return false;
+-      case QEvent::Paint: {
+-          QRect r = static_cast<QPaintEvent*>(e)->rect();
+-          r = r.intersect( widget()->rect() );
+-          if (r.isValid() && !r.isEmpty()) {
+-              r.setX(r.x() +contentsX());
+-              r.setY(r.y() +contentsY());
+-              QPaintEvent pe(r);
+-              paintEvent(&pe);
+-          }
+-          return true;
+-      }
+       default:
+         break;
+     }
diff --git a/kde-base/kdelibs/kdelibs-4.4.5-r2.ebuild b/kde-base/kdelibs/kdelibs-4.4.5-r2.ebuild
new file mode 100644
index 000000000000..1c70c5aa8604
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.4.5-r2.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $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 $
+
+EAPI="3"
+
+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="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos
+lzma mmx nls openexr policykit semantic-desktop spell sse sse2 ssl zeroconf"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+	app-crypt/qca:2
+	>=app-misc/strigi-0.6.3
+	~dev-libs/libattica-0.1.2
+	dev-libs/libpcre[unicode]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/giflib
+	>=media-libs/libpng-1.4
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-misc/shared-mime-info-0.60
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	aqua? ( >=media-sound/phonon-4.3.80 )
+	!aqua? (
+		>=media-sound/phonon-4.3.80[xcb]
+		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
+		!kernel_SunOS? ( sys-libs/libutempter )
+	)
+	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
+	)
+	policykit? ( sys-auth/polkit-qt )
+	semantic-desktop? (
+		>=dev-libs/shared-desktop-ontologies-0.2
+		>=dev-libs/soprano-2.3.73[dbus,raptor,redland]
+	)
+	spell? ( 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}
+	!dev-libs/conversion
+	!dev-libs/kunitconversion
+	!x11-libs/qt-phonon
+	!<=kde-misc/kdnssd-avahi-0.1.2:0
+	>=app-crypt/gnupg-2.0.11
+	app-misc/ca-certificates
+	$(add_kdebase_dep kde-env)
+	!aqua? (
+		x11-apps/iceauth
+		x11-apps/rgb
+		>=x11-misc/xdg-utils-1.0.2-r3
+	)
+"
+PDEPEND="
+	handbook? ( $(add_kdebase_dep khelpcenter) )
+	policykit? ( >=sys-auth/polkit-kde-0.95.1 )
+	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
+"
+
+# Blockers added due to packages from old versions, removed in the meanwhile
+# as well as for file collisions
+add_blocker libknotificationitem
+add_blocker libkworkspace '<4.3.66'
+# @since 4.4 - kpilot is gone (blocker added to help upgrades)
+add_blocker kpilot
+# 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:3.5'
+# libnepomukquery moved to kdelibs from plasma-workspace between 4.3.74 -> 4.3.75
+add_blocker plasma-workspace '<4.3.75'
+
+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}/${PN}-4.3.80-module-suffix.patch"
+	"${FILESDIR}/${PN}-4.4.66-macos-unbundle.patch"
+	"${FILESDIR}/${PN}-4.3.3-klauncher_kdeinit.patch"
+	"${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch"
+	"${FILESDIR}/${PN}-4.3.3-klauncher_mac.patch"
+	"${FILESDIR}/${PN}-4.4.3-mimetypes.patch"
+	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
+	"${FILESDIR}/${PN}-4.4.5-qt471.patch"
+	"${FILESDIR}/${PN}-4.4.5-formpainter.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}|g" \
+		-i kded/vfolder_menu.cpp || die "Sed on vfolder_menu.cpp failed."
+
+	if use aqua; then
+		sed -i -e \
+			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
+			cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
+
+		#if [[ ${CHOST} == *-darwin8 ]]; then
+		sed -i -e \
+			"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
+			cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
+		#fi
+
+		# solid/solid/backends/iokit doesn't properly link, so disable it.
+		sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
+			|| die "disabling solid/solid/backends/iokit failed"
+		sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
+			|| die "disabling solid/solid/backends/iokit failed"
+
+		# There's no fdatasync on OSX and the check fails to detect that.
+		sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
+			|| die "disabling fdatasync failed"
+
+		# Fix nameser include to nameser8_compat
+		sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
+			|| die "fixing nameser include failed"
+		append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
+
+		# Try to fix kkeyserver_mac
+		epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch"
+		# getgrouplist not in solaris libc
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch"
+		# solaris has no d_type element in dir_ent
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch"
+	fi
+}
+
+src_configure() {
+	if use zeroconf; then
+		if has_version net-dns/avahi; then
+			mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF)
+		elif has_version net-misc/mDNSResponder; then
+			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=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
+	fi
+	if use kdeprefix; then
+		HME=".kde${SLOT}"
+	else
+		HME=".kde4"
+	fi
+	mycmakeargs+=(
+		-DWITH_HSPELL=OFF
+		-DWITH_ASPELL=OFF
+		-DKDE_DEFAULT_HOME=${HME}
+		-DKAUTH_BACKEND=POLKITQT-1
+		$(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 policykit PolkitQt-1)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
+		$(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
+
+	# use system certificates
+	rm -f "${ED}/${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die
+	dosym /etc/ssl/certs/ca-certificates.crt \
+	"${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die
+
+	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
+
+	if use aqua; then
+		einfo "fixing ${PN} plugins"
+
+		local _PV=${PV:0:3}.0
+		local _dir=${EKDEDIR}/$(get_libdir)/kde4/plugins/script
+
+		install_name_tool -id \
+			"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
+
+		einfo "fixing ${PN} cmake detection files"
+		#sed -i -e \
+		#	"s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
+		echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
+			"${ED}"/${KDEDIR}/share/apps/cmake/modules/FindXKB.cmake \
+			|| die "failed fixing FindXKB.cmake"
+	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."
+		echo
+		einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
+		einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
+		einfo "to include 'mdns', e.g.:"
+		einfo "	hosts: files mdns dns"
+		echo
+	fi
+
+	elog "Your homedir is set to \${HOME}/${HME}"
+	echo
+
+	if ! has_version sys-apps/hal; then
+		echo
+		ewarn "You need sys-apps/hal for new device notifications, power management and any"
+		ewarn "other hardware related functionalities to work."
+		echo
+	fi
+
+	kde4-base_pkg_postinst
+}
+
+pkg_prerm() {
+	# Remove ksycoca4 global database
+	rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+
+	kde4-base_pkg_postrm
+}