From 536da195f5113fbfc43ec16008b26d2a1c19ebaa Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 1 Jan 2014 22:13:22 +0100 Subject: Port patches from libxml2-2.8.0. diff --git a/Makefile.am b/Makefile.am index 9c630be..7fd25f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1269,8 +1269,8 @@ cmake_DATA = libxml2-config.cmake # # 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.ac b/configure.ac index ca911f3..974d292 100644 --- a/configure.ac +++ b/configure.ac @@ -848,24 +848,19 @@ if test "$with_python" != "no" ; then fi if test "$PYTHON_VERSION" != "" -a "$PYTHON_INCLUDES" = "" then - if test -r $with_python/include/python$PYTHON_VERSION/Python.h + if test -r $with_python/develop/headers/python$PYTHON_VERSION/Python.h then - PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION + PYTHON_INCLUDES=$with_python/develop/headers/python$PYTHON_VERSION else - if test -r $prefix/include/python$PYTHON_VERSION/Python.h + if test -r $prefix/develop/headers/python$PYTHON_VERSION/Python.h then - PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION + PYTHON_INCLUDES=$prefix/develop/headers/python$PYTHON_VERSION else - if test -r /usr/include/python$PYTHON_VERSION/Python.h + if test -r /boot/system/develop/headers/python$PYTHON_VERSION/Python.h then - PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION - else - if test -r $with_python/include/Python.h - then - PYTHON_INCLUDES=$with_python/include - else - echo could not find python$PYTHON_VERSION/Python.h or $with_python/include/Python.h - fi + PYTHON_INCLUDES=/boot/system/develop/headers/python$PYTHON_VERSION + else + echo could not find python$PYTHON_VERSION/Python.h or $with_python/develop/headers/Python.h fi fi fi @@ -876,13 +871,13 @@ if test "$with_python" != "no" ; then fi if test "$PYTHON_VERSION" != "" -a "$PYTHON_SITE_PACKAGES" = "" then - if test -d $libdir/python$PYTHON_VERSION/site-packages + if test -d $libdir/python$PYTHON_VERSION/vendor-packages then - PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages + PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/vendor-packages else - if test -d $with_python/lib/site-packages + if test -d $with_python/lib/vendor-packages then - PYTHON_SITE_PACKAGES=$with_python/lib/site-packages + PYTHON_SITE_PACKAGES=$with_python/lib/vendor-packages else PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"` fi diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index 95ebead..81222d9 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= \ diff --git a/xml2-config.in b/xml2-config.in index 1957486..9c98a0e 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) -- 2.21.0 From 1def30eeb6f7b41895dfbc15fbb507b6f3bbaa56 Mon Sep 17 00:00:00 2001 From: Jessica Hamilton Date: Sat, 30 May 2015 11:38:15 +1200 Subject: Haiku: search for catalogs in directories diff --git a/catalog.c b/catalog.c index f814121..5939325 100644 --- a/catalog.c +++ b/catalog.c @@ -32,6 +32,9 @@ #include #endif #include +#ifdef __HAIKU__ +#include +#endif #include #include #include @@ -70,10 +73,10 @@ #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 "/boot/system/data/xml/catalog" #endif #ifndef XML_SGML_DEFAULT_CATALOG -#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog" +#define XML_SGML_DEFAULT_CATALOG "/boot/system/data/sgml/catalog" #endif #if defined(_WIN32) && defined(_MSC_VER) @@ -3078,6 +3081,21 @@ xmlCatalogIsEmpty(xmlCatalogPtr catal) { * * ************************************************************************/ +#ifdef __HAIKU__ +static xmlCatalogEntryPtr *__haikuNextEntry; +static int __haikuAddCatalog(const char* subpath, const struct stat* sb, int typeflag) +{ + if (typeflag == FTW_F) { + *__haikuNextEntry = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL, + NULL, BAD_CAST subpath, xmlCatalogDefaultPrefer, NULL); + if (*__haikuNextEntry != NULL) + __haikuNextEntry = &((*__haikuNextEntry)->next); + } + + return 0; +} +#endif + /** * xmlInitializeCatalogData: * @@ -3170,10 +3188,16 @@ xmlInitializeCatalog(void) { cur++; path = (char *) xmlStrndup((const xmlChar *)paths, cur - paths); if (path != NULL) { +#ifdef __HAIKU__ + __haikuNextEntry = nextent; + ftw(path, __haikuAddCatalog, 3); + nextent = __haikuNextEntry; +#else *nextent = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL, NULL, BAD_CAST path, xmlCatalogDefaultPrefer, NULL); if (*nextent != NULL) nextent = &((*nextent)->next); +#endif xmlFree(path); } } -- 2.21.0 From 410cb6cb8c7ef64bfe68a1f991e80fb2052ed880 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 3 Apr 2019 18:27:19 +0200 Subject: Remove options unknown to gcc2 diff --git a/configure.ac b/configure.ac index 974d292..35e972d 100644 --- a/configure.ac +++ b/configure.ac @@ -769,9 +769,9 @@ else fi # warnings we'd like to see - EXTRA_CFLAGS="${EXTRA_CFLAGS} -pedantic -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls" + EXTRA_CFLAGS="${EXTRA_CFLAGS} -pedantic -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls" # warnings we'd like to supress - EXTRA_CFLAGS="${EXTRA_CFLAGS} -Wno-long-long -Wno-format-extra-args -Wno-array-bounds" + EXTRA_CFLAGS="${EXTRA_CFLAGS} -Wno-long-long -Wno-format-extra-args" case "${host}" in alpha*-*-linux* ) EXTRA_CFLAGS="${EXTRA_CFLAGS} -mieee" -- 2.21.0 From ca8fdeeb5c2cbea088c1451fd68b4c98966a077c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 17 Jun 2019 15:04:08 +0200 Subject: dict.h: gcc 2.95 doesn't allow multiple storage classes. uses an extern "C" block instead. diff --git a/include/libxml/dict.h b/include/libxml/dict.h index b83db59..4e71834 100644 --- a/include/libxml/dict.h +++ b/include/libxml/dict.h @@ -11,17 +11,19 @@ #ifndef __XML_DICT_H__ #define __XML_DICT_H__ -#ifdef __cplusplus -#define __XML_EXTERNC extern "C" -#else -#define __XML_EXTERNC -#endif - /* * The dictionary. */ -__XML_EXTERNC typedef struct _xmlDict xmlDict; -__XML_EXTERNC typedef xmlDict *xmlDictPtr; +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _xmlDict xmlDict; +typedef xmlDict *xmlDictPtr; + +#ifdef __cplusplus +} +#endif #include #include -- 2.21.0