Fix kde namespace clash. Wrt bug#403755.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 59 insertions, 17 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 0e3785e829dc..2c057eca694a 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.252 2012/03/09 11:44:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.253 2012/03/09 13:50:34 scarabeus Exp $
+
+  09 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/libreoffice-3.5.1-kde-4.8.1-namespace.patch,
+  libreoffice-3.5.1.2.ebuild:
+  Fix kde namespace clash. Wrt bug#403755.
 
 *libreoffice-3.5.1.2 (09 Mar 2012)
 
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ca644f757813..95cb5d76d493 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -14,6 +14,7 @@ AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a6
 AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b
 AUX libreoffice-3.3.4-poppler-0.18.0.diff 1642 RMD160 33c292038b28cfda26eae116834a122db88552f8 SHA1 b88de36ee577e185c6c4660306781b91eb019c67 SHA256 506751d417953f5af907b07b1b1ffd95e9eb60f515e251ac614a0b5049fe016d
 AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7
+AUX libreoffice-3.5.1-kde-4.8.1-namespace.patch 1053 RMD160 e36f8df60d988a5b2f086f1829e391c5df1c85f9 SHA1 0192c9f014adf932f9c734a50de8dac7d397c376 SHA256 c55e411f59e97cee0edb551e017422fce83ceafa80ea2c8912d59698a0c088de
 AUX libreoffice-32b-qt4-libdir.patch 878 RMD160 5d1d90ca61106ac4962d7f70489910191f4347b6 SHA1 5be37237f9564613c893a7e486b2a1ebb24584c7 SHA256 9785fe9ae6c11f922b13941a5b60733a8bce70b08db71a9447e960191b210f0d
 AUX libreoffice-append-no-avx.patch 2418 RMD160 8c9a45ccb95425c13a2de5895761703022d99ac9 SHA1 f181c74bb600c9ecafc9d295148061cc0e0be701 SHA256 1720741dcfbd48345140029b405db68c25564245eaaa3b336113a59b005df611
 AUX libreoffice-as-needed-gtk.patch 403 RMD160 c1c5733d282eb3b59b7fe03d5258e9c917d9c6c4 SHA1 7516a3d554d96b7a27e5884ef124f9f5166a5939 SHA256 88609b6bac793423dee7af79110a05981669471170f9473a2bc591d35927117a
@@ -120,25 +121,25 @@ DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6a
 DIST libreoffice-writer-3.4.5.2.tar.bz2 7299202 RMD160 e0cc1509efa4f28350e82ce1de3b64322482c80b SHA1 277b886e63383cc37cead0deb6b1e02b40cfc9d0 SHA256 b0d34950f06de4fbf2b1ba40b1ddece0cb3d28bc23fca0edfd6daba54872fd4c
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18554 RMD160 de3dd897454246b9cd210fc20c705e907733aff1 SHA1 187d063af4835b6598f5700a3f45d68bd47f8099 SHA256 dce97af4aa28d1142746509fd26df671fe38dd294decad20633e6691d83bf1fa
 EBUILD libreoffice-3.4.5.2.ebuild 15179 RMD160 10ba5494bdf149eab87c0cec140838044842e45e SHA1 4d74eca4ebf10bff87396ff59c3b342b7053d848 SHA256 c94720c170a1903c0a6a4d6e6300ea31fff2032f306e36147817f3d1d601ee8a
-EBUILD libreoffice-3.5.1.2.ebuild 14425 RMD160 c511ba7162c6fd4d47fee26aad28283b57e70683 SHA1 6e89c86c3c8a9c7e6d175a5c3a6e9d8466a223fe SHA256 8f28153c9649299e99d385501909282a8f7f3d580ea945c918f6d23e4aecf55a
+EBUILD libreoffice-3.5.1.2.ebuild 14484 RMD160 5965cd1309f2e9461bf9daba9e01d6775727f4a8 SHA1 2b45eaf671cecfe164f7925104f074530b71caf3 SHA256 2d96d68acd559a67912d054269913e5a7462f03fbbe34fabe4eff752d0d37382
 EBUILD libreoffice-3.5.9999.ebuild 14427 RMD160 3b41410aa89a6206621159cfd8c652e4ac451b88 SHA1 9b050f15f47f619f449aa934d65e2d95bf243c29 SHA256 a6d45c95f1fd9230511c2c7b384f6e28d562f646663bb8a2e69201a6bb68378c
 EBUILD libreoffice-9999-r2.ebuild 14396 RMD160 9c789541e78f27b252fd5ff9d6a0fbe221804aeb SHA1 0f028c08302ac2cb6f08ae1dbc019c683c3dc6a8 SHA256 7a5c9c444a3206652c99ac298f61d208728667b43acf11b6b810fab43c511f94
-MISC ChangeLog 45617 RMD160 2c85fcb4d277c338464e580a6ea4c8797d22be05 SHA1 1b408448fc008685efc63982c72af8b15ef79a21 SHA256 af444a9a6a7ead868afd255b0705beecae5777b6cc28b439b85f0ab0ea91370c
+MISC ChangeLog 45800 RMD160 6c305cde221ee9161e43d654919cba8072d3d5ff SHA1 87a83e4c1d6c4d94a7f837ac63f1a7990b3a0ca2 SHA256 3b253386d044ad1ca6066b7a3f5ae95dbe25d27f3ead2028febfd1f39ab2f2ba
 MISC metadata.xml 1409 RMD160 9861b490a44757ecaebb14ac28eec292f347ac3f SHA1 268b78192669f12c513fd7b68fe588f140ea2e1b SHA256 862a214105b2f7b07a015d656794aac9b94a3f40b3f8cbf74a5299f990b82b2e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPWe3fAAoJEOSiRoyO7jvo9oMQAII7OcrtPVhb/zacmaxwrfBI
-3Y1XL6JU5RBCai4zKX8ZssTo6gBMsMaCFC1M4TFhuj7Wk/ZPPnIJ4i91hcmjjlyS
-nQLsXCj0B1k5pWS+k9k/Hl7w4Aw72awn80mxhytke6UvFIl0tirscnJMdyJDhKZI
-8vIm3B2SfIcfvYJVo8S8s5H6W65OJCPXJnMTpYUwcTJ1ZErmhnDAq/zQOIWfQ7qT
-stNTz1vuTWxNEKg9GOHfUwbd5YCDNtqHiO73TkPVFXir0hI/f2IJlWHpTslo2UVK
-HPGZ1/J9XtFoYAzJIdvVqkJG8ysHL8vADU2ItiM7eJNPleKXloC5rvKXy13MbWb+
-lknHSDnldAiVPDHzhYQTZ/6utQeI0zz7xVGLOwimBaMSZ4bUET2IUJL1cnUpB87D
-lchmcwQH8CHm//h5HXmu6EWmSW9y8MuwedHGdY030VXDFvcDKVEijLC1pAHbmfoS
-pKoYtlMwTcP1FI341PfK6XPcwmAg6/87AfI1Kr9kNqS6jBUhW/Dtcf5cyWIf03SQ
-Bw5ARcAk5wAmhzZxRuRVY0sEHFyVW0IF4Pxy8T8w2zDTj+CAqFgl594rKAbNE7x5
-SJ6lnuLrEwS9eFTc6qiGjwGRnbYiALaGCxQvTqkfB3dR4ZEmGENB3hJ7tjSFrsYO
-KTHduKuAlpzsQhk48Fjw
-=oQeQ
+iQIcBAEBAgAGBQJPWgq+AAoJEOSiRoyO7jvoR3MP/239GkDu3bDr53UBzPRu4Vm4
+eyLr7CZ1yr+r+eC0t016AbWWZuYIA9ewJr2UOuVeZ5Y84Z9FvuLIrmsmOXq4tUPz
+J5x0YcTGkeExixdor2NQv6CH2qS4t5ZypFGMDfm7GfH3/5t4tYeZf+f7QHf0iUdn
+P+vfwSD4GzbhjSTYvYBa2VwqSm0xv/0ptki6/z6qc50WnciVNS/UicTiNooA+zK8
+a+uXj4wnbN37I8tC4SpHjCw7ptAf1hm+IUMYrt03ttMxfW2EmTw7Tgw1/Kq5FbGM
+6i+EYXn12pMV8P2Fm+cawkWeTc9hALSk2IY5aSw1kffR++GUSMUelNCMrmWR++rh
+wqBDytDYwwy4yGg9dSVv3c1+ui5Mt6rlBOmRpYdpbkVaRYAJ6fXDNedMRQNReE88
+tiwqxTCF8nDka3iTDL3bX+x3ezuHKJL5m0ns2q5y9/xAghNpa0R8bF8fljBn/4ZO
+85cL9yBia6UDinklR7CbHF2hUqXzxItBzG653m+c8it2srMN5Wd1jT5mgPyKL6bp
+SrouZDWwsAz1cxcN1e8uRfONV7ExJZQFKTYtfHzFzLncrBJXcjK/fnYXN1vjx6n3
+NuulFbfX5QoNtnCETma8GFXvrd2HMugpRdVRbNnxFYycu+sKNEzReQSnPSImf0qC
+UFoKzAjFm36ub/DUuZg/
+=GIaU
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-3.5.1-kde-4.8.1-namespace.patch b/app-office/libreoffice/files/libreoffice-3.5.1-kde-4.8.1-namespace.patch
new file mode 100644
index 000000000000..0b3d69c82bc0
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.5.1-kde-4.8.1-namespace.patch
@@ -0,0 +1,35 @@
+From 14dfa9de27ddab9bb0bbe64e6c0a4b5e4caab742 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Thu, 8 Mar 2012 14:15:09 +0100
+Subject: [PATCH] yet another clash with macro name
+
+Signed-off-by: Tomas Chvatal <tchvatal@suse.cz>
+---
+ fpicker/source/unx/kde4/KDE4FilePicker.cxx |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+index 69be3b1..9c3ded3 100644
+--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
++++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+@@ -60,6 +60,8 @@
+ #undef SETTINGS_MOUSE
+ #define LO_SETTINGS_LOCALE SETTINGS_LOCALE
+ #undef SETTINGS_LOCALE
++#define LO_SETTINGS_STYLE SETTINGS_STYLE
++#undef SETTINGS_STYLE
+ 
+ #include <kfiledialog.h>
+ #include <kwindowsystem.h>
+@@ -77,6 +79,8 @@
+ #undef LO_SETTINGS_MOUSE
+ #define SETTINGS_LOCALE LO_SETTINGS_LOCALE
+ #undef LO_SETTINGS_LOCALE
++#define SETTINGS_STYLE LO_SETTINGS_STYLE
++#undef LO_SETTINGS_STYLE
+ 
+ using namespace ::com::sun::star;
+ 
+-- 
+1.7.3.4
+
diff --git a/app-office/libreoffice/libreoffice-3.5.1.2.ebuild b/app-office/libreoffice/libreoffice-3.5.1.2.ebuild
index d33d9e9640a8..ddba2ff97b44 100644
--- a/app-office/libreoffice/libreoffice-3.5.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.1.2.ebuild,v 1.1 2012/03/09 11:44:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.1.2.ebuild,v 1.2 2012/03/09 13:50:34 scarabeus Exp $
 
 EAPI=4
 
@@ -192,6 +192,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# this can't be upstreamed :(
 	"${FILESDIR}/${PN}-system-pyuno.patch"
+	"${FILESDIR}/libreoffice-3.5.1-kde-4.8.1-namespace.patch"
 )
 
 REQUIRED_USE="