The following commit has been merged in the master branch:
commit 129ee0b31566fa9ecc6dd93e9805241f48db1d8b
Author: Rene Engelhard <r...@debian.org>
Date: Wed Mar 21 17:28:44 2012 +0100
backport build fix for KDE 4.8 from libreoffice-3-5
diff --git a/changelog b/changelog
index c792731..5fc90da 100644
--- a/changelog
+++ b/changelog
@@ -3,11 +3,14 @@ libreoffice (1:3.4.6-1) unstable; urgency=medium
* new upstream release
- disables problematic reading of external entities in internal
raptor copy (CVE-2012-0037)
+
+ * debian/patches/fix-for-kdelibs-enum.diff: backport build fix for
+ KDE 4.8 from libreoffice-3-5
* libreoffice-build: move to plain current libreoffice-3-4 branch
* debian/patches/update-version.diff: ... and add this as patch
- -- Rene Engelhard <r...@debian.org> Wed, 21 Mar 2012 17:22:14 +0100
+ -- Rene Engelhard <r...@debian.org> Wed, 21 Mar 2012 17:26:40 +0100
libreoffice (1:3.4.5-6) UNRELEASED; urgency=low
diff --git a/patches/fix-for-kdelibs-enum.diff
b/patches/fix-for-kdelibs-enum.diff
new file mode 100644
index 0000000..0ea9c86
--- /dev/null
+++ b/patches/fix-for-kdelibs-enum.diff
@@ -0,0 +1,23 @@
+--- /dev/null 2012-03-20 18:41:16.150921458 +0100
++++
libreoffice-3.4.6/libreoffice-build/patches/hotfixes/fix-for-kdelibs-enum.diff
2012-03-19 23:05:05.000000000 +0100
+@@ -0,0 +1,20 @@
++--- fpicker/source/unx/kde4/KDE4FilePicker.cxx 2012-03-18
19:37:44.435636499 +0000
+++++ fpicker/source/unx/kde4/KDE4FilePicker.cxx 2012-03-18
20:04:04.263552525 +0000
++@@ -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;
++
diff --git a/patches/series b/patches/series
index c0bcc58..8e808d7 100644
--- a/patches/series
+++ b/patches/series
@@ -30,3 +30,4 @@ armhf-bridges.diff
armhf-bridges-fix-armv4t-armel.diff
armhf-bridges-doubles.diff
bibliography-no-crash-if-no-base.diff
+fix-for-kdelibs-enum.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sakgu-0000ts...@vasks.debian.org
