From 6db1eb950d7c25695085ceba0688c0fda21aec99 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 03:04:24 +0200 Subject: applying patch libxml2-2.8.0.patch diff --git a/Makefile.am b/Makefile.am index f82cefa..c4464a6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1208,8 +1208,8 @@ pkgconfig_DATA = libxml-2.0.pc # # Install the tests program sources as examples # -BASE_DIR=$(datadir)/doc -DOC_MODULE=libxml2-$(VERSION) +BASE_DIR=$(docdir) +DOC_MODULE= EXAMPLES_DIR=$(BASE_DIR)/$(DOC_MODULE)/examples install-data-local: diff --git a/configure.in b/configure.in index 0fb4983..a5f86ca 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) AC_INIT(entities.c) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_HOST diff --git a/xml2-config.in b/xml2-config.in index 2989325..162d348 100644 --- a/xml2-config.in +++ b/xml2-config.in @@ -40,8 +40,8 @@ while test $# -gt 0; do case "$1" in --prefix=*) prefix=$optarg - includedir=$prefix/include - libdir=$prefix/lib + includedir=$prefix/develop/headers + libdir=$prefix/develop/lib ;; --prefix) @@ -50,7 +50,7 @@ while test $# -gt 0; do --exec-prefix=*) exec_prefix=$optarg - libdir=$exec_prefix/lib + libdir=$exec_prefix/develop/lib ;; --exec-prefix) -- 1.8.3.4 From d06473f826da81a99d33142030378e2301ca358a Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 20:15:20 +0200 Subject: configure.in: hack to find python directories on Haiku configure should really just ask python-config instead of searching the stuff itself. diff --git a/configure.in b/configure.in index a5f86ca..ade0cf8 100644 --- a/configure.in +++ b/configure.in @@ -766,11 +766,11 @@ if test "$with_python" != "no" ; then fi if test "$PYTHON_VERSION" != "" then - if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \ + if test -r $with_python/develop/headers/python$PYTHON_VERSION/Python.h -a \ -d $with_python/lib/python$PYTHON_VERSION/site-packages then - PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION - PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages + PYTHON_INCLUDES=$with_python/develop/headers/python$PYTHON_VERSION + PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages else if test -r $prefix/include/python$PYTHON_VERSION/Python.h then -- 1.8.3.4 From 0c143c7013080fdf83a863cf3bfbd730dbec1b6e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 23:00:24 +0200 Subject: python[/tests]/Makefile.am: $(datadir)/doc -> $(docdir) diff --git a/python/Makefile.am b/python/Makefile.am index 68d2236..3bad10f 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -9,7 +9,7 @@ INCLUDES = \ -I$(top_builddir)/include \ -I$(top_builddir)/$(subdir) -docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION) +docsdir = $(docdir)_python-$(LIBXML_VERSION) # libxml2class.txt is generated dist_docs_DATA = TODO diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index 52c89fc..7549db9 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am @@ -1,4 +1,4 @@ -exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples +exampledir = $(docdir)_python-$(LIBXML_VERSION)/examples dist_example_DATA = $(PYTESTS) $(XMLS) PYTESTS= \ -- 1.8.3.4 From 3751469e256a007663bebb0b2206b1700d73d5c7 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 18 Oct 2013 23:51:10 +0200 Subject: Adjust libxml2 to use vendor-packages directory. diff --git a/configure.in b/configure.in index ade0cf8..522a2c0 100644 --- a/configure.in +++ b/configure.in @@ -767,10 +767,10 @@ if test "$with_python" != "no" ; then if test "$PYTHON_VERSION" != "" then if test -r $with_python/develop/headers/python$PYTHON_VERSION/Python.h -a \ - -d $with_python/lib/python$PYTHON_VERSION/site-packages + -d $with_python/lib/python$PYTHON_VERSION/vendor-packages then PYTHON_INCLUDES=$with_python/develop/headers/python$PYTHON_VERSION - PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages + PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/vendor-packages else if test -r $prefix/include/python$PYTHON_VERSION/Python.h then -- 1.8.3.4 From a7785e3256cfd57da9e21c11937cd6a4ab5b66a6 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 16 Jun 2014 22:26:17 +0200 Subject: Allow XML_CATALOG_FILES to point to directories. These are then recursively explored. Makes it much easier for packages to add stuff to the default catalogs diff --git a/catalog.c b/catalog.c index fb586c1..cb74df0 100644 --- a/catalog.c +++ b/catalog.c @@ -3149,6 +3149,7 @@ xmlInitializeCatalog(void) { if (catal != NULL) { /* the XML_CATALOG_FILES envvar is allowed to contain a space-separated list of entries. */ + cur = catalogs; nextent = &catal->xml; while (*cur != '\0') { @@ -3160,10 +3161,26 @@ xmlInitializeCatalog(void) { cur++; path = (char *) xmlStrndup((const xmlChar *)paths, cur - paths); if (path != NULL) { +#if defined(HAIKU) + /* On Haiku, we allow directories in that list, as well as files. */ + int addCatalog(const char* path, const struct stat* sb, int typeflag) + { + if (typeflag == FTW_F) { + *nextent = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL, + NULL, BAD_CAST path, xmlCatalogDefaultPrefer, NULL); + if (*nextent != NULL) + nextent = &((*nextent)->next); + } + + return 0; + } + ftw(path, addCatalog, 3); +#else *nextent = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL, NULL, BAD_CAST path, xmlCatalogDefaultPrefer, NULL); if (*nextent != NULL) nextent = &((*nextent)->next); +#endif xmlFree(path); } } -- 1.8.3.4