[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-100-gafff94e
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit f04a67bbd34f222dfc005a4656f3dbe7a671e120
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Apr 5 12:28:39 2012 +0200
removed upstreamed fix-for-kdelibs-enum.diff
diff --git a/patches/fix-for-kdelibs-enum.diff b/patches/fix-for-kdelibs-enum.diff
deleted file mode 100644
index 58d1442..0000000
--- a/patches/fix-for-kdelibs-enum.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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 956799a..3bd0dcb 100644
--- a/patches/series
+++ b/patches/series
@@ -33,7 +33,6 @@ debian-hardened-buildflags.diff
gtk3-hack-explicit-gmodule.diff
pkgconfig-mozilla-plugin.diff
ubuntu-quicklists.diff
-fix-for-kdelibs-enum.diff
fdo-40607-osl_syncFile-having-written-and-avoid-doin.diff
fdo-43895-lp-905355-Never-let-users-save-in-tmp-by-d.diff
bypass-GtkSalPrinter-when-it-is-not-enabled.diff
--
LibreOffice packaging repository
Reply to: