libwps: pulled patches from libreoffice

This commit is contained in:
Tim Biermann 2023-01-28 14:53:25 +01:00
parent f0106ca641
commit f61538656c
Signed by: tb
GPG Key ID: 42F8B4E30B673606
6 changed files with 52 additions and 8 deletions

View File

@ -12,9 +12,9 @@ drwxr-xr-x root/root usr/include/libwps-0.4/libwps/
-rw-r--r-- root/root usr/include/libwps-0.4/libwps/WPSDocument.h
-rw-r--r-- root/root usr/include/libwps-0.4/libwps/libwps.h
drwxr-xr-x root/root usr/lib/
lrwxrwxrwx root/root usr/lib/libwps-0.4-lo.so.4 -> libwps-0.4-lo.so.4.0.13
-rwxr-xr-x root/root usr/lib/libwps-0.4-lo.so.4.0.13
-rwxr-xr-x root/root usr/lib/libwps-0.4.la
lrwxrwxrwx root/root usr/lib/libwps-0.4.so -> libwps-0.4.so.4.0.13
lrwxrwxrwx root/root usr/lib/libwps-0.4.so.4 -> libwps-0.4.so.4.0.13
-rwxr-xr-x root/root usr/lib/libwps-0.4.so.4.0.13
lrwxrwxrwx root/root usr/lib/libwps-0.4.so -> libwps-0.4-lo.so.4.0.13
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libwps-0.4.pc

View File

@ -1,5 +1,8 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF36RpObJxvDzhdiG+YVCT4Js4bsHJNZGNaUizTsLg5hc8lgCz5aUpKBQ/nPQ3diamrKGhM0HYVuXyTGvm4LzyQgo=
SHA256 (Pkgfile) = 3245dcc596d32d9ae599bc198edaa502d9e3b8c3710f77d6eac6abf1f2bf8ddb
SHA256 (.footprint) = 48ab225a738d7cc7470b4cfbabec6769285daeffb6799f4fc13336646967e2de
RWSagIOpLGJF31SC2k3R9PbtK3oxOt6IWUZqn+afP+H2RyuwYBXo3i5UpvZG4Ko+UEU7ap4VKuU+Q5c3TqVlkJE5zOVRHZGlaQw=
SHA256 (Pkgfile) = fbcb09d936561187a3525a77a9f9592ccefee923fbf8b3353df94811f8273b2f
SHA256 (.footprint) = 331c42de76a77efc26363081131d82dbb05ece3d6f0a2b53d706626428a72531
SHA256 (libwps-0.4.13.tar.xz) = ce95afe6c030689779a2543a4834827666eee27c10d8a74860d8d172a956c40f
SHA256 (libtool.patch.0) = a190c0e5d642ebc16688dd433a3556b635f8dd3b15b330e37b62b2d84a8a44da
SHA256 (libwps-bundled-soname.patch.0) = 36f3058e6e60b5e85ed0f1cfc937d9580a9a29186fd27cf1a388adbab96a0f92
SHA256 (rpath.patch.0) = 20fe1c9b4ccb08a65711ee6fcd3bb5110d622a629cd9d4cde11ec2c0ab5ea3ad

View File

@ -5,11 +5,19 @@
name=libwps
version=0.4.13
release=1
source=(https://downloads.sourceforge.net/project/libwps/$name/$name-$version/$name-$version.tar.xz)
release=2
source=(https://downloads.sourceforge.net/project/libwps/$name/$name-$version/$name-$version.tar.xz
libtool.patch.0
libwps-bundled-soname.patch.0
rpath.patch.0)
build() {
cd $name-$version
patch -Np0 -i $SRC/libtool.patch.0
patch -Np0 -i $SRC/libwps-bundled-soname.patch.0
patch -Np0 -i $SRC/rpath.patch.0
./configure --prefix=/usr \
--without-docs
make

12
libwps/libtool.patch.0 Normal file
View File

@ -0,0 +1,12 @@
--- ltmain.sh.sav 2018-08-02 14:21:34.000000000 +0200
+++ ltmain.sh 2019-05-05 22:04:15.433588776 +0200
@@ -7277,7 +7277,8 @@ func_mode_link ()
# -stdlib=* select c++ std lib with clang
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+ -fuse-ld=*|--ld-path=*)
func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
func_append compile_command " $arg"

View File

@ -0,0 +1,11 @@
--- src/lib/Makefile.in.orig 2015-08-06 11:41:55.081239194 +0200
+++ src/lib/Makefile.in 2015-08-06 11:42:16.903238820 +0200
@@ -369,7 +369,7 @@
AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) -DBUILD_WPS=1
libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) @LIBWPS_WIN32_RESOURCE@
libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPS_WIN32_RESOURCE@
-libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
+libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo
libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_SOURCES = \
libwps_internal.cpp \
libwps_tools_win.h \

10
libwps/rpath.patch.0 Normal file
View File

@ -0,0 +1,10 @@
--- configure
+++ configure
@@ -14306,6 +14306,7 @@
esac
;;
esac
+hardcode_libdir_flag_spec_CXX=
;;
lynxos*)