[libreoffice] header guards changed

[Caolan McNamara]

commit 478e272afc15f34631049878b426a50504addcf4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 4 14:45:49 2010 +0000

    header guards changed

 0001-latest-libX11-changed-header-guards.patch |   25 ++++++++++++++++++++++++
 libreoffice.spec                               |    2 +
 2 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/0001-latest-libX11-changed-header-guards.patch b/0001-latest-libX11-changed-header-guards.patch
new file mode 100644
index 0000000..3cde501
--- /dev/null
+++ b/0001-latest-libX11-changed-header-guards.patch
@@ -0,0 +1,25 @@
+From cd10b146b67f7329f699e48e74d2961dbcceb123 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Thu, 4 Nov 2010 14:44:14 +0000
+Subject: [PATCH] latest libX11 changed header guards
+
+---
+ vcl/unx/inc/dtint.hxx |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/vcl/unx/inc/dtint.hxx b/vcl/unx/inc/dtint.hxx
+index 724dad6..b173830 100644
+--- a/vcl/unx/inc/dtint.hxx
++++ b/vcl/unx/inc/dtint.hxx
+@@ -37,7 +37,7 @@ class SalBitmap;
+ class SalDisplay;
+ class AllSettings;
+ 
+-#ifndef _XLIB_H_
++#if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_)
+ // forwards from X
+ struct Display;
+ struct XEvent;
+-- 
+1.7.3.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index b731b5b..93516b2 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -103,6 +103,7 @@ Patch16: libreoffice-buildfix.patch
 Patch17: libreoffice-xdg632229.gnomeshell.patch
 Patch18: 0001-strcpy-cannot-be-used-with-overlapping-src-and-dest.patch
 Patch19: 0001-abort-doesn-t-gain-us-anything-here.patch
+Patch20: 0001-latest-libX11-changed-header-guards.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -719,6 +720,7 @@ cp -p %{SOURCE20} external/unowinreg/unowinreg.dll
 %patch17 -p0 -b .xdg632229.gnomeshell.patch
 %patch18 -p1 -b .strcpy-cannot-be-used-with-overlapping-src-and-dest
 %patch19 -p1 -b .abort-doesn-t-gain-us-anything-here.patch
+%patch20 -p1 -b .latest-libX11-changed-header-guards.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`