diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-01-08 14:25:01 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-01-08 14:25:01 +0000 |
| commit | 2acef6d9749da59be6d217fb46ebf709fcee10ba (patch) | |
| tree | 946ac47985f895eec317d61d1cd6e1e14116ff16 /app-office | |
| parent | app-admin/hddtemp: Updated hddgentoo.db. Fixes bug #392917. (diff) | |
| download | gentoo-2-2acef6d9749da59be6d217fb46ebf709fcee10ba.tar.gz gentoo-2-2acef6d9749da59be6d217fb46ebf709fcee10ba.tar.bz2 gentoo-2-2acef6d9749da59be6d217fb46ebf709fcee10ba.zip | |
Fix build with kde-4.8, bug 397775
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-kde48.patch | 35 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.4.5.2.ebuild | 3 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.4.99.2.ebuild | 5 |
4 files changed, 46 insertions, 4 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index e9cb6b87d949..2b35b1a5324f 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.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/files/libreoffice-kde48.patch b/app-office/libreoffice/files/libreoffice-kde48.patch new file mode 100644 index 000000000000..a92df79a9d0e --- /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 20672730ca91..e0747ceb0414 100644 --- 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 602ca19999a8..faba7df78204 100644 --- 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=" |