The following commit has been merged in the debian-experimental-3.5 branch:
commit 3cf74c4b58cc043e8085f477d398b5f3b4112574
Author: Rene Engelhard <r...@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 3e09e07..3bcce50 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,10 @@ libreoffice (1:3.5.1-2) UNRELEASED; urgency=low
* debian/patches/fix-for-kdelibs-enum.diff: backport build fix for
KDE 4.8 from libreoffice-3-5
+ * debian/patches/glib-single-include.patch: fix gvfs build for
+ glib >= 2.32, thanks Michael Biebl (closes: #665574)
- -- Rene Engelhard <r...@debian.org> Fri, 09 Mar 2012 15:59:06 +0100
+ -- Rene Engelhard <r...@debian.org> Sat, 24 Mar 2012 20:48:14 +0100
libreoffice (1:3.5.1-1) experimental; urgency=low
diff --git a/patches/glib-single-include.patch
b/patches/glib-single-include.patch
new file mode 100644
index 0000000..50535fa
--- /dev/null
+++ b/patches/glib-single-include.patch
@@ -0,0 +1,11 @@
+--- a/ucb/source/ucp/gvfs/gvfs_content.hxx
++++ b/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 15a122e..ef35c68 100644
--- a/patches/series
+++ b/patches/series
@@ -35,3 +35,4 @@ bibliography-no-crash-if-no-base.diff
pyuno_fix_python2.diff
prevent-sax-obsolete-dir.diff
fix-for-kdelibs-enum.diff
+glib-single-include.patch
--
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/e1sbwzi-0001r6...@vasks.debian.org
