commit e88f0a703bfcd7e5bfbd12fa6c6b05e9c1dff386 Author: Tim Biermann <tbier@posteo.de> Date: Sat Jan 28 15:46:05 2023 +0100 redland: pulled patches from libreoffice diff --git a/redland/.footprint b/redland/.footprint index 2178eabf4..8763ed086 100644 --- a/redland/.footprint +++ b/redland/.footprint @@ -1,8 +1,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/rdfproc -rwxr-xr-x root/root usr/bin/redland-config --rwxr-xr-x root/root usr/bin/redland-db-upgrade drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/librdf.h -rw-r--r-- root/root usr/include/rdf_concepts.h @@ -26,11 +24,11 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/rdf_utf8.h -rw-r--r-- root/root usr/include/redland.h drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/librdf-lo.so.0 -> librdf-lo.so.0.0.0 +-rwxr-xr-x root/root usr/lib/librdf-lo.so.0.0.0 -rw-r--r-- root/root usr/lib/librdf.a -rwxr-xr-x root/root usr/lib/librdf.la -lrwxrwxrwx root/root usr/lib/librdf.so -> librdf.so.0.0.0 -lrwxrwxrwx root/root usr/lib/librdf.so.0 -> librdf.so.0.0.0 --rwxr-xr-x root/root usr/lib/librdf.so.0.0.0 +lrwxrwxrwx root/root usr/lib/librdf.so -> librdf-lo.so.0.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/redland.pc drwxr-xr-x root/root usr/lib/redland/ @@ -43,9 +41,7 @@ drwxr-xr-x root/root usr/lib/redland/ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ --rw-r--r-- root/root usr/share/man/man1/rdfproc.1.gz -rw-r--r-- root/root usr/share/man/man1/redland-config.1.gz --rw-r--r-- root/root usr/share/man/man1/redland-db-upgrade.1.gz drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/redland.3.gz drwxr-xr-x root/root usr/share/redland/ diff --git a/redland/.signature b/redland/.signature index 7e4257779..12ff6c065 100644 --- a/redland/.signature +++ b/redland/.signature @@ -1,6 +1,10 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF34NlP0cf7WmRF1Zoeeo5Z5cM7efvQKDe6v5MorIyx+EiPtO0hwX4hqZDJNiXQRCx0LI9Pk9f9h5Ro6/x5/w+xQ4= -SHA256 (Pkgfile) = 8b1a968b9e31e9e5d405df49beaab0ed40075fc0bcb1332f8115ade4b94d4899 -SHA256 (.footprint) = e6424d4c371660a45c53aa774c57ec69093b0d7e3bb049700e818910b950fd04 +RWSagIOpLGJF31ZazyNRy7kWmlfQzNuv1AwYlfR6mE6vBTkiPUJUMWa5crs009waIG1Y8BCPewPDATGzGkpj8rAN+a3NpNGGPgw= +SHA256 (Pkgfile) = dd62e6f422985b59fe65e04fad3761fbbd3d152f37819b770c9232c81821d1df +SHA256 (.footprint) = 14c3f9144d999eaa81094c035c78312b7b59f3d96bd93fca842ae968c674eb58 SHA256 (redland-1.0.17.tar.gz) = de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681 -SHA256 (rpath.diff) = 9ddf9f7581f5194d73ad908f3b26354c70d3079a7a87c8add8a0d0e4c6974fec +SHA256 (libtool.patch) = 6234df68001f6b8df208f1c8604a5521515396dfc9da6a554e8bfacf8b4b002b +SHA256 (redland-bundled-soname.patch.1) = 1751f7e0f4f681ef1d415e10ead71f3dab1ef69446cf180625ca4d7f7e7fcce6 +SHA256 (redland-format.patch.0) = 5be4597b4991124f831d77acabdf465258c626d8436d46bdc74b853295852ac2 +SHA256 (redland-xcompile.patch.1) = f5d2013abfaeb1207424443f5eb8385cd07ec3b6ef2826bb589199961c1e4322 +SHA256 (rpath.patch) = b9e04cf4f178f57c2ddf97912abf0deb02032235222688b5ad190e08e94f14e1 diff --git a/redland/Pkgfile b/redland/Pkgfile index 2eff51557..f6744a9af 100644 --- a/redland/Pkgfile +++ b/redland/Pkgfile @@ -6,18 +6,29 @@ name=redland version=1.0.17 -release=2 -source=(http://download.librdf.org/source/$name-$version.tar.gz rpath.diff) +release=3 +source=(http://download.librdf.org/source/$name-$version.tar.gz + libtool.patch + redland-bundled-soname.patch.1 + redland-format.patch.0 + redland-xcompile.patch.1 + rpath.patch) build() { cd $name-$version + + patch -Np0 -i $SRC/libtool.patch + patch -Np1 -i $SRC/redland-bundled-soname.patch.1 + patch -Np0 -i $SRC/redland-format.patch.0 + patch -Np1 -i $SRC/redland-xcompile.patch.1 + patch -Np0 -i $SRC/rpath.patch + ./configure --prefix=/usr \ --enable-release \ --with-raptor=system \ --with-rasqal=system \ --with-sqlite=3 \ --with-bdb=no - patch -Np0 -i $SRC/rpath.diff make make DESTDIR=$PKG install rm -r $PKG/usr/share/gtk-doc diff --git a/redland/libtool.patch b/redland/libtool.patch new file mode 100644 index 000000000..b0baae661 --- /dev/null +++ b/redland/libtool.patch @@ -0,0 +1,27 @@ +--- build/ltmain.sh ++++ build/ltmain.sh +@@ -5301,6 +5301,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -5639,6 +5645,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue diff --git a/redland/redland-bundled-soname.patch.1 b/redland/redland-bundled-soname.patch.1 new file mode 100644 index 000000000..867cd81e2 --- /dev/null +++ b/redland/redland-bundled-soname.patch.1 @@ -0,0 +1,13 @@ +rhbz#809466 change soname of bundled redland libs + +--- a/src/Makefile.in 2013-03-30 17:43:48.127008037 +0100 ++++ b/src/Makefile.in 2013-03-30 17:44:19.294007769 +0100 +@@ -625,7 +625,7 @@ + rdf_parser_raptor.c + + EXTRA_DIST = redland.spec redland.spec.in mysql-v1.ttl mysql-v2.ttl +-librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ \ ++librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -release lo \ + @LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@ + + pkgdata_DATA = $(am__append_13) diff --git a/redland/redland-format.patch.0 b/redland/redland-format.patch.0 new file mode 100644 index 000000000..7bd62a8bb --- /dev/null +++ b/redland/redland-format.patch.0 @@ -0,0 +1,10 @@ +--- src/rdf_log.c ++++ src/rdf_log.c +@@ -136,6 +136,7 @@ + char *buffer = LIBRDF_MALLOC(char*, slocator_len + 2); + *buffer=' '; + raptor_locator_format(buffer + 1, slocator_len, (raptor_locator*)locator); ++ buffer[slocator_len + 1] = '\0'; + fputs(buffer, stderr); + LIBRDF_FREE(char*, buffer); + } diff --git a/redland/redland-xcompile.patch.1 b/redland/redland-xcompile.patch.1 new file mode 100644 index 000000000..2635359e7 --- /dev/null +++ b/redland/redland-xcompile.patch.1 @@ -0,0 +1,15 @@ +No point in creating example or util executables when cross-compiling. +(Especially as doing it anyway wouldn't work without tweaks to have it find +libxml2 and libm, at least for Android.) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -395,7 +395,7 @@ + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc + + # Subdirectories to build/install/distribute etc. +-SUBDIRS = $(subdirs) src examples utils demos docs data scripts ++SUBDIRS = $(subdirs) src docs data scripts + EXTRA_DIST = \ + ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \ + ChangeLog.5 ChangeLog.6 ChangeLog.7 ChangeLog.8 ChangeLog.9 ChangeLog.10 \ diff --git a/redland/rpath.diff b/redland/rpath.diff deleted file mode 100644 index 831bc80ed..000000000 --- a/redland/rpath.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- libtool 2011-02-20 10:46:47.000000000 +0100 -+++ libtool.new 2011-02-20 10:52:58.285764909 +0100 -@@ -324,7 +324,7 @@ - - # Flag to hardcode $libdir into a binary during linking. - # This must work even if $libdir does not exist --hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir" -+hardcode_libdir_flag_spec=" " - - # If ld is used when linking, flag to hardcode $libdir into a binary - # during linking. This must work even if $libdir does not exist. diff --git a/redland/rpath.patch b/redland/rpath.patch new file mode 100644 index 000000000..ec8c765d5 --- /dev/null +++ b/redland/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -10308,6 +10308,7 @@ + else + ld_shlibs=no + fi ++hardcode_libdir_flag_spec= + ;; + + netbsd* | netbsdelf*-gnu)