SHA256
1
0
forked from pool/libreoffice
libreoffice/buildfix-ucb-glib-2.31.diff
Stephan Kulow 4e6074f5e4 Accepting request 100201 from LibreOffice:Unstable
- obsolete OpenOffice_org-help-en-US-devel (bnc#741043)

- added automake into BuildRequires to fix build in Factory

- buildfix-ucb-glib-2.31.diff: fix build with glib-2.31; glib/gthread.h
  can't be included directly
- libreoffice-desktop-icons-256x256.tar.bz2: add missing 256x256 desktop
  icons (bnc#722644)

- add compat symlinks for the old main desktop icon (bnc#724087)

- define %%python_sitelib on SLED11 and older systems to fix installation

- correctly obsolete OpenOffice_org-artwork-devel (bnc#734781)

OBS-URL: https://build.opensuse.org/request/show/100201
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=27
2012-01-20 19:24:03 +00:00

12 lines
401 B
Diff

--- ucb/source/ucp/gvfs/gvfs_content.hxx.old 2011-05-19 12:27:43.000000000 +0200
+++ ucb/source/ucp/gvfs/gvfs_content.hxx 2012-01-11 15:00:28.000000000 +0100
@@ -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>