From c82a057bfc3b6a4d2becbf02a4038e8f57328cf0 Mon Sep 17 00:00:00 2001
From: Andreas Hüttel <dilfridge@gentoo.org>
Date: Tue, 7 Feb 2012 21:10:50 +0000
Subject: Add patch to fix build with Qt 4.8, bug 399291. Backport from
 Calligra.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64
---
 app-office/koffice-libs/ChangeLog                  | 11 ++-
 app-office/koffice-libs/Manifest                   | 21 +++--
 .../files/koffice-libs-2.3.3-qt48.patch            | 42 ++++++++++
 .../koffice-libs/koffice-libs-2.3.3-r2.ebuild      | 89 ++++++++++++++++++++++
 app-office/koffice-libs/koffice-libs-2.3.3.ebuild  | 81 --------------------
 5 files changed, 156 insertions(+), 88 deletions(-)
 create mode 100644 app-office/koffice-libs/files/koffice-libs-2.3.3-qt48.patch
 create mode 100644 app-office/koffice-libs/koffice-libs-2.3.3-r2.ebuild
 delete mode 100644 app-office/koffice-libs/koffice-libs-2.3.3.ebuild

(limited to 'app-office')

diff --git a/app-office/koffice-libs/ChangeLog b/app-office/koffice-libs/ChangeLog
index 72757a065925..d2051336665e 100644
--- a/app-office/koffice-libs/ChangeLog
+++ b/app-office/koffice-libs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/koffice-libs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.133 2011/10/01 03:21:29 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.134 2012/02/07 21:10:50 dilfridge Exp $
+
+*koffice-libs-2.3.3-r2 (07 Feb 2012)
+
+  07 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -koffice-libs-2.3.3.ebuild, +koffice-libs-2.3.3-r2.ebuild,
+  +files/koffice-libs-2.3.3-qt48.patch:
+  Add patch to fix build with Qt 4.8, bug 399291. Backport from Calligra.
 
   01 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   koffice-libs-2.3.3-r1.ebuild:
diff --git a/app-office/koffice-libs/Manifest b/app-office/koffice-libs/Manifest
index d0e1a458911a..bcbe56b4bc84 100644
--- a/app-office/koffice-libs/Manifest
+++ b/app-office/koffice-libs/Manifest
@@ -1,15 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX koffice-libs-2.3.3-qt48.patch 1883 RMD160 3c28b38a1cd4e2e5c0a5f3952e3c6f8e11d89c1b SHA1 f9cae07ed417cdd85446abe283a5701aa6d72ca3 SHA256 1ba47f647c8b77436c799c13eb8a679bd56a4542c437e89ef27f0a55c8763d82
 DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
 EBUILD koffice-libs-2.3.3-r1.ebuild 1821 RMD160 021daa9c510289aaa3cf610b6b1267651af2f3cc SHA1 4622dd61332b3f1fc255e0760d1363ec49c817c4 SHA256 aadee7809d73fbefbed04f0a7c2be8058681f4aa87fbaac49d1dbef4845f87d8
-EBUILD koffice-libs-2.3.3.ebuild 1659 RMD160 65078b97c208e9e719c2fe5c84b2fcc5f35b885f SHA1 bb895e860fd9ea009801ae28c94d87f6b84cacee SHA256 b1343a398f6e06fd7132d489667674ef47de8678cf94c724572bdae91caaa4ea
-MISC ChangeLog 17009 RMD160 1ecbff20d439e8386e474fdaa750832a0b42eb57 SHA1 e8163d2b75efaa0e42f205a146f1abb2f1cd7b9c SHA256 9b341b77c55d98dcdeac78489dec8cc299b7e26b1ef54687b0bb4f013d644ef3
+EBUILD koffice-libs-2.3.3-r2.ebuild 1865 RMD160 e9650e91b5204c9733a5d6dc0b2087c4d73e1320 SHA1 e11608f79197274fb7cc81b4d8efe14e3861d9db SHA256 bfe260e65e431e74956cddc8359db8ef4e5bfadd3dfb1f32da553b03363657c4
+MISC ChangeLog 17279 RMD160 c07683ca4fdd5751197968f93a998ce8d0e18693 SHA1 8652d4384604790b9a212d2de01868ef9e5f4446 SHA256 6f3a6705839e013ac16e11ae8af00681c8d7dc23db5f1288ce2d7233ddd01032
 MISC metadata.xml 332 RMD160 ed621574ea5d0e836743ead9166a398f42cc04b3 SHA1 8e2a635c2a12f40aa51fc4d3a3ce09ba2f0c82bd SHA256 d7025e5f6f2138b0782cc89bc63f4a6be3bdb6cf35d7487b39950efa2d8bfb2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk6Gh0AACgkQuUQtlDBCeQJG0QCfZlF5EBcO5zogo8cstqgZrovO
-FaIAn12rVx8Qgta8c83gheyB3tzM8k2W
-=WqzD
+iQIcBAEBCgAGBQJPMZOzAAoJENwGBM22xffeMSkQAJtdrasM/NkTDPOe7w83/KAy
+yPvrY0Vk9emgteNCfrImvL+MTZOXO6wro/6nWQatSw30W6dBsoK3C5MYcPl+1FoE
+CeEV7wgJrPJw3+6UPBcCdcpGDUIczXxcLZbVarf7KHcQSmba2NzJll4JMwy5kFFz
+T2rOFkLD57K0+2or6vGcEImn3ei2nfE6wBZqNdMAm+ZOqMSk1kTZHhRI3SABYp2E
+LN/jBvh2qtqekGqektuarqmm/hFn4CrJIHkvSQqEjtiPubi06U84mdPDAbbn9RMD
+hwH/KJKdMm1ciDtOCZAjzT9ToTuh6UrHeHmSmGwKY+nJ1Lt44N9MY0fCHYH+MMGd
+IJw2u/OVS4973LlIjAfa5juS///PKuMpTZ0oHWq/YIKsK5nlZsUu+5Qe68BZ+3rH
+7SwHivfJqdR4uwUfiI9EBz3sA0c0N1P+Wz0Yyt09r1wFkD+kkfboGK/wyLB8KrpB
+MVxSDeHhkcYjL+VvpUjAQ+vnhUDLRXhGL+WddQvjCAhbrRW/Yylh7RO4Kh2P/T0i
+GWG5I93lA7XtFGx/gQABgcDQbVUKzYf5RsEOLFQPgjmfjsMr9xYC2oFK4dQzO6Pj
+ET0CELzsdjP8IeZNxZYHX/SkjlCF41tG6sKC1vERkjvO/TY0PWS+eptMhp5zQNqb
+PwapTY6fYlmSn10IaSpl
+=OJ/I
 -----END PGP SIGNATURE-----
diff --git a/app-office/koffice-libs/files/koffice-libs-2.3.3-qt48.patch b/app-office/koffice-libs/files/koffice-libs-2.3.3-qt48.patch
new file mode 100644
index 000000000000..9cd8c68acd29
--- /dev/null
+++ b/app-office/koffice-libs/files/koffice-libs-2.3.3-qt48.patch
@@ -0,0 +1,42 @@
+From accabfeac22e869e5a248a764a64096d107e4c7c Mon Sep 17 00:00:00 2001
+From: Michael Jansen <kde@michael-jansen.biz>
+Date: Mon, 11 Jul 2011 00:27:38 +0200
+Subject: [PATCH] Fix build with QT 4.8.
+
+KDChartBackgroundAttributes.cpp:153:26: error: ambiguous overload for 'operator<<' in '((QDebug*)((QDebug*)operator<<(QDebug, const QBrush&)(((const QBrush&)((const QBrush*)(& KDChart::BackgroundAttributes::brush() const())))).QDebug::operator<<(((const char*)"pixmapmode=")))->QDebug::operator<<(((int)((const KDChart::BackgroundAttributes*)ba)->KDChart::BackgroundAttributes::pixmapMode())))->QDebug::operator<<(((const char*)"pixmap=")) << KDChart::BackgroundAttributes::pixmap() const()'
+
+It does not know if it should convert QPixmap to QVariant or QBrush before dumping it into
+qDebug(). It happens because with qt4.8 qvariant is included implictely with klocale.h over
+qlocale.h. Which was not the case before qt4.8.
+
+Related:     QTBUG-19764: Please add QDebug operator for QPixmap
+---
+ .../kdchart/src/KDChartBackgroundAttributes.cpp    |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp b/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp
+index 2dc4974..9f2990a 100644
+--- a/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp
++++ b/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp
+@@ -22,6 +22,9 @@
+ 
+ #include "KDChartBackgroundAttributes.h"
+ #include <QPixmap>
++#if !defined(QT_NO_DEBUG_STREAM)
++#include <QVariant>
++#endif
+ 
+ #include <KDABLibFakes>
+ 
+@@ -150,7 +153,7 @@ QDebug operator<<(QDebug dbg, const KDChart::BackgroundAttributes& ba)
+ 	<< "visible="<<ba.isVisible()
+ 	<< "brush="<<ba.brush()
+ 	<< "pixmapmode="<<ba.pixmapMode()
+-	<< "pixmap="<<ba.pixmap()
++	<< "pixmap="<<QVariant(ba.pixmap())
+ 	<< ")";
+     return dbg;
+ }
+-- 
+1.7.3.4
+
diff --git a/app-office/koffice-libs/koffice-libs-2.3.3-r2.ebuild b/app-office/koffice-libs/koffice-libs-2.3.3-r2.ebuild
new file mode 100644
index 000000000000..1c19ea361182
--- /dev/null
+++ b/app-office/koffice-libs/koffice-libs-2.3.3-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-2.3.3-r2.ebuild,v 1.1 2012/02/07 21:10:50 dilfridge Exp $
+
+EAPI=3
+
+KMNAME="koffice"
+KMMODULE="libs"
+OPENGL_REQUIRED="optional"
+CPPUNIT_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="Shared KOffice libraries"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt openexr reports"
+
+RDEPEND="
+	>=app-office/koffice-data-${PV}:${SLOT}
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/soprano
+	$(add_kdebase_dep kdepimlibs)
+	media-libs/lcms:0
+	crypt? ( app-crypt/qca:2 )
+	openexr? ( media-libs/openexr )
+	opengl? ( media-libs/mesa )
+	!app-office/kchart
+"
+DEPEND="${RDEPEND}"
+#	doc? ( app-doc/doxygen )"
+
+KMEXTRA="
+	doc/koffice/
+	doc/thesaurus/
+	filters/generic_wrapper/
+	filters/libkowmf/
+	filters/libmsooxml/
+	filters/xsltfilter/
+	filters/kchart/
+	filters/kformula/
+	interfaces/
+	kchart/
+	kformula/
+	kounavail/
+	plugins/
+	tools/
+"
+
+KMEXTRACTONLY="
+	KoConfig.h.cmake
+	doc/koffice.desktop
+	filters/
+"
+
+KMSAVELIBS="true"
+
+RESTRICT=test
+# bug 385025
+
+PATCHES=( "${FILESDIR}/${P}-qt48.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with openexr OpenEXR)
+		-DWITH_Spnav=OFF
+		-DBUILD_kchart=ON
+		-DBUILD_kformula=ON
+		$(cmake-utils_use_build reports koreport)
+	)
+	use crypt && \
+		mycmakeargs+=(-DQCA2_LIBRARIES=/usr/$(get_libdir)/qca2/libqca.so.2)
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	newdoc kounavail/README README.kounavail || die
+
+	kde4-meta_src_install
+
+	# this is already installed by koffice-data
+	rm -f "${D}/usr/include/config-opengl.h"
+	rm -f "${D}/usr/include/KoConfig.h"
+
+	# this is not useful and only leads to error messages, bug 381955
+	rm -f "${D}/usr/share/applications/kde4/koffice.desktop"
+}
diff --git a/app-office/koffice-libs/koffice-libs-2.3.3.ebuild b/app-office/koffice-libs/koffice-libs-2.3.3.ebuild
deleted file mode 100644
index 746cc06b0587..000000000000
--- a/app-office/koffice-libs/koffice-libs-2.3.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-2.3.3.ebuild,v 1.5 2011/06/07 03:06:16 abcd Exp $
-
-EAPI=3
-
-KMNAME="koffice"
-KMMODULE="libs"
-OPENGL_REQUIRED="optional"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="Shared KOffice libraries."
-KEYWORDS="amd64 x86"
-IUSE="crypt openexr reports"
-
-RDEPEND="
-	>=app-office/koffice-data-${PV}:${SLOT}
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/soprano
-	$(add_kdebase_dep kdepimlibs)
-	media-libs/lcms:0
-	crypt? ( app-crypt/qca:2 )
-	openexr? ( media-libs/openexr )
-	opengl? ( media-libs/mesa )
-	!app-office/kchart
-"
-DEPEND="${RDEPEND}"
-#	doc? ( app-doc/doxygen )"
-
-KMEXTRA="
-	doc/koffice/
-	doc/thesaurus/
-	filters/generic_wrapper/
-	filters/libkowmf/
-	filters/libmsooxml/
-	filters/xsltfilter/
-	filters/kchart/
-	filters/kformula/
-	interfaces/
-	kchart/
-	kformula/
-	kounavail/
-	plugins/
-	tools/
-"
-
-KMEXTRACTONLY="
-	KoConfig.h.cmake
-	doc/koffice.desktop
-	filters/
-"
-
-KMSAVELIBS="true"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		-DWITH_Spnav=OFF
-		-DBUILD_kchart=ON
-		-DBUILD_kformula=ON
-		$(cmake-utils_use_build reports koreport)
-	)
-	use crypt && \
-		mycmakeargs+=(-DQCA2_LIBRARIES=/usr/$(get_libdir)/qca2/libqca.so.2)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	newdoc kounavail/README README.kounavail || die
-
-	kde4-meta_src_install
-
-	# this is already installed by koffice-data
-	rm -f "${D}/usr/include/config-opengl.h"
-	rm -f "${D}/usr/include/KoConfig.h"
-}
-- 
cgit v1.2.3-65-gdbad