[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.1-1-64-gf621e55
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 7856bf2ec6e24b43eba7b361c77f507473c4e682
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sun Mar 18 21:21:28 2012 +0100
lp#958781: kde4libs update breaks LibreOffice ftbfs
diff --git a/patches/fix-for-kdelibs-enum.diff b/patches/fix-for-kdelibs-enum.diff
new file mode 100644
index 0000000..58d1442
--- /dev/null
+++ b/patches/fix-for-kdelibs-enum.diff
@@ -0,0 +1,20 @@
+--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx 2012-03-18 19:37:44.435636499 +0000
++++ b/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 71cefe1..c778235 100644
--- a/patches/series
+++ b/patches/series
@@ -35,3 +35,4 @@ pyuno_fix_python2.diff
prevent-sax-obsolete-dir.diff
pkgconfig-mozilla-plugin.diff
ubuntu-quicklists.diff
+fix-for-kdelibs-enum.diff
--
LibreOffice packaging repository
Reply to: