commit d79aca968bdda25f20dcbaa2196f683e957d8e7b Author: Tim Biermann <tbier@posteo.de> Date: Sun May 7 23:06:32 2023 +0200 raptor: build against libxml 2.11 diff --git a/raptor/.footprint b/raptor/.footprint index b488d7e35..268a2d9f9 100644 --- a/raptor/.footprint +++ b/raptor/.footprint @@ -6,7 +6,6 @@ drwxr-xr-x root/root usr/include/raptor2/ -rw-r--r-- root/root usr/include/raptor2/raptor.h -rw-r--r-- root/root usr/include/raptor2/raptor2.h drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libraptor2.a -rwxr-xr-x root/root usr/lib/libraptor2.la lrwxrwxrwx root/root usr/lib/libraptor2.so -> libraptor2.so.0.0.0 lrwxrwxrwx root/root usr/lib/libraptor2.so.0 -> libraptor2.so.0.0.0 diff --git a/raptor/.signature b/raptor/.signature index 1c8db814e..7815fd7fe 100644 --- a/raptor/.signature +++ b/raptor/.signature @@ -1,8 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF323F47a7rk7Q/vDG48PuPfKG5JPqX74vGrX3241+zY8U4dFFpkvN3zTJWywriYxo+te2qnwEFsiaGapMsfTqjwE= -SHA256 (Pkgfile) = 92c22a06d5f057b2648096be875ec9c843ee22bb79bb84eda52ee2427050532b -SHA256 (.footprint) = d17fbcd4efd58f95fa79560a96ec64dbbe01e47357edea3749b83357ad0d5c34 +RWSagIOpLGJF33s7TiOd/nWJYCENJ+96BC+hlkVccWWJJCNEibexZJYday2jqH1+VAYp38qV/xo8hVAd//d+ofSZXP751BUJcw0= +SHA256 (Pkgfile) = 98e7a233e283ea27124365258977f09a2b6878f95e98010d07f320a43a2d95c2 +SHA256 (.footprint) = ac4d81982c8ff72c65147e49a9860ca8a7d90ded8fc9ea3fba6ef6544b234738 SHA256 (raptor2-2.0.16.tar.gz) = 089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680 +SHA256 (libxml-2.11.0.patch) = 655628b6ab0dad1209c9055d8830127530cfbdff9e3fdff9bee1b3dbb710d0d9 SHA256 (libtool.patch) = 6234df68001f6b8df208f1c8604a5521515396dfc9da6a554e8bfacf8b4b002b SHA256 (rpath.patch) = ec14f0dea02f29f36e77e7da5d3eb780466bece2f2937cef82713e011758eb53 SHA256 (xml2-config.patch) = 7a9384a15a837f6b839cbb8a8e5054db2ef61b76adcdcbc521b6b651d6aa4cfb diff --git a/raptor/Pkgfile b/raptor/Pkgfile index 2c720ca2b..c8a5a505b 100644 --- a/raptor/Pkgfile +++ b/raptor/Pkgfile @@ -5,8 +5,9 @@ name=raptor version=2.0.16 -release=1 +release=2 source=(http://librdf.org/dist/source/raptor2-$version.tar.gz + libxml-2.11.0.patch libtool.patch rpath.patch xml2-config.patch) @@ -17,10 +18,14 @@ build() { patch -Np0 -i $SRC/libtool.patch patch -Np0 -i $SRC/rpath.patch patch -Np0 -i $SRC/xml2-config.patch + patch -Np1 -i $SRC/libxml-2.11.0.patch ./configure --prefix=/usr \ --with-yajl=no \ - --with-icu-config=/usr/bin/icu-config + --with-icu-config=/usr/bin/icu-config \ + --disable-static + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make make prefix="$PKG"/usr install diff --git a/raptor/libxml-2.11.0.patch b/raptor/libxml-2.11.0.patch new file mode 100644 index 000000000..372f2ac88 --- /dev/null +++ b/raptor/libxml-2.11.0.patch @@ -0,0 +1,17 @@ +this was removed in https://gitlab.gnome.org/GNOME/libxml2/-/commit/ce76ebfd1312459951d555ad9d87... +-- +diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c +index 538c2c8..f516021 100644 +--- a/src/raptor_libxml.c ++++ b/src/raptor_libxml.c +@@ -253,8 +253,8 @@ raptor_libxml_getEntity(void* user_data, const xmlChar *name) + */ + + /* Mark this entity as having been checked - never do this again */ +- if(!ret->checked) +- ret->checked = 1; ++ // if(!ret->checked) ++ // ret->checked = 1; + #endif + } +