[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.6-2-2-g7e41978
The following commit has been merged in the master branch:
commit 016fd1c4bddd353d8441ff9be6edc842b0a2d0f9
Author: Rene Engelhard <rene@debian.org>
Date: Sat Mar 24 20:50:43 2012 +0100
fix gvfs build for glib >= 2.32 (glib-single-include)
diff --git a/changelog b/changelog
index bb3853f..09f90c5 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,16 @@
+libreoffice (1:3.4.6-3) UNRELEASED; urgency=low
+
+ * debian/patches/glib-single-include.patch: fix gvfs build for
+ glib >= 2.32, thanks Michael Biebl (closes: #665574)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 25 Mar 2012 18:16:52 +0200
+
libreoffice (1:3.4.6-2) unstable; urgency=medium
* debian/patches/bibliography-no-crash-if-no-base.diff: add fixup from
libreoffice-3-5 to make it actually work again...
- -- Rene Engelhard <rene@debian.org> Fri, 09 Mar 2012 15:59:06 +0100
+ -- Rene Engelhard <rene@debian.org> Sat, 24 Mar 2012 20:48:14 +0100
libreoffice (1:3.4.6-1) unstable; urgency=medium
diff --git a/patches/glib-single-include.patch b/patches/glib-single-include.patch
new file mode 100644
index 0000000..4f7e6f0
--- /dev/null
+++ b/patches/glib-single-include.patch
@@ -0,0 +1,14 @@
+--- /dev/null 2012-03-23 10:23:05.558769661 +0100
++++ libreoffice-3.4.6/libreoffice-build/patches/hotfixes/glib-single-include.patch 2012-03-25 18:15:58.000000000 +0200
+@@ -0,0 +1,11 @@
++--- ucb/source/ucp/gvfs/gvfs_content.hxx
+++++ ucb/source/ucp/gvfs/gvfs_content.hxx
++@@ -35,7 +35,7 @@
++ #include <com/sun/star/ucb/XContentCreator.hpp>
++ #include <ucbhelper/contenthelper.hxx>
++
++-#include <glib/gthread.h>
+++#include <glib.h>
++ #include <libgnomevfs/gnome-vfs-ops.h>
++ #include <libgnomevfs/gnome-vfs-directory.h>
++
diff --git a/patches/series b/patches/series
index 8e808d7..b0dbee4 100644
--- a/patches/series
+++ b/patches/series
@@ -31,3 +31,4 @@ armhf-bridges-fix-armv4t-armel.diff
armhf-bridges-doubles.diff
bibliography-no-crash-if-no-base.diff
fix-for-kdelibs-enum.diff
+glib-single-include.patch
--
LibreOffice packaging repository
Reply to: