distro-configs/LibreOfficeMacOSX.conf | 1 - redland/raptor/raptor-1.4.18.entities.patch | 13 ++++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-)
New commits: commit 89f7da6d23eb348e4b16b529f95a40c635787807 Author: Petr Mladek <pmla...@suse.cz> Date: Thu Mar 1 11:55:50 2012 +0100 Revert "Use internal libxml for Mac release builds." raptor is buildable with the older libxml2 now This reverts commit 4591cd22409f870a0fa9263691945eea92359954. diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf index 1a1fd09..9366a04 100644 --- a/distro-configs/LibreOfficeMacOSX.conf +++ b/distro-configs/LibreOfficeMacOSX.conf @@ -1,7 +1,6 @@ --with-vendor=The Document Foundation --enable-epm --enable-binfilter ---without-system-libxml --disable-cairo-canvas --with-java-target-version=1.5 --enable-ext-presenter-minimizer commit a5394f98f2b6e4498ef1981272f2af3999b7df5f Author: Michael Stahl <mst...@redhat.com> Date: Thu Mar 1 11:54:18 2012 +0100 raptor: make the entities patch work on older libxml2 versions Add a runtime check whether the "checked" member is available. diff --git a/redland/raptor/raptor-1.4.18.entities.patch b/redland/raptor/raptor-1.4.18.entities.patch index 4964dae..d311879 100644 --- a/redland/raptor/raptor-1.4.18.entities.patch +++ b/redland/raptor/raptor-1.4.18.entities.patch @@ -49,7 +49,7 @@ int raptor_sax2_init(void); --- misc/raptor-1.4.18/src/raptor_libxml.c.old 2008-06-14 05:35:27.000000000 +0200 +++ misc/build/raptor-1.4.18/src/raptor_libxml.c 2012-02-15 16:52:08.000000000 +0100 -@@ -142,18 +142,115 @@ raptor_libxml_hasExternalSubset (void* u +@@ -142,18 +142,126 @@ raptor_libxml_hasExternalSubset (void* u static xmlParserInputPtr raptor_libxml_resolveEntity(void* user_data, @@ -161,9 +161,20 @@ + + ret->owner = 1; + ++/* ret->checked was added with commit a37a6ad91a61d168ecc4b29263def3363fff4da6 ++ in libxml2 before 2.6.27 it does not exist and ret->children != 0 will be ++ tested instead, which is true due to xmlAddChildList above */ ++#if LIBXML_VERSION >= 20627 || !defined(__APPLE__) + /* Mark this entity as having been checked - never do this again */ + if(!ret->checked) + ret->checked = 1; ++#else ++ if (atoi(xmlParserVersion) >= 20627) { ++ int *const pChecked = (&ret->owner) + 1; ++ if (!*pChecked) /* owner precedes checked and is also of type int */ ++ *pChecked = 1; ++ } ++#endif + } + + return ret; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits