commit cbe5e44c0cf0939cfddae17ec4b063c0554e4c9e Author: Tim Biermann <tbier@posteo.de> Date: Sat Jan 28 14:59:36 2023 +0100 libwpd: pulled patches from libreoffice diff --git a/libwpd/.footprint b/libwpd/.footprint index ab34925e6..ace6da018 100644 --- a/libwpd/.footprint +++ b/libwpd/.footprint @@ -9,9 +9,9 @@ drwxr-xr-x root/root usr/include/libwpd-0.10/libwpd/ -rw-r--r-- root/root usr/include/libwpd-0.10/libwpd/WPDocument.h -rw-r--r-- root/root usr/include/libwpd-0.10/libwpd/libwpd.h drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/libwpd-0.10-lo.so.10 -> libwpd-0.10-lo.so.10.0.3 +-rwxr-xr-x root/root usr/lib/libwpd-0.10-lo.so.10.0.3 -rwxr-xr-x root/root usr/lib/libwpd-0.10.la -lrwxrwxrwx root/root usr/lib/libwpd-0.10.so -> libwpd-0.10.so.10.0.3 -lrwxrwxrwx root/root usr/lib/libwpd-0.10.so.10 -> libwpd-0.10.so.10.0.3 --rwxr-xr-x root/root usr/lib/libwpd-0.10.so.10.0.3 +lrwxrwxrwx root/root usr/lib/libwpd-0.10.so -> libwpd-0.10-lo.so.10.0.3 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libwpd-0.10.pc diff --git a/libwpd/.signature b/libwpd/.signature index 531811901..a2e5e4f66 100644 --- a/libwpd/.signature +++ b/libwpd/.signature @@ -1,6 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36gvZOaQ8VzgKoTeRblbHtU85tMkouznqdkkI7OqgVEtWUGiwWkt+tUXS5CKTDtQntLr3Q1kFKIBUzQGnBEhcAI= -SHA256 (Pkgfile) = 01efaad6072f7870b6c64a6f3eed65859a3412355a0bca1ec31a22044cefeb29 -SHA256 (.footprint) = f618b3f2517df0f6b5ea1affa828d4a7491ef95541fa3eb7a6e5c8c60e348952 +RWSagIOpLGJF3zb8zqfgnpNj+eJqSgZPwriYeETLqfJx6lamiPOhaZwRoKjSF4wNUFRqQM8kRYN5jBl78ElBERBItmdIaUrZnA8= +SHA256 (Pkgfile) = 66ee26188371f589d2203781286ee90849640c57fbc5a8be1f30bc95d4046ae3 +SHA256 (.footprint) = 1d6410b90c76d957843dffb60847ff00da5a64c9f1e54340d2dfbfa925cbe5a5 SHA256 (libwpd-0.10.3.tar.xz) = 2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09 SHA256 (gcc11.patch) = 7612c36e5e16df2b786fc4c905f096a6e7d600aade292e91950607bfbfba6c32 +SHA256 (include.patch) = 6aaf775b160e05bcb6ff9d0f6c1dc05ccb337d49efe76ec4078b8acfc207fa42 +SHA256 (libwpd-bundled-soname.patch.0) = 22589eecd0e6128f03dc3650baee2bd4dddb93cadcc52da9a9192dcdc353cdf0 +SHA256 (rpath.patch) = 9a6fe23afbc0453ce920335ed680320c6d6436a887a2a486c3cdd688311687fb diff --git a/libwpd/Pkgfile b/libwpd/Pkgfile index 908870b84..d2492e724 100644 --- a/libwpd/Pkgfile +++ b/libwpd/Pkgfile @@ -5,14 +5,20 @@ name=libwpd version=0.10.3 -release=1 +release=2 source=(https://downloads.sourceforge.net/project/libwpd/libwpd/$name-$version/$name... - gcc11.patch) + gcc11.patch + include.patch + libwpd-bundled-soname.patch.0 + rpath.patch) build() { cd $name-$version patch -Np1 -i $SRC/gcc11.patch + patch -Np0 -i $SRC/include.patch + patch -Np0 -i $SRC/libwpd-bundled-soname.patch.0 + patch -Np0 -i $SRC/rpath.patch ./configure --prefix=/usr \ --without-docs diff --git a/libwpd/include.patch b/libwpd/include.patch new file mode 100644 index 000000000..57f52b4b0 --- /dev/null +++ b/libwpd/include.patch @@ -0,0 +1,10 @@ +--- src/lib/WPXTable.h ++++ src/lib/WPXTable.h +@@ -36,6 +36,7 @@ + #ifndef _WPXTABLE_H + #define _WPXTABLE_H + ++#include <stddef.h> + #include <vector> + + struct WPXTableCell diff --git a/libwpd/libwpd-bundled-soname.patch.0 b/libwpd/libwpd-bundled-soname.patch.0 new file mode 100644 index 000000000..ad7cc3fb4 --- /dev/null +++ b/libwpd/libwpd-bundled-soname.patch.0 @@ -0,0 +1,11 @@ +--- src/lib/Makefile.in.orig 2015-08-06 21:41:41.073622494 +0200 ++++ src/lib/Makefile.in 2015-08-06 21:42:09.377622009 +0200 +@@ -429,7 +429,7 @@ + -DLIBWPD_BUILD=1 $(am__append_1) + libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) @LIBWPD_WIN32_RESOURCE@ + libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPD_WIN32_RESOURCE@ +-libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) ++libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) -release lo + libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_SOURCES = \ + libwpd_internal.cpp \ + libwpd_math.cpp \ diff --git a/libwpd/rpath.patch b/libwpd/rpath.patch new file mode 100644 index 000000000..fb3deaa81 --- /dev/null +++ b/libwpd/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -13850,6 +13850,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*)