chiark - git - mdw - termux-packages/blob - packages/libxml2/fix-catalog-paths.patch

   1 diff -uNr libxml2-2.9.7/catalog.c libxml2-2.9.7.mod/catalog.c
   2 --- libxml2-2.9.7/catalog.c     2017-10-26 10:54:40.000000000 +0300
   3 +++ libxml2-2.9.7.mod/catalog.c 2017-11-29 15:19:49.877207795 +0200
   4 @@ -70,15 +70,15 @@
   5  #define XML_URN_PUBID "urn:publicid:"
   6  #define XML_CATAL_BREAK ((xmlChar *) -1)
   7  #ifndef XML_XML_DEFAULT_CATALOG
   8 -#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
   9 +#define XML_XML_DEFAULT_CATALOG "file://@TERMUX_PREFIX@/etc/xml/catalog"
  10  #endif
  11  #ifndef XML_SGML_DEFAULT_CATALOG
  12 -#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog"
  13 +#define XML_SGML_DEFAULT_CATALOG "file://@TERMUX_PREFIX@/etc/sgml/catalog"
  14  #endif
  15
  16  #if defined(_WIN32) && defined(_MSC_VER)
  17  #undef XML_XML_DEFAULT_CATALOG
  18 -static char XML_XML_DEFAULT_CATALOG[256] = "file:///etc/xml/catalog";
  19 +static char XML_XML_DEFAULT_CATALOG[256] = "file://@TERMUX_PREFIX@/etc/xml/catalog";
  20  #if defined(_WIN32_WCE)
  21  /* Windows CE don't have a A variant */
  22  #define GetModuleHandleA GetModuleHandle
  23 diff -uNr libxml2-2.9.7/xmlcatalog.c libxml2-2.9.7.mod/xmlcatalog.c
  24 --- libxml2-2.9.7/xmlcatalog.c  2017-10-26 10:54:40.000000000 +0300
  25 +++ libxml2-2.9.7.mod/xmlcatalog.c      2017-11-29 15:20:40.207875604 +0200
  26 @@ -43,7 +43,7 @@
  27
  28
  29  #ifndef XML_SGML_DEFAULT_CATALOG
  30 -#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog"
  31 +#define XML_SGML_DEFAULT_CATALOG "@TERMUX_PREFIX@/etc/sgml/catalog"
  32  #endif
  33
  34  /************************************************************************
  35 diff -uNr libxml2-2.9.7/xmllint.c libxml2-2.9.7.mod/xmllint.c
  36 --- libxml2-2.9.7/xmllint.c     2017-10-26 10:54:40.000000000 +0300
  37 +++ libxml2-2.9.7.mod/xmllint.c 2017-11-29 15:20:08.607456724 +0200
  38 @@ -87,7 +87,7 @@
  39  #endif
  40
  41  #ifndef XML_XML_DEFAULT_CATALOG
  42 -#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
  43 +#define XML_XML_DEFAULT_CATALOG "file://@TERMUX_PREFIX@/etc/xml/catalog"
  44  #endif
  45
  46  typedef enum {