From: Leonid Plyushch <25881154+xeffyr@users.noreply.github.com>
Date: Wed, 29 Nov 2017 21:32:48 +0000 (+0200)
Subject: libxml2: fix paths to /etc/xml/catalog (#1857)
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/12414d12f160a10fbd7e2679936d64597acfc96e?ds=inline

libxml2: fix paths to /etc/xml/catalog (#1857)
---

diff --git a/packages/libxml2/build.sh b/packages/libxml2/build.sh
index ab11be9f..22908d0e 100644
--- a/packages/libxml2/build.sh
+++ b/packages/libxml2/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.xmlsoft.org
 TERMUX_PKG_DESCRIPTION="Library for parsing XML documents"
 TERMUX_PKG_VERSION=2.9.7
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c
 TERMUX_PKG_SRCURL=ftp://xmlsoft.org/libxml2/libxml2-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-python"
diff --git a/packages/libxml2/fix-catalog-paths.patch b/packages/libxml2/fix-catalog-paths.patch
new file mode 100644
index 00000000..947818bf
--- /dev/null
+++ b/packages/libxml2/fix-catalog-paths.patch
@@ -0,0 +1,46 @@
+diff -uNr libxml2-2.9.7/catalog.c libxml2-2.9.7.mod/catalog.c
+--- libxml2-2.9.7/catalog.c	2017-10-26 10:54:40.000000000 +0300
++++ libxml2-2.9.7.mod/catalog.c	2017-11-29 15:19:49.877207795 +0200
+@@ -70,15 +70,15 @@
+ #define XML_URN_PUBID "urn:publicid:"
+ #define XML_CATAL_BREAK ((xmlChar *) -1)
+ #ifndef XML_XML_DEFAULT_CATALOG
+-#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
++#define XML_XML_DEFAULT_CATALOG "file://@TERMUX_PREFIX@/etc/xml/catalog"
+ #endif
+ #ifndef XML_SGML_DEFAULT_CATALOG
+-#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog"
++#define XML_SGML_DEFAULT_CATALOG "file://@TERMUX_PREFIX@/etc/sgml/catalog"
+ #endif
+ 
+ #if defined(_WIN32) && defined(_MSC_VER)
+ #undef XML_XML_DEFAULT_CATALOG
+-static char XML_XML_DEFAULT_CATALOG[256] = "file:///etc/xml/catalog";
++static char XML_XML_DEFAULT_CATALOG[256] = "file://@TERMUX_PREFIX@/etc/xml/catalog";
+ #if defined(_WIN32_WCE)
+ /* Windows CE don't have a A variant */
+ #define GetModuleHandleA GetModuleHandle
+diff -uNr libxml2-2.9.7/xmlcatalog.c libxml2-2.9.7.mod/xmlcatalog.c
+--- libxml2-2.9.7/xmlcatalog.c	2017-10-26 10:54:40.000000000 +0300
++++ libxml2-2.9.7.mod/xmlcatalog.c	2017-11-29 15:20:40.207875604 +0200
+@@ -43,7 +43,7 @@
+ 
+ 
+ #ifndef XML_SGML_DEFAULT_CATALOG
+-#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog"
++#define XML_SGML_DEFAULT_CATALOG "@TERMUX_PREFIX@/etc/sgml/catalog"
+ #endif
+ 
+ /************************************************************************
+diff -uNr libxml2-2.9.7/xmllint.c libxml2-2.9.7.mod/xmllint.c
+--- libxml2-2.9.7/xmllint.c	2017-10-26 10:54:40.000000000 +0300
++++ libxml2-2.9.7.mod/xmllint.c	2017-11-29 15:20:08.607456724 +0200
+@@ -87,7 +87,7 @@
+ #endif
+ 
+ #ifndef XML_XML_DEFAULT_CATALOG
+-#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
++#define XML_XML_DEFAULT_CATALOG "file://@TERMUX_PREFIX@/etc/xml/catalog"
+ #endif
+ 
+ typedef enum {