strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upload libwps 0.4.12

Browse source 
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>
This commit is contained in:
David Tardon 2020-09-09 09:07:38 +02:00
parent 4abf1bdfa3
commit 61b05af301
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -8837,7 +8837,7 @@ libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
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.11])
libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.12])
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])

4
download.lst
View file

@ -260,8 +260,8 @@ export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
export WPG_SHA256SUM := 99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c
export WPG_VERSION_MICRO := 3
export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
export WPS_SHA256SUM := a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1
export WPS_VERSION_MICRO := 11
export WPS_SHA256SUM := e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb
export WPS_VERSION_MICRO := 12
export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
export XSLTML_SHA256SUM := 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip

1
external/libwps/Library_wps.mk vendored
View file

@ -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 \

9
external/libwps/libtool.patch.0 vendored
View file

@ -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"

6
solenv/flatpak-manifest.in
View file

@ -327,10 +327,10 @@
"dest-filename": "external/tarballs/libwpg-0.3.3.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz",
"sha256": "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1",
"url": "https://dev-www.libreoffice.org/src/libwps-0.4.12.tar.xz",
"sha256": "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb",
"type": "file",
"dest-filename": "external/tarballs/libwps-0.4.11.tar.xz"
"dest-filename": "external/tarballs/libwps-0.4.12.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz",