[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.0_beta2-2ubuntu3
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit bc70fd75b157b4c0b73a41119a52d9f885012f59
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Jan 11 09:57:10 2012 +0100
backport kdelibs patch
diff --git a/changelog b/changelog
index fe43868..e9f99ce 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
-libreoffice (1:3.5.0~beta2-2ubuntu2) oneiric; urgency=low
+libreoffice (1:3.5.0~beta2-2ubuntu2) precise; urgency=low
* enable gio, disable gvfs
+ * backport fpicker kde4 workaround by Lubos Lunak
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 11 Jan 2012 11:41:42 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 11 Jan 2012 11:43:19 +0100
libreoffice (1:3.5.0~beta2-2ubuntu1) precise; urgency=low
diff --git a/patches/series b/patches/series
index 2fb37c9..2103f05 100644
--- a/patches/series
+++ b/patches/series
@@ -31,3 +31,4 @@ add-debian-multiarch-support.diff
pkgconfig-mozilla-plugin.diff
propagate-gb_FULLDEPS.diff
disable-sc-unoapi-subsequentcheck-for-now.diff
+workaround-for-LO-namespace-pollution-breaking-KDE4.diff
diff --git a/patches/workaround-for-LO-namespace-pollution-breaking-KDE4.diff b/patches/workaround-for-LO-namespace-pollution-breaking-KDE4.diff
new file mode 100644
index 0000000..2844789
--- /dev/null
+++ b/patches/workaround-for-LO-namespace-pollution-breaking-KDE4.diff
@@ -0,0 +1,40 @@
+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.5.4
+
--
LibreOffice packaging repository
Reply to: