Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2012-02-14 19:02:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice", Maintainer is "[email protected]" Changes: -------- libreoffice-help-en-US.changes: same change libreoffice-help-group1.changes: same change libreoffice-help-group2.changes: same change libreoffice-help-group3.changes: same change libreoffice-help-group4.changes: same change libreoffice-help-group5.changes: same change --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2012-01-20 20:24:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2012-02-14 19:02:46.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 10 13:19:17 UTC 2012 - [email protected] + +- workaround-for-LO-namespace-pollution-breaking-KDE4.diff: + workaround for conflicting defines that break build with KDE4 in factory + +------------------------------------------------------------------- New: ---- workaround-for-LO-namespace-pollution-breaking-KDE4.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ libreoffice-help-en-US.spec: same change libreoffice-help-group1.spec: same change libreoffice-help-group2.spec: same change libreoffice-help-group3.spec: same change libreoffice-help-group4.spec: same change libreoffice-help-group5.spec: same change ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.HLwljB/_old 2012-02-14 19:02:58.000000000 +0100 +++ /var/tmp/diff_new_pack.HLwljB/_new 2012-02-14 19:02:58.000000000 +0100 @@ -562,6 +562,8 @@ 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 @@ # cpp/poppler-version.h is not included in older poppler packages %patch13 %endif +%patch14 -p1 %patch15 %patch16 %patch17 ++++++ workaround-for-LO-namespace-pollution-breaking-KDE4.diff ++++++ >From 0c1cf6119556969f7875dc587905070e3f1b6f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <[email protected]> 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 <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; -- 1.7.3.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
