commit 5efe55eb3fb65260f7fce25c2d2479097c29170d Author: Tim Biermann <tbier@posteo.de> Date: Sat Jan 28 14:55:17 2023 +0100 librevenge: pulled patches from libreoffice diff --git a/librevenge/.footprint b/librevenge/.footprint index d9886dcc8..000cb44e3 100644 --- a/librevenge/.footprint +++ b/librevenge/.footprint @@ -36,10 +36,10 @@ drwxr-xr-x root/root usr/include/librevenge-0.0/librevenge/ -rw-r--r-- root/root usr/include/librevenge-0.0/librevenge/librevenge-api.h -rw-r--r-- root/root usr/include/librevenge-0.0/librevenge/librevenge.h drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/librevenge-0.0-lo.so.0 -> librevenge-0.0-lo.so.0.0.5 +-rwxr-xr-x root/root usr/lib/librevenge-0.0-lo.so.0.0.5 -rwxr-xr-x root/root usr/lib/librevenge-0.0.la -lrwxrwxrwx root/root usr/lib/librevenge-0.0.so -> librevenge-0.0.so.0.0.5 -lrwxrwxrwx root/root usr/lib/librevenge-0.0.so.0 -> librevenge-0.0.so.0.0.5 --rwxr-xr-x root/root usr/lib/librevenge-0.0.so.0.0.5 +lrwxrwxrwx root/root usr/lib/librevenge-0.0.so -> librevenge-0.0-lo.so.0.0.5 -rwxr-xr-x root/root usr/lib/librevenge-generators-0.0.la lrwxrwxrwx root/root usr/lib/librevenge-generators-0.0.so -> librevenge-generators-0.0.so.0.0.5 lrwxrwxrwx root/root usr/lib/librevenge-generators-0.0.so.0 -> librevenge-generators-0.0.so.0.0.5 diff --git a/librevenge/.signature b/librevenge/.signature index 153b58f9f..655256d81 100644 --- a/librevenge/.signature +++ b/librevenge/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39AF7yZfx6liW5hLVFxnQ+Giuz8rc1GeA3EzJniZYbp5XQwt1LjP+vlUGuf26JmhSHRweUD8XMqLd2nRoHwlLwM= -SHA256 (Pkgfile) = 84bd69a5c94fa4e4f10649c4fb775cf68562572203ef43f3b9ae1c76d41e6416 -SHA256 (.footprint) = b120627ab72bb11b1d1ded1680c0a57ba80bb3dfc650662c4cc9e4e268b87b9c +RWSagIOpLGJF3xVDtNK3MLykrh9uYxheN87ikXik3C9Vay+tRo8ofXQCc8u1R2juyz2ldwjFCze4RcVjVW2rZvQbR/tVELvMYgE= +SHA256 (Pkgfile) = 21a158426cb7d10501dc670482236833c8b905f8e45349c08770123c0f2d3d5e +SHA256 (.footprint) = 0fa56bbfe9eb2fb0927003ff137826452deff632e517a5c59c823cdd02fff8d4 SHA256 (librevenge-0.0.5.tar.gz) = 04fd10d3eea39644c0d7231be9c6c174f3955c51a710266935e8c147e7045d9e +SHA256 (librevenge-bundled-soname.patch.0) = 0241ac930ebda70d845a89a4097de27d3821000e71df2f2d376f31e564750aa0 +SHA256 (rpath.patch) = d1493f120d14afcd6957491c01c97e1b381892ff77a523ac415bd2bdf2d10914 diff --git a/librevenge/Pkgfile b/librevenge/Pkgfile index e0cf57929..15b4a99e7 100644 --- a/librevenge/Pkgfile +++ b/librevenge/Pkgfile @@ -5,11 +5,17 @@ name=librevenge version=0.0.5 -release=1 -source=(https://sourceforge.net/projects/libwpd/files/librevenge/$name-$version/$nam...) +release=2 +source=(https://sourceforge.net/projects/libwpd/files/librevenge/$name-$version/$nam... + librevenge-bundled-soname.patch.0 + rpath.patch) build() { cd $name-$version + + patch -Np0 -i $SRC/librevenge-bundled-soname.patch.0 + patch -Np0 -i $SRC/rpath.patch + ./configure --prefix=/usr \ --disable-werror \ --without-docs diff --git a/librevenge/librevenge-bundled-soname.patch.0 b/librevenge/librevenge-bundled-soname.patch.0 new file mode 100644 index 000000000..d98630f0c --- /dev/null +++ b/librevenge/librevenge-bundled-soname.patch.0 @@ -0,0 +1,11 @@ +--- src/lib/Makefile.in.orig 2015-08-07 11:57:42.256742305 +0200 ++++ src/lib/Makefile.in 2015-08-07 11:58:11.818741799 +0200 +@@ -470,7 +470,7 @@ + $(am__append_2) + librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LIBADD = @LIBREVENGE_WIN32_RESOURCE@ + librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_DEPENDENCIES = @LIBREVENGE_WIN32_RESOURCE@ +-librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) ++librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) -release lo + librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_SOURCES = \ + RVNGBinaryData.cpp \ + RVNGMemoryStream.cpp \ diff --git a/librevenge/rpath.patch b/librevenge/rpath.patch new file mode 100644 index 000000000..c7d210080 --- /dev/null +++ b/librevenge/rpath.patch @@ -0,0 +1,11 @@ +--- configure ++++ configure +@@ -14983,6 +14983,8 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= ++runpath_var= + ;; + + lynxos*)