commit ee6734ec91f2e84d919fd1218a485b18544d83b5 Author: Tim Biermann <tbier@posteo.de> Date: Sat Jan 28 15:46:34 2023 +0100 libmwaw: pulled patches from libreoffice diff --git a/libmwaw/.footprint b/libmwaw/.footprint index aa6fc2383..6d016e141 100644 --- a/libmwaw/.footprint +++ b/libmwaw/.footprint @@ -10,12 +10,12 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/libmwaw-0.3/ drwxr-xr-x root/root usr/include/libmwaw-0.3/libmwaw/ --rw-r--r-- root/root usr/include/libmwaw-0.3/libmwaw/libmwaw.hxx -rw-r--r-- root/root usr/include/libmwaw-0.3/libmwaw/MWAWDocument.hxx +-rw-r--r-- root/root usr/include/libmwaw-0.3/libmwaw/libmwaw.hxx drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/libmwaw-0.3-lo.so.3 -> libmwaw-0.3-lo.so.3.0.21 +-rwxr-xr-x root/root usr/lib/libmwaw-0.3-lo.so.3.0.21 -rwxr-xr-x root/root usr/lib/libmwaw-0.3.la --rwxr-xr-x root/root usr/lib/libmwaw-0.3.so.3.0.21 -lrwxrwxrwx root/root usr/lib/libmwaw-0.3.so.3 -> libmwaw-0.3.so.3.0.21 -lrwxrwxrwx root/root usr/lib/libmwaw-0.3.so -> libmwaw-0.3.so.3.0.21 +lrwxrwxrwx root/root usr/lib/libmwaw-0.3.so -> libmwaw-0.3-lo.so.3.0.21 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libmwaw-0.3.pc diff --git a/libmwaw/.signature b/libmwaw/.signature index add2ea3e6..2bb292f70 100644 --- a/libmwaw/.signature +++ b/libmwaw/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zNjxA/0I3+LrstcQ4XYIM0KXcBdsBdUbhD54u5dshCKmM8pcydmmPO8U+ouockENp55+VqF6MsQRpUULRoJbQo= -SHA256 (Pkgfile) = 48a1a2b076bbd68fab590e52af7bbf7aadf62e22988fd2ae54a16280f2307504 -SHA256 (.footprint) = 1a20535503d820057c3dde822a1954fe0a45738cbbb63da70cfa740ee1510c4c +RWSagIOpLGJF3wiZxNctN2xwLzfzuFnW8SQd5xUegaJc5+QHUenr5bS36Y0sSD7KyunZkfyJnyx9mDSsCibhxXtHFY/1KthNiA0= +SHA256 (Pkgfile) = 343b903bf0107eed9c3c2b1b38f5a63e1658d964031d9ee6608992f4efe57bb3 +SHA256 (.footprint) = 8ec1d113a69f19a41db4c8632eeb6bf0baab7d639d113dde66c7532d70502fad SHA256 (libmwaw-0.3.21.tar.xz) = e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c +SHA256 (libmwaw-bundled-soname.patch.0) = d7d85506d123eb64acb4e658fb5a61767d5ad78b71994fa0a7850804fa4c2843 +SHA256 (rpath.patch) = b4453ed227905aec35f5502b820a127066b2ae13ed26680eada0f9527117da84 diff --git a/libmwaw/Pkgfile b/libmwaw/Pkgfile index 84c392f16..7deaad84b 100644 --- a/libmwaw/Pkgfile +++ b/libmwaw/Pkgfile @@ -5,13 +5,20 @@ name=libmwaw version=0.3.21 -release=1 -source=(https://sourceforge.net/projects/$name/files/$name/$name-$version/$name-$ver...) +release=2 +source=(https://sourceforge.net/projects/$name/files/$name/$name-$version/$name-$ver... + libmwaw-bundled-soname.patch.0 + rpath.patch) build() { cd $name-$version + + patch -Np0 -i $SRC/libmwaw-bundled-soname.patch.0 + patch -Np0 -i $SRC/rpath.patch + ./configure --prefix=/usr make make DESTDIR=$PKG install + rm -fr $PKG/usr/share } diff --git a/libmwaw/libmwaw-bundled-soname.patch.0 b/libmwaw/libmwaw-bundled-soname.patch.0 new file mode 100644 index 000000000..31f5c75cb --- /dev/null +++ b/libmwaw/libmwaw-bundled-soname.patch.0 @@ -0,0 +1,14 @@ +--- src/lib/Makefile.in.orig 2015-08-07 14:04:47.646611627 +0200 ++++ src/lib/Makefile.in 2015-08-07 14:25:49.888589996 +0200 +@@ -418,8 +418,8 @@ + AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) \ + $(ZLIB_CFLAGS) $(am__append_1) + libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) $(ZLIB_LIBS) @LIBMWAW_WIN32_RESOURCE@ +-libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_DEPENDENCIES = @LIBMWAW_WIN32_RESOURCE@ +-libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined ++libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_DEPENDENCIES = @LIBMWAW_WIN32_RESOURCE@ ++libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo + libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_SOURCES = \ + libmwaw_internal.cxx \ + libmwaw_internal.hxx \ + diff --git a/libmwaw/rpath.patch b/libmwaw/rpath.patch new file mode 100644 index 000000000..a73d8ae22 --- /dev/null +++ b/libmwaw/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -15353,6 +15353,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*)