* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-3.5.1-kde-4.8.1-namespace.patch
@ 2012-03-09 13:50 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; only message in thread
From: Tomas Chvatal (scarabeus) @ 2012-03-09 13:50 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/03/09 13:50:35
Added: libreoffice-3.5.1-kde-4.8.1-namespace.patch
Log:
Fix kde namespace clash. Wrt bug#403755.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Revision Changes Path
1.1 app-office/libreoffice/files/libreoffice-3.5.1-kde-4.8.1-namespace.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-3.5.1-kde-4.8.1-namespace.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-3.5.1-kde-4.8.1-namespace.patch?rev=1.1&content-type=text/plain
Index: libreoffice-3.5.1-kde-4.8.1-namespace.patch
===================================================================
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-03-09 13:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-09 13:50 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-3.5.1-kde-4.8.1-namespace.patch Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox