pool/libreoffice
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 104278 from LibreOffice:Unstable

Browse Source 
- workaround-for-LO-namespace-pollution-breaking-KDE4.diff:
  workaround for conflicting defines that break build with KDE4 in factory

OBS-URL: https://build.opensuse.org/request/show/104278
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=28
This commit is contained in:
Stephan Kulow 2012-02-14 18:02:45 +00:00 committed by Git OBS Bridge
parent 4e6074f5e4
commit 85408b8614
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libreoffice.changes
View File

@ -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 Wed Jan 11 14:05:57 UTC 2012 - pmladek@suse.com

3
libreoffice.spec
View File

@ -562,6 +562,8 @@ Patch11: nlpsolver-no-broken-help.diff
Patch12: scripting-provider-build-dep.diff Patch12: scripting-provider-build-dep.diff
# revert problematic build fix for poppler 0.17.0 on older distributions # revert problematic build fix for poppler 0.17.0 on older distributions
Patch13: libreoffice-poppler-0.17.0-reject-fix.diff 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 # fix build dependency problem in svx
Patch15: svx-globlmn-hrc-build-dep.diff Patch15: svx-globlmn-hrc-build-dep.diff
# legacy Fragment PPTX import (bnc#699334) # 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 # cpp/poppler-version.h is not included in older poppler packages
%patch13 %patch13
%endif %endif
%patch14 -p1
%patch15 %patch15
%patch16 %patch16
%patch17 %patch17

39
workaround-for-LO-namespace-pollution-breaking-KDE4.diff Normal file
View File

@ -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?= <l.lunak@suse.cz>
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