diff options
author | 2024-01-30 08:31:22 +0200 | |
---|---|---|
committer | 2024-01-30 06:57:32 +0000 | |
commit | 8331a685705a866be9249ee615fc0f945dbcd167 (patch) | |
tree | 9212b7552a472c0c075b5144b90a39cc075719b1 /dev-libs/yaz/files | |
parent | dev-perl/Sys-Virt: Stabilize 9.7.0 x86, #916812 (diff) | |
download | gentoo-8331a685705a866be9249ee615fc0f945dbcd167.tar.gz gentoo-8331a685705a866be9249ee615fc0f945dbcd167.tar.bz2 gentoo-8331a685705a866be9249ee615fc0f945dbcd167.zip |
dev-libs/yaz: add 5.34.0
Bug: https://bugs.gentoo.org/730016
Bug: https://bugs.gentoo.org/923291
Signed-off-by: Alfred Wingate <parona@protonmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-libs/yaz/files')
-rw-r--r-- | dev-libs/yaz/files/yaz-5.34.0-fix-atoi-header.patch | 54 | ||||
-rw-r--r-- | dev-libs/yaz/files/yaz-5.34.0-fix-libxml2-2.12.patch | 108 |
2 files changed, 162 insertions, 0 deletions
diff --git a/dev-libs/yaz/files/yaz-5.34.0-fix-atoi-header.patch b/dev-libs/yaz/files/yaz-5.34.0-fix-atoi-header.patch new file mode 100644 index 000000000000..c68b85c7017e --- /dev/null +++ b/dev-libs/yaz/files/yaz-5.34.0-fix-atoi-header.patch @@ -0,0 +1,54 @@ +https://bugs.gentoo.org/923291 +https://github.com/indexdata/yaz/issues/104 +https://github.com/indexdata/yaz/pull/105 + +From 3c61afce2c2517369c2bf1ba6846ff17f81c4b18 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka@fedoraproject.org> +Date: Tue, 21 Nov 2023 23:47:18 +0900 +Subject: [PATCH] FIX: fix build error with glibc 2.39 + +glibc 2.39 does some refactoring for header file inclusion +and some additional header inclusion is needed for yaz +source. + +Closes #104 . +--- a/src/record_conv.c ++++ b/src/record_conv.c +@@ -11,6 +11,7 @@ + #include <config.h> + #endif + ++#include <stdlib.h> + #include <string.h> + #include <yaz/log.h> + #include <yaz/yaz-iconv.h> +--- a/src/xmlquery.c ++++ b/src/xmlquery.c +@@ -10,6 +10,7 @@ + #endif + + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + #include <assert.h> + +--- a/test/test_record_conv.c ++++ b/test/test_record_conv.c +@@ -9,6 +9,7 @@ + #include <yaz/record_conv.h> + #include <yaz/test.h> + #include <yaz/wrbuf.h> ++#include <stdlib.h> + #include <string.h> + #include <yaz/log.h> + #include <yaz/proto.h> +--- a/test/test_retrieval.c ++++ b/test/test_retrieval.c +@@ -9,6 +9,7 @@ + #include <yaz/retrieval.h> + #include <yaz/test.h> + #include <yaz/wrbuf.h> ++#include <stdlib.h> + #include <string.h> + #include <yaz/log.h> + #include <yaz/oid_db.h> diff --git a/dev-libs/yaz/files/yaz-5.34.0-fix-libxml2-2.12.patch b/dev-libs/yaz/files/yaz-5.34.0-fix-libxml2-2.12.patch new file mode 100644 index 000000000000..379d15e4ab2d --- /dev/null +++ b/dev-libs/yaz/files/yaz-5.34.0-fix-libxml2-2.12.patch @@ -0,0 +1,108 @@ +https://bugs.gentoo.org/917537 +https://github.com/indexdata/yaz/issues/102 +https://github.com/indexdata/yaz/pull/103 + +From b10643c42ea64b1ee09fe53aec2490129f903bcb Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka@fedoraproject.org> +Date: Tue, 21 Nov 2023 23:39:48 +0900 +Subject: [PATCH] FIX: fix build error with libxml2 2.12.0 + +libxml2 2.12.0 changed which header file to define functions +and header inclusion. Due to this refactoring, some yaz source +files need additional inclusion of libxml2 header file, +especially for libxml/parser.h . + +Closes #102 . +--- a/client/client.c ++++ b/client/client.c +@@ -73,6 +73,10 @@ + #include <readline/history.h> + #endif + ++#if YAZ_HAVE_XML2 ++#include <libxml/parser.h> ++#endif ++ + + #include "admin.h" + #include "tabcomplete.h" +--- a/src/record_render.c ++++ b/src/record_render.c +@@ -23,6 +23,7 @@ + #include <yaz/base64.h> + + #if YAZ_HAVE_XML2 ++#include <libxml/parser.h> + #include <libxml/xpath.h> + #include <libxml/xpathInternals.h> + #endif +--- a/test/test_ccl.c ++++ b/test/test_ccl.c +@@ -11,6 +11,9 @@ + #include <yaz/log.h> + #include <yaz/test.h> + ++#if YAZ_HAVE_XML2 ++#include <libxml/parser.h> ++#endif + + static int tst_ccl_query(CCL_bibset bibset, + const char *query, +--- a/test/test_icu.c ++++ b/test/test_icu.c +@@ -28,6 +28,7 @@ + #endif + + #if YAZ_HAVE_XML2 ++#include <libxml/parser.h> + #include <libxml/xmlmemory.h> + #endif + +--- a/test/test_xml_include.c ++++ b/test/test_xml_include.c +@@ -12,6 +12,9 @@ + + #include <yaz/xml_include.h> + #include <yaz/test.h> ++#if YAZ_HAVE_XML2 ++#include <libxml/parser.h> ++#endif + + static void tst_xml_include1(void) + { +--- a/util/cclsh.c ++++ b/util/cclsh.c +@@ -20,6 +20,9 @@ + #include <readline/history.h> + #endif + ++#if YAZ_HAVE_XML2 ++#include <libxml/parser.h> ++#endif + + static int debug = 0; + static char *prog; +--- a/util/yaz-icu.c ++++ b/util/yaz-icu.c +@@ -17,6 +17,8 @@ + + #if YAZ_HAVE_ICU + ++#include <libxml/parser.h> ++ + #include <unicode/ucnv.h> + #include <unicode/ustring.h> + #include <unicode/ucol.h> +--- a/util/yaz-record-conv.c ++++ b/util/yaz-record-conv.c +@@ -13,6 +13,10 @@ + #include <yaz/record_conv.h> + #include <yaz/backtrace.h> + ++#if YAZ_HAVE_XML2 ++#include <libxml/parser.h> ++#endif ++ + const char *prog = "yaz-record-conv"; + + static void usage(void) |