diff options
| author | David Tardon <dtardon@redhat.com> | 2020-09-09 09:07:38 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2020-09-27 19:02:07 +0200 |
| commit | 61b05af30133622cc67304c694edad31ebff446c (patch) | |
| tree | 1196d7ec7aa128969681eee507ec84a4fc73d7bc /external | |
| parent | 4abf1bdfa383a645e73563f8b0d0b1b945303360 (diff) | |
upload libwps 0.4.12
Change-Id: Ib787098b98f68185c1b3f6b414efbec36cad02dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102332
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libwps/Library_wps.mk | 1 | ||||
| -rw-r--r-- | external/libwps/libtool.patch.0 | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk index 349bdbe83c43..8986ae6e6288 100644 --- a/external/libwps/Library_wps.mk +++ b/external/libwps/Library_wps.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\ UnpackedTarball/libwps/src/lib/LotusStyleManager \ UnpackedTarball/libwps/src/lib/MSWrite \ UnpackedTarball/libwps/src/lib/Multiplan \ + UnpackedTarball/libwps/src/lib/PocketWord \ UnpackedTarball/libwps/src/lib/Quattro \ UnpackedTarball/libwps/src/lib/Quattro9 \ UnpackedTarball/libwps/src/lib/Quattro9Graph \ diff --git a/external/libwps/libtool.patch.0 b/external/libwps/libtool.patch.0 index f2e10ac3822f..cc4b08ba2147 100644 --- a/external/libwps/libtool.patch.0 +++ b/external/libwps/libtool.patch.0 @@ -1,11 +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,7 @@ func_mode_link () +@@ -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=*| \ -- -fsanitize=*) -+ -fsanitize=*|-fuse-ld=*|--ld-path=*) +- -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" |