diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libwps/README | 2 | ||||
| -rw-r--r-- | external/libwps/inc/pch/precompiled_wps.hxx | 3 | ||||
| -rw-r--r-- | external/libwps/libtool.patch.0 | 13 |
5 files changed, 12 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 93e6bd11bfca..4931ad5bf4bc 100644 --- a/configure.ac +++ b/configure.ac @@ -9589,7 +9589,7 @@ libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10]) libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3]) libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4]) -libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.12]) +libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.14]) libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1]) diff --git a/download.lst b/download.lst index 1c65320be412..71ab2bd818d5 100644 --- a/download.lst +++ b/download.lst @@ -549,8 +549,8 @@ WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -WPS_SHA256SUM := e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb -WPS_VERSION_MICRO := 12 +WPS_SHA256SUM := 365b968e270e85a8469c6b160aa6af5619a4e6c995dbb04c1ecc1b4dd13e80de +WPS_VERSION_MICRO := 14 WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick diff --git a/external/libwps/README b/external/libwps/README index 3ce52187d520..1354aaa24db2 100644 --- a/external/libwps/README +++ b/external/libwps/README @@ -1 +1 @@ -Microsoft Works file word processor format import library from [http://libwps.sourceforge.net/]. +Microsoft Works file word processor format import library from [https://sourceforge.net/projects/libwps/]. diff --git a/external/libwps/inc/pch/precompiled_wps.hxx b/external/libwps/inc/pch/precompiled_wps.hxx index 77d92f7615b6..e25d81e9c6ca 100644 --- a/external/libwps/inc/pch/precompiled_wps.hxx +++ b/external/libwps/inc/pch/precompiled_wps.hxx @@ -13,13 +13,14 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-10-13 10:00:18 using: + Generated on 2023-09-21 20:32:22 using: ./bin/update_pch external/libwps wps --cutoff=1 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: ./bin/update_pch_bisect ./external/libwps/inc/pch/precompiled_wps.hxx "make external/libwps.build" --find-conflicts */ +#include <sal/config.h> #if PCH_LEVEL >= 1 #include <algorithm> #include <cassert> diff --git a/external/libwps/libtool.patch.0 b/external/libwps/libtool.patch.0 index cc4b08ba2147..bccd0ebdbc06 100644 --- a/external/libwps/libtool.patch.0 +++ b/external/libwps/libtool.patch.0 @@ -1,12 +1,11 @@ ---- 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 +--- ltmain.sh.sav 2023-05-03 21:29:15.000000000 +0900 ++++ ltmain.sh 2023-09-21 20:13:31.766938069 +0900 +@@ -7277,7 +7277,7 @@ func_mode_link () -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=*) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ +- -fsanitize=*) ++ -fsanitize=*|-fuse-ld=*|--ld-path=*) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" |