mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
raptor: update to 2.0.16.
This commit is contained in:
parent
39089db78a
commit
fcc5460322
4 changed files with 34 additions and 59 deletions
|
@ -0,0 +1,31 @@
|
||||||
|
From 4dbc4c1da2a033c497d84a1291c46f416a9cac51 Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Anes <david.anes@suse.com>
|
||||||
|
Date: Thu, 4 May 2023 11:54:02 +0200
|
||||||
|
Subject: [PATCH] Remove the access to entities 'checked' private symbol for
|
||||||
|
libxml2 2.11.0
|
||||||
|
|
||||||
|
Since version 2.11.0, some private symbols that were never intended
|
||||||
|
as public API/ABI have been removed from libxml2, therefore the field
|
||||||
|
'checked' is no longer present and raptor fails to build in this
|
||||||
|
scenario.
|
||||||
|
---
|
||||||
|
src/raptor_libxml.c | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c
|
||||||
|
index 538c2c8e..8bcee139 100644
|
||||||
|
--- a/src/raptor_libxml.c
|
||||||
|
+++ b/src/raptor_libxml.c
|
||||||
|
@@ -246,10 +246,11 @@ raptor_libxml_getEntity(void* user_data, const xmlChar *name)
|
||||||
|
|
||||||
|
ret->owner = 1;
|
||||||
|
|
||||||
|
-#if LIBXML_VERSION >= 20627
|
||||||
|
+#if LIBXML_VERSION >= 20627 && LIBXML_VERSION < 21100
|
||||||
|
/* Checked field was released in 2.6.27 on 2006-10-25
|
||||||
|
* http://git.gnome.org/browse/libxml2/commit/?id=a37a6ad91a61d168ecc4b29263def3363fff4da6
|
||||||
|
*
|
||||||
|
+ * and was later removed in version 2.11.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Mark this entity as having been checked - never do this again */
|
|
@ -1,40 +0,0 @@
|
||||||
From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dave Beckett <dave@dajobe.org>
|
|
||||||
Date: Sun, 16 Apr 2017 23:15:12 +0100
|
|
||||||
Subject: [PATCH] Calcualte max nspace declarations correctly for XML writer
|
|
||||||
|
|
||||||
(raptor_xml_writer_start_element_common): Calculate max including for
|
|
||||||
each attribute a potential name and value.
|
|
||||||
|
|
||||||
Fixes Issues #0000617 http://bugs.librdf.org/mantis/view.php?id=617
|
|
||||||
and #0000618 http://bugs.librdf.org/mantis/view.php?id=618
|
|
||||||
---
|
|
||||||
src/raptor_xml_writer.c | 7 ++++---
|
|
||||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
|
|
||||||
index 693b9468..0d3a36a5 100644
|
|
||||||
--- a/src/raptor_xml_writer.c
|
|
||||||
+++ b/src/raptor_xml_writer.c
|
|
||||||
@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
|
|
||||||
size_t nspace_declarations_count = 0;
|
|
||||||
unsigned int i;
|
|
||||||
|
|
||||||
- /* max is 1 per element and 1 for each attribute + size of declared */
|
|
||||||
if(nstack) {
|
|
||||||
- int nspace_max_count = element->attribute_count+1;
|
|
||||||
+ int nspace_max_count = element->attribute_count * 2; /* attr and value */
|
|
||||||
+ if(element->name->nspace)
|
|
||||||
+ nspace_max_count++;
|
|
||||||
if(element->declared_nspaces)
|
|
||||||
nspace_max_count += raptor_sequence_size(element->declared_nspaces);
|
|
||||||
if(element->xml_language)
|
|
||||||
@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- /* Add the attribute + value */
|
|
||||||
+ /* Add the attribute's value */
|
|
||||||
nspace_declarations[nspace_declarations_count].declaration=
|
|
||||||
raptor_qname_format_as_xml(element->attributes[i],
|
|
||||||
&nspace_declarations[nspace_declarations_count].length);
|
|
|
@ -1,16 +0,0 @@
|
||||||
Patch from https://bugs.librdf.org/mantis/view.php?id=650
|
|
||||||
|
|
||||||
diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
|
|
||||||
index 56993dc3..163f34d5 100644
|
|
||||||
--- a/src/raptor_xml_writer.c
|
|
||||||
+++ b/src/raptor_xml_writer.c
|
|
||||||
@@ -216,6 +216,9 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
|
|
||||||
|
|
||||||
if(nstack && element->attributes) {
|
|
||||||
for(i = 0; i < element->attribute_count; i++) {
|
|
||||||
+ if (nspace_declarations_count > element->attribute_count)
|
|
||||||
+ goto error;
|
|
||||||
+
|
|
||||||
/* qname */
|
|
||||||
if(element->attributes[i]->nspace) {
|
|
||||||
/* Check if we need a namespace declaration attribute */
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'raptor'
|
# Template file for 'raptor'
|
||||||
pkgname=raptor
|
pkgname=raptor
|
||||||
version=2.0.15
|
version=2.0.16
|
||||||
revision=4
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--disable-static --with-yajl=no"
|
configure_args="--disable-static --with-yajl=no"
|
||||||
hostmakedepends="pkg-config"
|
hostmakedepends="pkg-config"
|
||||||
|
@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="LGPL-2.1-or-later, GPL-2.0-or-later, Apache-2.0"
|
license="LGPL-2.1-or-later, GPL-2.0-or-later, Apache-2.0"
|
||||||
homepage="https://librdf.org/raptor"
|
homepage="https://librdf.org/raptor"
|
||||||
distfiles="https://librdf.org/dist/source/raptor2-${version}.tar.gz"
|
distfiles="https://librdf.org/dist/source/raptor2-${version}.tar.gz"
|
||||||
checksum=ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
|
checksum=089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680
|
||||||
|
|
||||||
libraptor_package() {
|
libraptor_package() {
|
||||||
short_desc+=" - Runtime libraries"
|
short_desc+=" - Runtime libraries"
|
||||||
|
|
Loading…
Add table
Reference in a new issue