[openoffice.org/f14/master] add redland include fix

Caolan McNamara caolanm at fedoraproject.org
Mon Nov 1 11:31:33 UTC 2010


commit 272e7e6f1998fdbad5a3a100019cc6d9122f86cf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 1 11:31:22 2010 +0000

    add redland include fix

 0001-include-redland.h-instead-of-librdf.h.patch |   26 ++++++++++++++++++++++
 openoffice.org.spec                              |    2 +
 2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/0001-include-redland.h-instead-of-librdf.h.patch b/0001-include-redland.h-instead-of-librdf.h.patch
new file mode 100644
index 0000000..62ccc36
--- /dev/null
+++ b/0001-include-redland.h-instead-of-librdf.h.patch
@@ -0,0 +1,26 @@
+From 31356d06ee3a16b175e5f997283a430db91ba0d7 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Wed, 6 Oct 2010 09:56:29 +0200
+Subject: [PATCH] include redland.h instead of librdf.h
+
+Oh, how I love non-self-contained headers!
+---
+ unoxml/source/rdf/librdf_repository.cxx |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx
+index 3d2acf0..106b4bc 100644
+--- a/unoxml/source/rdf/librdf_repository.cxx
++++ b/unoxml/source/rdf/librdf_repository.cxx
+@@ -39,7 +39,7 @@
+ #include <boost/shared_array.hpp>
+ #include <boost/bind.hpp>
+ 
+-#include <librdf.h>
++#include <redland.h>
+ 
+ #include <com/sun/star/lang/XServiceInfo.hpp>
+ #include <com/sun/star/lang/XInitialization.hpp>
+-- 
+1.7.3.1
+
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 06bd967..c33ccac 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -132,6 +132,7 @@ Patch46: openoffice.org-3.3.0.rh635918.vcl.fix-im-handling.patch
 Patch47: 0001-rhbz-636521-Don-t-record-undo-info-during-escher-con.patch
 Patch48: openoffice.org-3.2.0.rh642996.vcl.skip-reserved-operators.patch
 Patch49: 0001-strcpy-cannot-be-used-with-overlapping-src-and-dest.patch
+Patch50: 0001-include-redland.h-instead-of-librdf.h.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1669,6 +1670,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch47 -p1 -b .rhbz-636521-Don-t-record-undo-info-during-escher-con.patch
 %patch48 -p1 -b .rh642996.vcl.skip-reserved-operators.patch
 %patch49 -p1 -b .0001-strcpy-cannot-be-used-with-overlapping-src-and-dest.patch
+%patch50 -p1 -b .0001-include-redland.h-instead-of-librdf.h.patch
 rm -rf l10n/source/kid  # rhbz#639212
 
 %build


More information about the scm-commits mailing list