commit 6440246e49ecf837a7a87d8336c3ef0618185383 Author: Tim Biermann <tbier@posteo.de> Date: Sat Jan 28 15:46:20 2023 +0100 liblangtag: pulled patches from libreoffice diff --git a/liblangtag/.footprint b/liblangtag/.footprint index 2d15ead75..569f0092e 100644 --- a/liblangtag/.footprint +++ b/liblangtag/.footprint @@ -32,10 +32,10 @@ drwxr-xr-x root/root usr/include/liblangtag/ -rw-r--r-- root/root usr/include/liblangtag/lt-variant.h -rw-r--r-- root/root usr/include/liblangtag/lt-xml.h drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/liblangtag-lo.so.1 -> liblangtag-lo.so.1.4.1 +-rwxr-xr-x root/root usr/lib/liblangtag-lo.so.1.4.1 -rwxr-xr-x root/root usr/lib/liblangtag.la -lrwxrwxrwx root/root usr/lib/liblangtag.so -> liblangtag.so.1.4.1 -lrwxrwxrwx root/root usr/lib/liblangtag.so.1 -> liblangtag.so.1.4.1 --rwxr-xr-x root/root usr/lib/liblangtag.so.1.4.1 +lrwxrwxrwx root/root usr/lib/liblangtag.so -> liblangtag-lo.so.1.4.1 drwxr-xr-x root/root usr/lib/liblangtag/ -rwxr-xr-x root/root usr/lib/liblangtag/liblangtag-ext-ldml-t.la -rwxr-xr-x root/root usr/lib/liblangtag/liblangtag-ext-ldml-t.so diff --git a/liblangtag/.signature b/liblangtag/.signature index 4f838f49f..49d1d87ef 100644 --- a/liblangtag/.signature +++ b/liblangtag/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37S8YmToOdUvgc9p/a1GUIJiIfdBCYSSUcfCQTakbh8IPvkPfl/qcS31/9IrcPGoI8lKDJhNvtwNU8ovAlnSGAQ= -SHA256 (Pkgfile) = e974a11cb539b30bc9f1c63b7e74551dbe4b83bbf650289d84b36aae7ffe34bc -SHA256 (.footprint) = 894adecf42dabe4fc00f2deb1a33195dba5a6cf71a6cfac0eed35747da765f94 +RWSagIOpLGJF3+Q5fkIANnwUqwniv5HWRMlLBGOTmli7xmwhh7BlnbXStroIw6xsEVHX75rl5KvQbYlFm4zc1LlHp2p51CZuNgU= +SHA256 (Pkgfile) = e51c695f31fc9fa6b2738c3c6b0ff15aabe93bfd7c509d64af721e654ffaa6a4 +SHA256 (.footprint) = ad246042a0bc407e233801442d67aeca954acf035f74fdc40e6fb6d8a70a1c17 SHA256 (liblangtag-0.6.4.tar.bz2) = 5701062c17d3e73ddaa49956cbfa5d47d2f8221988dec561c0af2118c1c8a564 +SHA256 (langtag-libtool-rpath.patch.0) = 09c5a1e0c921c951dcf42b41fcb3f0924cb5aaaa58621f3febc2e6e2555a7253 +SHA256 (liblangtag-bundled-soname.patch.0) = 1853ec446330302aa8612c66eeab79483cc4510c2a17d0e5b8958b710289c08f diff --git a/liblangtag/Pkgfile b/liblangtag/Pkgfile index 86fdc77cc..d17877737 100644 --- a/liblangtag/Pkgfile +++ b/liblangtag/Pkgfile @@ -5,13 +5,20 @@ name=liblangtag version=0.6.4 -release=1 -source=(https://bitbucket.org/tagoh/liblangtag/downloads/$name-$version.tar.bz2) +release=2 +source=(https://bitbucket.org/tagoh/liblangtag/downloads/$name-$version.tar.bz2 + langtag-libtool-rpath.patch.0 + liblangtag-bundled-soname.patch.0) build() { cd $name-$version + + patch -Np0 -i $SRC/langtag-libtool-rpath.patch.0 + patch -Np0 -i $SRC/liblangtag-bundled-soname.patch.0 + ./configure --prefix=/usr make make DESTDIR=$PKG install + rm -r $PKG/usr/share/gtk-doc } diff --git a/liblangtag/langtag-libtool-rpath.patch.0 b/liblangtag/langtag-libtool-rpath.patch.0 new file mode 100644 index 000000000..368832b8b --- /dev/null +++ b/liblangtag/langtag-libtool-rpath.patch.0 @@ -0,0 +1,23 @@ +Prevent libtool from adding annoying stuff to RPATH + +--- configure ++++ configure +@@ -10730,6 +10730,7 @@ + else + ld_shlibs=no + fi ++hardcode_libdir_flag_spec= + ;; + + netbsd*) +--- data/Makefile.in ++++ data/Makefile.in +@@ -859,7 +859,7 @@ + @CROSS_COMPILING_TRUE@language-subtag-registry.xml: language-subtag-registry reg2xml.c Makefile + @CROSS_COMPILING_TRUE@ @echo Warning: Unable to rebuild $@ when cross-compiling + @CROSS_COMPILING_FALSE@@REBUILD_DATA_TRUE@language-subtag-registry.xml: language-subtag-registry reg2xml$(EXEEXT) Makefile +-@CROSS_COMPILING_FALSE@@REBUILD_DATA_TRUE@ $(AM_V_GEN) $(builddir)/reg2xml$(EXEEXT) $(srcdir)/language-subtag-registry $@.tmp || $(builddir)/reg2xml$(EXEEXT) $(builddir)/language-subtag-registry $@.tmp; \ ++@CROSS_COMPILING_FALSE@@REBUILD_DATA_TRUE@ $(AM_V_GEN) $(LIBO_TUNNEL_LIBRARY_PATH) $(builddir)/reg2xml$(EXEEXT) $(srcdir)/language-subtag-registry $@.tmp || $(LIBO_TUNNEL_LIBRARY_PATH) $(builddir)/reg2xml$(EXEEXT) $(builddir)/language-subtag-registry $@.tmp; \ + @CROSS_COMPILING_FALSE@@REBUILD_DATA_TRUE@ head -1 $@.tmp | grep -E '^<\?xml version'>/dev/null 2>&1 && mv $@.tmp $@ || (echo "E: $@ isn't an expected result"; rm $@.tmp) + @CROSS_COMPILING_FALSE@@REBUILD_DATA_FALSE@language-subtag-registry.xml: + @CROSS_COMPILING_FALSE@@REBUILD_DATA_FALSE@ @echo Warning: the rebuild of $@ is explicitly disabled. diff --git a/liblangtag/liblangtag-bundled-soname.patch.0 b/liblangtag/liblangtag-bundled-soname.patch.0 new file mode 100644 index 000000000..4780d7a12 --- /dev/null +++ b/liblangtag/liblangtag-bundled-soname.patch.0 @@ -0,0 +1,10 @@ +--- liblangtag/Makefile.in.orig 2015-08-07 11:57:42.256742305 +0200 ++++ liblangtag/Makefile.in 2015-08-07 11:58:11.818741799 +0200 +@@ -638,6 +638,7 @@ + liblangtag_la_LDFLAGS = \ + $(LDFLAGS) \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ ++ -release lo \ + $(NULL) + + all: $(BUILT_SOURCES)