diff --git a/libreoffice.changes b/libreoffice.changes index 034ffe7..a65e87e 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 10 13:19:17 UTC 2012 - pmladek@suse.com + +- workaround-for-LO-namespace-pollution-breaking-KDE4.diff: + workaround for conflicting defines that break build with KDE4 in factory + ------------------------------------------------------------------- Wed Jan 11 14:05:57 UTC 2012 - pmladek@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 962f819..92cbe2d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -562,6 +562,8 @@ Patch11: nlpsolver-no-broken-help.diff Patch12: scripting-provider-build-dep.diff # revert problematic build fix for poppler 0.17.0 on older distributions Patch13: libreoffice-poppler-0.17.0-reject-fix.diff +# workaround for conflicting defines that break build with KDE4 in factory +Patch14: workaround-for-LO-namespace-pollution-breaking-KDE4.diff # fix build dependency problem in svx Patch15: svx-globlmn-hrc-build-dep.diff # legacy Fragment PPTX import (bnc#699334) @@ -1362,6 +1364,7 @@ cp $RPM_SOURCE_DIR/README* . # cpp/poppler-version.h is not included in older poppler packages %patch13 %endif +%patch14 -p1 %patch15 %patch16 %patch17 diff --git a/workaround-for-LO-namespace-pollution-breaking-KDE4.diff b/workaround-for-LO-namespace-pollution-breaking-KDE4.diff new file mode 100644 index 0000000..b528163 --- /dev/null +++ b/workaround-for-LO-namespace-pollution-breaking-KDE4.diff @@ -0,0 +1,39 @@ +From 0c1cf6119556969f7875dc587905070e3f1b6f60 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= +Date: Fri, 6 Jan 2012 10:55:03 +0100 +Subject: [PATCH] workaround for LO namespace pollution breaking KDE4 fpicker build + +--- + fpicker/source/unx/kde4/KDE4FilePicker.cxx | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +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 + #include +@@ -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; +-- +1.7.3.4 +