diff options
| author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2023-09-21 20:23:26 +0900 |
|---|---|---|
| committer | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2023-09-25 09:20:24 +0200 |
| commit | 6acdde8006e6b59758b00bc178f15f32796a1987 (patch) | |
| tree | bfb30d1b48bfac98e977329a6c7b51cd51792535 /external | |
| parent | d6a1324380cc8362d509a1f29dcd2ca4ad4bee9d (diff) | |
upload libwps 0.4.14
Change-Id: I0d10aafa17afaaef9b154255bf17638dd67070e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157149
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
Diffstat (limited to 'external')
| -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 |
3 files changed, 9 insertions, 9 deletions
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" |