diff options
-rw-r--r-- | meta-oe/recipes-support/raptor2/files/0001-Match-reutrn-type-from-RAPTOR_ASSERT_OBJECT_POINTER_.patch | 47 | ||||
-rw-r--r-- | meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch | 32 | ||||
-rw-r--r-- | meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb (renamed from meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb) | 7 |
3 files changed, 2 insertions, 84 deletions
diff --git a/meta-oe/recipes-support/raptor2/files/0001-Match-reutrn-type-from-RAPTOR_ASSERT_OBJECT_POINTER_.patch b/meta-oe/recipes-support/raptor2/files/0001-Match-reutrn-type-from-RAPTOR_ASSERT_OBJECT_POINTER_.patch deleted file mode 100644 index 4c1afb46e..000000000 --- a/meta-oe/recipes-support/raptor2/files/0001-Match-reutrn-type-from-RAPTOR_ASSERT_OBJECT_POINTER_.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 97b5dcaa6b221eb403cc92e953225d38aee18f70 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 1 Sep 2022 14:48:39 -0700 | ||
4 | Subject: [PATCH] Match reutrn type from | ||
5 | RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE | ||
6 | |||
7 | This ensures that integer type 0 is returned and not NULL | ||
8 | Fixes | ||
9 | raptor_serialize.c:243:66: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'int' [-Wint-conversion] | ||
10 | RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL); | ||
11 | ^~~~ | ||
12 | Upstream-Status: Pending | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | src/raptor_parse.c | 2 +- | ||
16 | src/raptor_serialize.c | 2 +- | ||
17 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/src/raptor_parse.c b/src/raptor_parse.c | ||
20 | index 26911f4..0091e1e 100644 | ||
21 | --- a/src/raptor_parse.c | ||
22 | +++ b/src/raptor_parse.c | ||
23 | @@ -257,7 +257,7 @@ raptor_world_get_parser_factory(raptor_world *world, const char *name) | ||
24 | int | ||
25 | raptor_world_get_parsers_count(raptor_world* world) | ||
26 | { | ||
27 | - RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL); | ||
28 | + RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, 0); | ||
29 | |||
30 | raptor_world_open(world); | ||
31 | |||
32 | diff --git a/src/raptor_serialize.c b/src/raptor_serialize.c | ||
33 | index a1f29d7..2bf4ab2 100644 | ||
34 | --- a/src/raptor_serialize.c | ||
35 | +++ b/src/raptor_serialize.c | ||
36 | @@ -240,7 +240,7 @@ raptor_get_serializer_factory(raptor_world* world, const char *name) | ||
37 | int | ||
38 | raptor_world_get_serializers_count(raptor_world* world) | ||
39 | { | ||
40 | - RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL); | ||
41 | + RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, 0); | ||
42 | |||
43 | raptor_world_open(world); | ||
44 | |||
45 | -- | ||
46 | 2.37.3 | ||
47 | |||
diff --git a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch deleted file mode 100644 index 490b61f1f..000000000 --- a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 3f97aac5a1f43ef57b02fb9ccdcadd41a6b69fa9 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Tue, 27 Oct 2015 10:21:24 +0100 | ||
4 | Subject: [PATCH] configure.ac: do additional checks on libxml2 also when | ||
5 | detected by pkg-config | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/dajobe/raptor/commit/e75b1dbb7f2a6514b8d391b200c45a2bec6268bf] | ||
11 | |||
12 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
13 | --- | ||
14 | configure.ac | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index 10ff870..35fa08e 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -601,7 +601,7 @@ have_libxml=0 | ||
22 | need_libxml=0 | ||
23 | |||
24 | oCPPFLAGS="$CPPFLAGS" | ||
25 | -if test "X$XML_CONFIG" != X; then | ||
26 | +if test "X$libxml_source" != X; then | ||
27 | CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS" | ||
28 | LIBS="$LIBS $LIBXML_LIBS" | ||
29 | AC_CHECK_FUNC(xmlCreatePushParserCtxt, have_xmlCreatePushParserCtxt=yes, have_xmlCreatePushParserCtxt=no) | ||
30 | -- | ||
31 | 2.1.0 | ||
32 | |||
diff --git a/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb index 22306a5c1..169911276 100644 --- a/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb +++ b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | SUMMARY = "Library for parsing and serializing RDF syntaxes" | 1 | SUMMARY = "Library for parsing and serializing RDF syntaxes" |
2 | LICENSE = "GPL-2.0-only | LGPL-2.1-only | Apache-2.0" | 2 | LICENSE = "GPL-2.0-only | LGPL-2.1-only | Apache-2.0" |
3 | LIC_FILES_CHKSUM = " \ | 3 | LIC_FILES_CHKSUM = " \ |
4 | file://LICENSE.txt;md5=b840e5ae3aeb897f45b473341348cd9c \ | 4 | file://LICENSE.txt;md5=f7fed8b6ab9289b77f5c14f3f79572cc \ |
5 | file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | 5 | file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ |
6 | file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ | 6 | file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ |
7 | file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | 7 | file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ |
@@ -11,11 +11,8 @@ DEPENDS = "libxml2 libxslt curl yajl" | |||
11 | 11 | ||
12 | SRC_URI = " \ | 12 | SRC_URI = " \ |
13 | http://download.librdf.org/source/${BPN}-${PV}.tar.gz \ | 13 | http://download.librdf.org/source/${BPN}-${PV}.tar.gz \ |
14 | file://0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch \ | ||
15 | file://0001-Match-reutrn-type-from-RAPTOR_ASSERT_OBJECT_POINTER_.patch \ | ||
16 | " | 14 | " |
17 | SRC_URI[md5sum] = "a39f6c07ddb20d7dd2ff1f95fa21e2cd" | 15 | SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680" |
18 | SRC_URI[sha256sum] = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed" | ||
19 | 16 | ||
20 | inherit autotools pkgconfig | 17 | inherit autotools pkgconfig |
21 | 18 | ||