Fix build with kde-4.8, bug 397775

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index e9cb6b87d949b0f2ae4e9b724bcb8220368cbe8b..2b35b1a5324f5f71391f9fb8928f0cccd08c7e66 100644 (file)
--- 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.223 2012/01/03 21:04:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.224 2012/01/08 14:25:01 dilfridge Exp $
+
+  08 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/libreoffice-kde48.patch, libreoffice-3.4.5.2.ebuild,
+  libreoffice-3.4.99.2.ebuild:
+  Fix build with kde-4.8, bug 397775
 
 *libreoffice-3.4.5.2 (03 Jan 2012)
 

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 284f4368c057a00ed22eeae4fea8c57be847faf0..ae135ea6311f04e03c9d2de2974243dd51262b10 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a
 AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
@@ -22,6 +22,7 @@ AUX libreoffice-gbuild-use-cxxflags.patch 353 RMD160 97f0c4cffe624ca8df71471cae6
 AUX libreoffice-honor-strip.patch 1110 RMD160 777e9da0265b9cb17ca124d55d55b26ff1c54b1e SHA1 8d0a10e3b0f6c12f996ec7191ca2a33e0d8be053 SHA256 9e85bb3a30a5ba3e1ee7441cd3965dc603ba33f02eb52857764498a5db08791d
 AUX libreoffice-installed-files-permissions.patch 374 RMD160 83d650b6b0e84a02e2ad0667b20d4dba72cf4ee2 SHA1 87345e895473a8bb209b0ad542670c5eb7717ab0 SHA256 a664796c27c69fe5119af5d82313dc65371eb873c1d15691d97745d9a1ee3e81
 AUX libreoffice-java.patch 1879 RMD160 2a1a3ab82a9eb526d09beed577b98be24f485e33 SHA1 08f7d6c300e494ba9f056b941752419872d6d2cc SHA256 beab05671a22a685acf0a60bff8ed65deaa2b2ba79c79b6fcff59d87e2a7ecd4
+AUX libreoffice-kde48.patch 1030 RMD160 72c93129b44fcc103b6eaa580172361a6d40b164 SHA1 be6c4b3fb3ab499dd1d7335111f92f194b1a54b2 SHA256 58bb74d886d1a70b22094883cf1f35baf0f24b6c5cdcfb9b1823925237ad6a5d
 AUX libreoffice-kill-cppunit.patch 555 RMD160 97655715899b1518b3c7935e6db504196f561d00 SHA1 05d28cbc51ca13b8f77c95e78a1810318a423afc SHA256 5d792f868f0dec1ee3147a1054e127ecbf07aa33a69132a5f60e3b692896543e
 AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
 AUX libreoffice-poppler-0.18.0-2.patch 1160 RMD160 366ef7a3afd4be4fc4239cf1afa4307725f6d9c9 SHA1 6dcbda54bc11c6d1db3f42a31702fedd0ff4d9bb SHA256 0b6ac87bb34bb1e4b43d8980d19f2d05b3bbd5eae8a378269385042c0b22a3d5
@@ -175,26 +176,26 @@ DIST libreoffice-writer-3.4.5.2.tar.bz2 7299202 RMD160 e0cc1509efa4f28350e82ce1d
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.4.ebuild 18266 RMD160 c0204063e1a6bd7621267fd4dc92d8b73340d2c9 SHA1 4ba8289141748a37763049aad453ce8cde277e1b SHA256 7da90f1704e492c9ea60982283868860d96ab7550e7cb6a5806858d68fa15b98
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18514 RMD160 66fdf0ebbb2bbe6c507f97b0d2be87b8c72aa79c SHA1 814410fddd8101148b58924f2f20b899b1925c6a SHA256 89fef1d27d99fe7996dd4675120d5fb180a3bd6798abf51eb8da4d25f83013b9
-EBUILD libreoffice-3.4.5.2.ebuild 14987 RMD160 e03dfecab7d6adafb4c9efbafba21ad6eaa51f07 SHA1 a4508bae1720e56b20b1bdcc9bffc223c1a8108b SHA256 dd3759a9b8374e446e5ac1fd3f2e91d081fbc8bd72ee470da85512a1f7498523
-EBUILD libreoffice-3.4.99.2.ebuild 13999 RMD160 84a6c91e16349e4ba547ef29e2e4f6dcbfba3bbd SHA1 321aa53852f1c3eb223b5496373537b90909d216 SHA256 85d4ad9ab4c8031fe15c3f061aac7b8f5d9c7e731d1751268e5f9ebcc802d8fe
+EBUILD libreoffice-3.4.5.2.ebuild 15020 RMD160 f3f35ff7d0efa6f84258d64b0f9d6eb3196bd312 SHA1 1a73e08c981e08c9b10f9c5d84dc323a48c3ae34 SHA256 8077eca87a3edc1c16cb92c95b1c0fe3c2714a62e48c862d27784c9d5768ee9e
+EBUILD libreoffice-3.4.99.2.ebuild 14038 RMD160 804adf775f0c9944c2f3502c1bae1eea7bed11c4 SHA1 4a1fc961e7f35cceee88b35e1c10eabbc06a108b SHA256 8faaeffa0d9d5108a86c197b7476e7f37db6db735db6302d187bf9ff0bc0ef20
 EBUILD libreoffice-3.5.9999.ebuild 13999 RMD160 a97b9c96b1c0c0f076e945fb12b4f955ec539915 SHA1 c19643e5d0aaa5a9a0cb8feb47038a9202f5917b SHA256 3e428eb8d24f8d690239fb94472dfde6e1c6c63163a8e2a4f4c143ff6dd68e67
 EBUILD libreoffice-9999-r2.ebuild 14069 RMD160 46428f00afc92a57e77c3128753c4f8027ac0a98 SHA1 ad89353db2bf4de7553f0482b851051604b05923 SHA256 6fe85994f8c3a6d434a68163e418b50a335c0747b5c889acf6c992a46364ea48
-MISC ChangeLog 40735 RMD160 4f79bb2ba0899df520860c9f22d0ba8a46b17191 SHA1 b3c379b9d1b94905d908a775e5321c24f7779272 SHA256 c82024008ab7ca358a26e26b5bc3aab47503b3d6766c3189399571c8c077da00
+MISC ChangeLog 40923 RMD160 f8438c313b4f5b16275145c87f526d544e0ae2b9 SHA1 0734de5688fde2553d322a635d52637b10b6f93f SHA256 f71da5071a76a02c11e7f2b41e6773a49ce525c4fcebc049c87616a0716a912f
 MISC metadata.xml 1409 RMD160 9861b490a44757ecaebb14ac28eec292f347ac3f SHA1 268b78192669f12c513fd7b68fe588f140ea2e1b SHA256 862a214105b2f7b07a015d656794aac9b94a3f40b3f8cbf74a5299f990b82b2e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPA21nAAoJEOSiRoyO7jvomd8QAJQSZYLApZRIXEYohSXeDDFJ
-IZCBIzUmQVGxf6Nw/gqJAj2uAQdPMXFTwMa4HgxTKiMErbAGwEb1iyPEswDJ4PbW
-8h0+zJxX8uvt+7UoEcMu4M4NEI+pYNRgkLBZRoocus/F+XkUZtCELce9FqnoP6ip
-wc6F9++gWfl7AqJnQqawA44qx96IGBnSaKG22x7QtpZk3glAtYyQWccfEWbj8AAZ
-ja9GQluQvfeUiXvzhQk5btRlY8fcglczQpr8OYWr5vMpzjtpeGs7Gp1YeihLSSnY
-Vdc50CqzvPR780y/QEvjwxM653dj77WLQyO2OJ7NmVgWs9QslF+O1OuyQmqPGaAd
-LgshUXfuImIFJDbSUuEkGI/KN73wxs2Uc6EJqeUOBj500xo2E6qG+38bpgGYJpg7
-wEoZal7OQpV5+p5yyFNTqKShY8IGWdkk4nvaoFnGuwHFzD0tLnhnjbsm3qPqK8b9
-FELgoSAUFivEbLZ/526f6+XBO43wqA+rCe2KoY8W/q6ERo3Qh53JaQlNHHl83fYa
-rtBLJFs+3hmK3XXZZwMRz+BaawlsojsJB4e2mtyQq8Sh6APmGViV3jGi8dTh4TAc
-20k75HZX9xIm4EGM6ulJhmuJQOmGswiOLe+yn722PQlAQr8us2ddP0cWNFWkqvlh
-cJNqDn1rMlXgty1W5rWU
-=SPGC
+iQIcBAEBCgAGBQJPCaeQAAoJENwGBM22xffeURIP/2PttxFCzZPfyCC5rVS1zXCj
++jiv3FXh+D6F5oVlGc/8mPPIQ6PyhvauidhMvBTvdhYNeUh3wdWYVCQ/m1w2SOBv
+2SIokeEpyQDbLdA7a4OeTl+uYtNFNXkQQBWqjy6S++OHjSE/typpxYoG/hJ/uDVu
+00UhPOhAaaLW/eKRIfkPjVzxe6KC+XT2PQU8kGrVoUXewCPCtTD0VU2TaY9VLGTs
+SUEqYNUB3z58zhM6fRXIsx2ISHc8/YlgaNkFSg1FUEdBgtnxraN8zt2zQ3YUr8FN
+HZXJFoObWdvbsgmuVvT6GfzVg33x7oNrn/0H8i6GXVudjxDXPJ9INxJQ/RgwSdCZ
+pSvtFA+fx3jQihVK6C1VgyxQkAdSkWFUdGDZk+NSiZCWhYqVstoTcMGKr440V8d9
+wiyo5zN0zzw+0ZV2Ja4YumoEXPGqjzHUQK/7Os1PQFgpHBQ50Q6y5Q1+QQ1A37pI
+1MvNxhNcuns2TUfVuj0tQB5CzFDmiKU1ylqBN1iioRLfUFTTcpR9hdxu4QAnIRqs
+R4LLqYze3fmYM1bTFe3vQmad7XTn+FubrLbxU9vNaBprtkHnPS7WskFZhii8WUGP
+/b5gOlvt9asZCznVlOpuPLfv/fdNaCOvt/GGJy4ZxRGkftDg2vEcLIj+d8RErDjy
+eIPLzS3nGCCmuV29INKz
+=8jH8
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/files/libreoffice-kde48.patch b/app-office/libreoffice/files/libreoffice-kde48.patch
new file mode 100644 (file)
index 0000000..a92df79
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-kde48.patch
@@ -0,0 +1,35 @@
+From 0d7e2108425da1f81c20a605145679168486df59 Mon Sep 17 00:00:00 2001
+From: Luboš Luňák <l.lunak@suse.cz>
+Date: Fri, 06 Jan 2012 09:55:03 +0000
+Subject: workaround for LO namespace pollution breaking KDE4 fpicker build
+
+---
+diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+index f282645..69be3b1 100644
+--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
++++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+@@ -56,7 +56,10 @@
+ #define Region QtXRegion
+ 
+ //kde has an enum that uses this...OO does too
++#define LO_SETTINGS_MOUSE SETTINGS_MOUSE
+ #undef SETTINGS_MOUSE
++#define LO_SETTINGS_LOCALE SETTINGS_LOCALE
++#undef SETTINGS_LOCALE
+ 
+ #include <kfiledialog.h>
+ #include <kwindowsystem.h>
+@@ -70,6 +73,11 @@
+ 
+ #undef Region
+ 
++#define SETTINGS_MOUSE LO_SETTINGS_MOUSE
++#undef LO_SETTINGS_MOUSE
++#define SETTINGS_LOCALE LO_SETTINGS_LOCALE
++#undef LO_SETTINGS_LOCALE
++
+ using namespace ::com::sun::star;
+ 
+ using namespace ::com::sun::star::ui::dialogs;
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild b/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
index 20672730ca9163b81ded6fe98036b326281e322c..e0747ceb04148096d7b8b40aa5cd088698193c06 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.5.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.4.5.2.ebuild,v 1.1 2012/01/03 21:04:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.2 2012/01/08 14:25:01 dilfridge Exp $
 
 EAPI=4
 
@@ -190,6 +190,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-kill-cppunit.patch"
        "${FILESDIR}/${PN}-honor-strip.patch"
        "${FILESDIR}/${PN}-java.patch"
+       "${FILESDIR}/${PN}-kde48.patch"
 )
 
 REQUIRED_USE="

diff --git a/app-office/libreoffice/libreoffice-3.4.99.2.ebuild b/app-office/libreoffice/libreoffice-3.4.99.2.ebuild
index 602ca19999a860521344101438468010247a3c7c..faba7df78204fcf9928924b5222d88379bc3c9c5 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.99.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.99.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.4.99.2.ebuild,v 1.1 2011/12/22 10:52:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.99.2.ebuild,v 1.2 2012/01/08 14:25:01 dilfridge Exp $
 
 EAPI=4
 
@@ -188,6 +188,7 @@ DEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
+       "${FILESDIR}/libreoffice-kde48.patch"
 )
 
 REQUIRED_USE="