commit 32a43e35a21c8925d82269ab674b485de7f353ce Author: Tim Biermann <tbier@posteo.de> Date: Sat Jan 28 14:57:21 2023 +0100 libwpg: pulled patches from libreoffice diff --git a/libwpg/.footprint b/libwpg/.footprint index 18275cd33..b407b0bf7 100644 --- a/libwpg/.footprint +++ b/libwpg/.footprint @@ -9,9 +9,9 @@ drwxr-xr-x root/root usr/include/libwpg-0.3/libwpg/ -rw-r--r-- root/root usr/include/libwpg-0.3/libwpg/WPGraphics.h -rw-r--r-- root/root usr/include/libwpg-0.3/libwpg/libwpg.h drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/libwpg-0.3-lo.so.3 -> libwpg-0.3-lo.so.3.0.3 +-rwxr-xr-x root/root usr/lib/libwpg-0.3-lo.so.3.0.3 -rwxr-xr-x root/root usr/lib/libwpg-0.3.la -lrwxrwxrwx root/root usr/lib/libwpg-0.3.so -> libwpg-0.3.so.3.0.3 -lrwxrwxrwx root/root usr/lib/libwpg-0.3.so.3 -> libwpg-0.3.so.3.0.3 --rwxr-xr-x root/root usr/lib/libwpg-0.3.so.3.0.3 +lrwxrwxrwx root/root usr/lib/libwpg-0.3.so -> libwpg-0.3-lo.so.3.0.3 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libwpg-0.3.pc diff --git a/libwpg/.signature b/libwpg/.signature index 981a7b46f..bd20aae1c 100644 --- a/libwpg/.signature +++ b/libwpg/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+hde5VKtyz+W0DOr1/fIe+WdD7WhUL/EhcaVDzd2RSLLKMMeXUFfczcIMLIQPTkbUhv76VLG/FeoFNzl0/z/QI= -SHA256 (Pkgfile) = 3c4e67b90b18c3f580ed908284f75b4989fdb492e175256c1c16be71aee78809 -SHA256 (.footprint) = 946dbbdf181b254a718be204d6738d9441f15e8d55615dbcfe2c65b14a2100a3 +RWSagIOpLGJF3yQ2Fhn8652PfHEayEdes8e9JCqdjSemO/JhzmTUbZJyye2O/zLpLi977RsIRNICn2J34up29bBxywk/DlgH/g0= +SHA256 (Pkgfile) = a17404ccf9de119ef37a56dddb2bfa7e276c2c3949f31b7cb8390132e97189e9 +SHA256 (.footprint) = ebc54bd460c72c4707c302eee0f8ca75c813a7615f9ccb51b6245ee275bece53 SHA256 (libwpg-0.3.3.tar.xz) = 99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c +SHA256 (libwpg-bundled-soname.patch.0) = b04c5ec409cee6d4c7eedf53ee51861a125215047657c0693d56af120821e28d +SHA256 (rpath.patch) = 767e75eaaf26439a8685f8ef97083a09aec22d53c15279714329d28233ae65ef diff --git a/libwpg/Pkgfile b/libwpg/Pkgfile index b6920ee5c..7c6274541 100644 --- a/libwpg/Pkgfile +++ b/libwpg/Pkgfile @@ -1,15 +1,21 @@ # Description: Library for importing and converting Corel WordPerfect(tm) Graphics images # URL: http://libwpg.sourceforge.net/ # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: libwpd zlib +# Depends on: libwpd name=libwpg version=0.3.3 -release=1 -source=(https://downloads.sourceforge.net/project/libwpg/libwpg/$name-$version/$name...) +release=2 +source=(https://downloads.sourceforge.net/project/libwpg/libwpg/$name-$version/$name... + libwpg-bundled-soname.patch.0 + rpath.patch) build() { cd $name-$version + + patch -Np0 -i $SRC/libwpg-bundled-soname.patch.0 + patch -Np0 -i $SRC/rpath.patch + ./configure --prefix=/usr make make DESTDIR=$PKG install diff --git a/libwpg/libwpg-bundled-soname.patch.0 b/libwpg/libwpg-bundled-soname.patch.0 new file mode 100644 index 000000000..e0bfc5980 --- /dev/null +++ b/libwpg/libwpg-bundled-soname.patch.0 @@ -0,0 +1,11 @@ +--- src/lib/Makefile.in.orig 2015-08-06 21:30:41.615633795 +0200 ++++ src/lib/Makefile.in 2015-08-06 21:31:03.764633415 +0200 +@@ -357,7 +357,7 @@ + $(DEBUG_CXXFLAGS) -DLIBWPG_BUILD=1 $(am__append_1) + libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LIBADD = $(WPD_LIBS) $(REVENGE_LIBS) @LIBWPG_WIN32_RESOURCE@ + libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPG_WIN32_RESOURCE@ +-libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined ++libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo + libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_SOURCES = \ + WPG1Parser.cpp \ + WPG1Parser.h \ diff --git a/libwpg/rpath.patch b/libwpg/rpath.patch new file mode 100644 index 000000000..5a8f56105 --- /dev/null +++ b/libwpg/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -13858,6 +13858,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*)