[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 726535ec30f12697ceccd2f0640d9371a64dc5bd Author: Eike Rathke AuthorDate: Thu Apr 23 13:05:30 2020 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Thu Apr 23 21:31:24 2020 +0200 Update language-subtag-registry to 2020-04-01 Change-Id: I89ac10b243ac0babbe0d1bf24a7e0f732fe5a495 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92755 Reviewed-by: Eike Rathke Tested-by: Jenkins (cherry picked from commit 11ef83aa64af7e366cd56856853a7b332a69d105) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92768 Reviewed-by: Adolfo Jayme Barrientos diff --git a/download.lst b/download.lst index 5f7f7dadb8fb..405df996f10a 100644 --- a/download.lst +++ b/download.lst @@ -132,8 +132,8 @@ export JFREEREPORT_SAC_SHA256SUM := 085f2112c51fa8c1783fac12fbd45265059641512134 export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip export LIBJPEG_TURBO_SHA256SUM := b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523 export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-1.5.3.tar.gz -export LANGTAGREG_SHA256SUM := 07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a -export LANGTAGREG_TARBALL := language-subtag-registry-2019-09-16.tar.bz2 +export LANGTAGREG_SHA256SUM := fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da +export LANGTAGREG_TARBALL := language-subtag-registry-2020-04-01.tar.bz2 export LANGUAGETOOL_SHA256SUM := 48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LCMS2_SHA256SUM := 48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - download.lst external/nss
download.lst|4 ++-- external/nss/UnpackedTarball_nss.mk |1 - external/nss/clang-cl.patch.0 |2 +- external/nss/nss.aix.patch |2 +- external/nss/nss.fix-freebl-add-lcc-support.patch.1 | 11 --- external/nss/nss.patch | 14 +++--- external/nss/nss.vs2015.pdb.patch |4 ++-- 7 files changed, 13 insertions(+), 25 deletions(-) New commits: commit 3991156ab286a88fd9d340f4979d2027ddce4ecc Author: Michael Stahl AuthorDate: Mon Nov 25 12:34:28 2019 +0100 Commit: Caolán McNamara CommitDate: Tue Nov 26 15:54:43 2019 +0100 nss: upgrade to release 3.47.1 Fixes CVE-2019-11745. Remove nss.fix-freebl-add-lcc-support.patch.1, fixed upstream. Change-Id: I72e35c90fabb0a83f547a787dbaee774e35f9c08 Reviewed-on: https://gerrit.libreoffice.org/83673 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit a6238c3fba80889f9090d997e2a4979b78b34ac7) Reviewed-on: https://gerrit.libreoffice.org/83739 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/download.lst b/download.lst index fdb2e5a7ba96..5f7f7dadb8fb 100644 --- a/download.lst +++ b/download.lst @@ -181,8 +181,8 @@ export MYTHES_SHA256SUM := 1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz export NEON_SHA256SUM := db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca export NEON_TARBALL := neon-0.30.2.tar.gz -export NSS_SHA256SUM := fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1 -export NSS_TARBALL := nss-3.45-with-nspr-4.21.tar.gz +export NSS_SHA256SUM := 07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64 +export NSS_TARBALL := nss-3.47.1-with-nspr-4.23.tar.gz export ODFGEN_SHA256SUM := 2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2 export ODFGEN_VERSION_MICRO := 6 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2 diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index bd2ad367c776..3079216b674e 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -22,7 +22,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss.vs2015.patch) \ external/nss/ubsan.patch.0 \ external/nss/clang-cl.patch.0 \ -external/nss/nss.fix-freebl-add-lcc-support.patch.1 \ $(if $(filter iOS,$(OS)), \ external/nss/nss-ios.patch) \ $(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \ diff --git a/external/nss/clang-cl.patch.0 b/external/nss/clang-cl.patch.0 index 111ec934d147..1d615c2397d8 100644 --- a/external/nss/clang-cl.patch.0 +++ b/external/nss/clang-cl.patch.0 @@ -22,7 +22,7 @@ + defined(_M_ARM64)) && !defined __clang__ # include # pragma intrinsic(_BitScanForward,_BitScanReverse) - __forceinline static int __prBitScanForward32(unsigned int val) + __forceinline static int __prBitScanForward32(unsigned int val) @@ -32,7 +32,7 @@ # define pr_bitscan_ctz32(val) __prBitScanForward32(val) # define pr_bitscan_clz32(val) __prBitScanReverse32(val) diff --git a/external/nss/nss.aix.patch b/external/nss/nss.aix.patch index da9aacb10e84..4b0c6bfb3261 100644 --- a/external/nss/nss.aix.patch +++ b/external/nss/nss.aix.patch @@ -38,7 +38,7 @@ diff -ru a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in --- a/a/nspr/pr/src/Makefile.in2014-09-29 16:46:35.281395079 +0100 +++ b/b/nspr/pr/src/Makefile.in2014-09-29 16:50:33.909375948 +0100 @@ -74,7 +74,6 @@ - endif + endif # SunOS ifeq ($(OS_ARCH),AIX) -DSO_LDOPTS+= -binitfini::_PR_Fini diff --git a/external/nss/nss.fix-freebl-add-lcc-support.patch.1 b/external/nss/nss.fix-freebl-add-lcc-support.patch.1 deleted file mode 100644 index 3e3c06327dde.. --- a/external/nss/nss.fix-freebl-add-lcc-support.patch.1 +++ /dev/null @@ -1,11 +0,0 @@ b/nss/lib/freebl/Makefile -+++ a/nss/lib/freebl/Makefile -@@ -495,7 +495,7 @@ - ifdef USE_64 - # no __int128 at least up to lcc 1.23 (pretending to be gcc5) - # NB: CC_NAME is not defined here --ifneq ($(shell $(CC) -? 2>&1 >/dev/null | sed -e 's/:.*//;1q'),lcc) -+ifneq ($(shell $(CC) -? 2>&1 >/dev/null https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - download.lst external/libxslt
download.lst |4
external/libxslt/UnpackedTarball_libxslt.mk |2
external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 | 120
--
external/libxslt/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch.1 | 69 +
external/libxslt/libxslt-config.patch.1 | 18 -
external/libxslt/libxslt-internal-symbols.patch.1 |8
6 files changed, 85 insertions(+), 136 deletions(-)
New commits:
commit 1346c27d43444345aa4a8702fcf4fcdfe22c67b5
Author: Michael Stahl
AuthorDate: Wed Nov 20 15:08:24 2019 +0100
Commit: Christian Lohmaier
CommitDate: Thu Nov 21 20:31:55 2019 +0100
libxslt: upgrade to release 1.1.34
Fixes CVE-2019-18197.
Remove obsolete e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1.
Change-Id: I95cf498e245083528f98bfef8cdd240bbe2211b9
Reviewed-on: https://gerrit.libreoffice.org/83312
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit e9ea24cc004a8b9a5856f2f268bd40433c504db1)
Reviewed-on: https://gerrit.libreoffice.org/83378
Reviewed-by: Christian Lohmaier
diff --git a/download.lst b/download.lst
index a2445017474b..fdb2e5a7ba96 100644
--- a/download.lst
+++ b/download.lst
@@ -159,8 +159,8 @@ export XMLSEC_TARBALL := xmlsec1-1.2.28.tar.gz
export LIBXML_SHA256SUM :=
aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
export LIBXML_VERSION_MICRO := 10
export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
-export LIBXSLT_SHA256SUM :=
8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8
-export LIBXSLT_VERSION_MICRO := 33
+export LIBXSLT_SHA256SUM :=
98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f
+export LIBXSLT_VERSION_MICRO := 34
export LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.gz
export LPSOLVE_SHA256SUM :=
171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
diff --git a/external/libxslt/UnpackedTarball_libxslt.mk
b/external/libxslt/UnpackedTarball_libxslt.mk
index beb591b8b2a8..b035e99f0a79 100644
--- a/external/libxslt/UnpackedTarball_libxslt.mk
+++ b/external/libxslt/UnpackedTarball_libxslt.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libxslt,\
external/libxslt/libxslt-msvc.patch.2 \
external/libxslt/libxslt-1.1.26-memdump.patch \
external/libxslt/rpath.patch.0 \
- external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 \
+ external/libxslt/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
deleted file mode 100644
index 260f35d1a35e..
--- a/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
+++ /dev/null
@@ -1,120 +0,0 @@
-From e03553605b45c88f0b4b2980adfbbb8f6fca2fd6 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer
-Date: Sun, 24 Mar 2019 09:51:39 +0100
-Subject: [PATCH] Fix security framework bypass
-
-xsltCheckRead and xsltCheckWrite return -1 in case of error but callers
-don't check for this condition and allow access. With a specially
-crafted URL, xsltCheckRead could be tricked into returning an error
-because of a supposedly invalid URL that would still be loaded
-succesfully later on.
-
-Fixes #12.
-
-Thanks to Felix Wilhelm for the report.
- libxslt/documents.c | 18 ++
- libxslt/imports.c | 9 +
- libxslt/transform.c | 9 +
- libxslt/xslt.c | 9 +
- 4 files changed, 25 insertions(+), 20 deletions(-)
-
-diff --git a/libxslt/documents.c b/libxslt/documents.c
-index 3f3a7312..4aad11bb 100644
a/libxslt/documents.c
-+++ b/libxslt/documents.c
-@@ -296,10 +296,11 @@ xsltLoadDocument(xsltTransformContextPtr ctxt, const
xmlChar *URI) {
- int res;
-
- res = xsltCheckRead(ctxt->sec, ctxt, URI);
-- if (res == 0) {
-- xsltTransformError(ctxt, NULL, NULL,
-- "xsltLoadDocument: read rights for %s denied\n",
-- URI);
-+ if (res <= 0) {
-+if (res == 0)
-+xsltTransformError(ctxt, NULL, NULL,
-+ "xsltLoadDocument: read rights for %s denied\n",
-+ URI);
- return(NULL);
- }
- }
-@@ -372,10 +373,11 @@ xsltLoadStyleDocument(xsltStylesheetPtr style, const
xmlChar *URI) {
- int res;
-
- res = xsltCheckRead(sec, NULL, URI);
-- if (res == 0) {
-- xsltTransformError(NULL, NULL, NULL,
-- "xsltLoadStyleDocument: read rights for %s denied\n",
-- URI);
-+ if (res <= 0) {
-+if (res == 0)
-+xsltTransformError(NULL, NULL,
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - download.lst external/poppler
download.lst|
4 -
external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1 |
27 --
external/poppler/StaticLibrary_poppler.mk |
1
external/poppler/UnpackedTarball_poppler.mk |
1
external/poppler/poppler-config.patch.1 |
19 ---
5 files changed, 14 insertions(+), 38 deletions(-)
New commits:
commit f3b2d61376c6d7ae262f58406d89ef0caa8b0aaf
Author: Michael Stahl
AuthorDate: Wed Nov 20 13:11:59 2019 +0100
Commit: Christian Lohmaier
CommitDate: Thu Nov 21 12:31:04 2019 +0100
poppler: upgrade to release 0.82.0
fixes CVE-2019-9903 CVE-2019-9631 CVE-2019-9545 CVE-2019-9543
CVE-2019-14494 CVE-2019-12293 CVE-2019-11026 CVE-2019-10873
CVE-2019-10872 CVE-2019-10871 CVE-2019-10018
remove obsolete 0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1
Change-Id: I72b3bf89b294ed3e24157c7e75fd58d4f68d9f35
Reviewed-on: https://gerrit.libreoffice.org/83308
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 28e52c49452320ac76489d0f93ca5692456e5331)
Reviewed-on: https://gerrit.libreoffice.org/83336
Reviewed-by: Christian Lohmaier
diff --git a/download.lst b/download.lst
index 4fcc37885e59..a2445017474b 100644
--- a/download.lst
+++ b/download.lst
@@ -206,8 +206,8 @@ export PIXMAN_SHA256SUM :=
21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3
export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
export LIBPNG_SHA256SUM :=
505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
export LIBPNG_TARBALL := libpng-1.6.37.tar.xz
-export POPPLER_SHA256SUM :=
92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f
-export POPPLER_TARBALL := poppler-0.74.0.tar.xz
+export POPPLER_SHA256SUM :=
234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df
+export POPPLER_TARBALL := poppler-0.82.0.tar.xz
export POSTGRESQL_SHA256SUM :=
a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126
export POSTGRESQL_TARBALL := postgresql-9.2.24.tar.bz2
export PYTHON_SHA256SUM :=
c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049
diff --git
a/external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1
b/external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1
deleted file mode 100644
index b459a0a0bef7..
---
a/external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1
+++ /dev/null
@@ -1,27 +0,0 @@
-From f4136a6353162db249f63ddb0f20611622ab61b4 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid
-Date: Wed, 27 Feb 2019 19:43:22 +0100
-Subject: [PATCH] ImageStream::getLine: fix crash on broken files
-
-Fixes #728
- poppler/Stream.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/poppler/Stream.cc b/poppler/Stream.cc
-index 33537b0e..a41435ab 100644
a/poppler/Stream.cc
-+++ b/poppler/Stream.cc
-@@ -496,6 +496,9 @@ unsigned char *ImageStream::getLine() {
- }
-
- int readChars = str->doGetChars(inputLineSize, inputLine);
-+ if (unlikely(readChars == -1)) {
-+ readChars = 0;
-+ }
- for ( ; readChars < inputLineSize; readChars++) inputLine[readChars] = EOF;
- if (nBits == 1) {
- unsigned char *p = inputLine;
---
-2.20.1
-
diff --git a/external/poppler/StaticLibrary_poppler.mk
b/external/poppler/StaticLibrary_poppler.mk
index bdb51ad115da..8bf9f528ee9e 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -39,7 +39,6 @@ $(eval $(call
gb_StaticLibrary_add_generated_exception_objects,poppler,\
UnpackedTarball/poppler/goo/gfile \
UnpackedTarball/poppler/goo/GooTimer \
UnpackedTarball/poppler/goo/GooString \
- UnpackedTarball/poppler/goo/FixedPoint \
UnpackedTarball/poppler/goo/NetPBMWriter \
UnpackedTarball/poppler/goo/PNGWriter \
UnpackedTarball/poppler/goo/TiffWriter \
diff --git a/external/poppler/UnpackedTarball_poppler.mk
b/external/poppler/UnpackedTarball_poppler.mk
index aaad243fbf0a..68fd06d9403b 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -13,7 +13,6 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler
$(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-config.patch.1 \
-
external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/poppler/poppler-config.patch.1
b/external/poppler/poppler-config.patch.1
index 1c68806276f7..cb74cd66fb5e 100644
--- a/external/poppler/poppler-config.patch.1
+++ b/external/poppler/poppler-config.patch.1
@@ -195,7 +195,7 @@ index 0fbd336a..451213f8 100644
+#define PACKAGE_NAME "poppler"
+
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - download.lst external/libxml2
download.lst|4 +-
external/libxml2/libxml2-android.patch |2 -
external/libxml2/libxml2-config.patch.1 | 46 ++--
3 files changed, 13 insertions(+), 39 deletions(-)
New commits:
commit e9dc4662d4ba3bde91407911f1bc1a7aa25fa0ce
Author: Michael Stahl
AuthorDate: Wed Nov 20 15:05:02 2019 +0100
Commit: Thorsten Behrens
CommitDate: Thu Nov 21 09:18:51 2019 +0100
libxml2: upgrade to release 2.9.10
... which is, surprisingly enough, required to build the latest libxslt.
Change-Id: Ifbb36ed61b8f68185f9c788f63a8edeb58899f94
Reviewed-on: https://gerrit.libreoffice.org/83311
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit d1bf39a78ed239d4493f0470ca937852265e79d6)
Reviewed-on: https://gerrit.libreoffice.org/83347
Reviewed-by: Thorsten Behrens
diff --git a/download.lst b/download.lst
index 8980c78df80d..4fcc37885e59 100644
--- a/download.lst
+++ b/download.lst
@@ -156,8 +156,8 @@ export LIBTOMMATH_SHA256SUM :=
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304
export LIBTOMMATH_TARBALL := ltm-1.0.zip
export XMLSEC_SHA256SUM :=
13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4
export XMLSEC_TARBALL := xmlsec1-1.2.28.tar.gz
-export LIBXML_SHA256SUM :=
94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871
-export LIBXML_VERSION_MICRO := 9
+export LIBXML_SHA256SUM :=
aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
+export LIBXML_VERSION_MICRO := 10
export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
export LIBXSLT_SHA256SUM :=
8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8
export LIBXSLT_VERSION_MICRO := 33
diff --git a/external/libxml2/libxml2-android.patch
b/external/libxml2/libxml2-android.patch
index 714de61068fb..42af83274026 100644
--- a/external/libxml2/libxml2-android.patch
+++ b/external/libxml2/libxml2-android.patch
@@ -4,7 +4,7 @@
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
+-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
+all-am: Makefile $(LTLIBRARIES) \
config.h
install-binPROGRAMS: install-libLTLIBRARIES
diff --git a/external/libxml2/libxml2-config.patch.1
b/external/libxml2/libxml2-config.patch.1
index 7d96fb530e57..8c28fb6a7806 100644
--- a/external/libxml2/libxml2-config.patch.1
+++ b/external/libxml2/libxml2-config.patch.1
@@ -25,45 +25,19 @@ Hack the xml2-config to return paths into WORKDIR.
;;
--cflags)
-- echo @XML_INCLUDEDIR@ @XML_CFLAGS@
-+echo -I${includedir}
-+# echo @XML_INCLUDEDIR@ @XML_CFLAGS@
+-cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@"
++#cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@"
++cflags="-I${includedir}"
;;
--libtool-libs)
-@@ -82,19 +88,24 @@
- ;;
+@@ -91,7 +96,8 @@
+ libs="@XML_LIBDIR@ $libs"
+ fi
- --libs)
--if [ "`uname`" = "Linux" ]
-- then
-- if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" =
"-L/usr/lib64" ]
-- then
-- echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@
-- else
-- echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
-- fi
-- else
-- echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
@WIN32_EXTRA_LIBADD@
-- fi
-+echo -L${libdir} -lxml2 -lm
-+#if [ "`uname`" = "Linux" ]
-+# then
-+# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" =
"-L/usr/lib64" ]
-+# then
-+# echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@
-+# else
-+# echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
-+# fi
-+# else
-+# echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
@WIN32_EXTRA_LIBADD@
-+# fi
- ;;
+-libs="$libs @WIN32_EXTRA_LIBADD@"
++#libs="$libs @WIN32_EXTRA_LIBADD@"
++libs="-L${libdir} -lxml2 -lm"
+ ;;
-+print) # ugly configure hack
-+exit 0
-+;;
-+
*)
- usage
- exit 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 863037aea2d45111829d099f8d9f004cb13d2a01 Author: Eike Rathke AuthorDate: Tue Oct 29 21:38:14 2019 +0100 Commit: Caolán McNamara CommitDate: Wed Oct 30 18:02:36 2019 +0100 Update to language-subtag-registry-2019-09-16 Change-Id: Iebbf6a2b77951e4e952dd2da42b374c8ec00ad7b Reviewed-on: https://gerrit.libreoffice.org/81718 Reviewed-by: Eike Rathke Tested-by: Jenkins (cherry picked from commit a874172b9b048cfc6c4aa73cdf52c54b9b34872a) Reviewed-on: https://gerrit.libreoffice.org/81737 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/download.lst b/download.lst index 19e6e9a747b9..3f643fccd440 100644 --- a/download.lst +++ b/download.lst @@ -132,8 +132,8 @@ export JFREEREPORT_SAC_SHA256SUM := 085f2112c51fa8c1783fac12fbd45265059641512134 export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip export LIBJPEG_TURBO_SHA256SUM := b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523 export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-1.5.3.tar.gz -export LANGTAGREG_SHA256SUM := a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d -export LANGTAGREG_TARBALL := language-subtag-registry-2019-04-03.tar.bz2 +export LANGTAGREG_SHA256SUM := 07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a +export LANGTAGREG_TARBALL := language-subtag-registry-2019-09-16.tar.bz2 export LANGUAGETOOL_SHA256SUM := 48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LCMS2_SHA256SUM := 48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c2bf646672a0d534cdb4d0a223a312aba734e1f7 Author: Caolán McNamara AuthorDate: Mon Oct 7 09:13:41 2019 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Tue Oct 8 11:48:22 2019 +0200 openssl 1.0.2t Change-Id: Ideb980a07632e75e2bc7fffa851b8419e727c13b Reviewed-on: https://gerrit.libreoffice.org/80341 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/download.lst b/download.lst index 8a5caa5243d8..19e6e9a747b9 100644 --- a/download.lst +++ b/download.lst @@ -192,8 +192,8 @@ export OFFICEOTRON_SHA256SUM := f2443f27561af52324eee03a1892d9f569adc8db9e7bca55 export OFFICEOTRON_JAR := 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824 export OPENLDAP_TARBALL := openldap-2.4.45.tgz -export OPENSSL_SHA256SUM := ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6 -export OPENSSL_TARBALL := openssl-1.0.2r.tar.gz +export OPENSSL_SHA256SUM := 14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc +export OPENSSL_TARBALL := openssl-1.0.2t.tar.gz export ORCUS_SHA256SUM := 3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f export ORCUS_TARBALL := liborcus-0.14.1.tar.gz export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - download.lst external/expat
download.lst |4 ++-- external/expat/ExternalProject_expat.mk |2 +- external/expat/StaticLibrary_expat.mk |1 - external/expat/StaticLibrary_expat_x64.mk |1 - external/expat/UnpackedTarball_expat.mk |1 - external/expat/expat-winapi.patch | 18 +- 6 files changed, 12 insertions(+), 15 deletions(-) New commits: commit 36c96b14389f201c046049e753720f82adef327d Author: Caolán McNamara AuthorDate: Mon Sep 16 09:34:00 2019 +0100 Commit: Michael Stahl CommitDate: Tue Sep 17 11:26:59 2019 +0200 latest expat Change-Id: Ia98c9718ccd8e18b5f56851027bde944164f05c4 Reviewed-on: https://gerrit.libreoffice.org/78977 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/download.lst b/download.lst index 2b4a0b1b4688..8a5caa5243d8 100644 --- a/download.lst +++ b/download.lst @@ -42,8 +42,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz export ETONYEK_SHA256SUM := e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a export ETONYEK_VERSION_MICRO := 9 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz -export EXPAT_SHA256SUM := d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6 -export EXPAT_TARBALL := expat-2.2.5.tar.bz2 +export EXPAT_SHA256SUM := 9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102 +export EXPAT_TARBALL := expat-2.2.8.tar.bz2 export FIREBIRD_SHA256SUM := 6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2 export FONTCONFIG_SHA256SUM := cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017 diff --git a/external/expat/ExternalProject_expat.mk b/external/expat/ExternalProject_expat.mk index 1a638eed14d6..87886eab1f7e 100644 --- a/external/expat/ExternalProject_expat.mk +++ b/external/expat/ExternalProject_expat.mk @@ -15,7 +15,7 @@ $(eval $(call gb_ExternalProject_register_targets,expat,\ $(call gb_ExternalProject_get_state_target,expat,configure) : $(call gb_ExternalProject_run,configure,\ - ./configure \ + ./configure --without-docbook \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ ,,expat_configure.log) diff --git a/external/expat/StaticLibrary_expat.mk b/external/expat/StaticLibrary_expat.mk index 65b1dcb5568a..025ab617ad15 100644 --- a/external/expat/StaticLibrary_expat.mk +++ b/external/expat/StaticLibrary_expat.mk @@ -43,7 +43,6 @@ $(eval $(call gb_StaticLibrary_add_defs,expat,\ endif $(eval $(call gb_StaticLibrary_add_generated_cobjects,expat,\ - UnpackedTarball/expat/lib/loadlibrary \ UnpackedTarball/expat/lib/xmlparse \ UnpackedTarball/expat/lib/xmlrole \ UnpackedTarball/expat/lib/xmltok \ diff --git a/external/expat/StaticLibrary_expat_x64.mk b/external/expat/StaticLibrary_expat_x64.mk index e5b1e51ab994..68bb7f86a89b 100644 --- a/external/expat/StaticLibrary_expat_x64.mk +++ b/external/expat/StaticLibrary_expat_x64.mk @@ -25,7 +25,6 @@ $(eval $(call gb_StaticLibrary_add_defs,expat_x64,\ )) $(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,expat_x64,\ - UnpackedTarball/expat/lib/loadlibrary_x64 \ UnpackedTarball/expat/lib/xmlparse_x64 \ UnpackedTarball/expat/lib/xmltok_x64 \ UnpackedTarball/expat/lib/xmlrole_x64 \ diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk index 7c83f65af284..5d4f41f6d147 100644 --- a/external/expat/UnpackedTarball_expat.mk +++ b/external/expat/UnpackedTarball_expat.mk @@ -26,7 +26,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,expat,\ $(eval $(call gb_UnpackedTarball_set_post_action,expat,\ $(if $(filter $(BUILD_X64),TRUE), \ - cp lib/loadlibrary.c lib/loadlibrary_x64.c && \ cp lib/xmlparse.c lib/xmlparse_x64.c && \ cp lib/xmltok.c lib/xmltok_x64.c && \ cp lib/xmlrole.c lib/xmlrole_x64.c) \ diff --git a/external/expat/expat-winapi.patch b/external/expat/expat-winapi.patch index 3fe8a8a63e5a..b33c12b83b4c 100644 --- a/external/expat/expat-winapi.patch +++ b/external/expat/expat-winapi.patch @@ -1,13 +1,13 @@ --- misc/expat-2.1.0/lib/expat_external.h 2009-11-16 08:53:17.37500 + +++ misc/build/expat-2.1.0/lib/expat_external.h2009-11-16 08:53:34.703125000 + -@@ -7,10 +7,6 @@ +@@ -81,10 +81,6 @@ + # ifndef XML_BUILDING_EXPAT + /* using Expat from an application */ - /* External API definitions */ - --#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__) --# define XML_USE_MSC_EXTENSIONS 1 --#endif +-#if defined(_MSC_EXTENSIONS) && ! defined(__BEOS__) && ! defined(__CYGWIN__) +-# define XMLIMPORT __declspec(dllimport) +-#endif - - /* Expat tries very hard
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - download.lst solenv/flatpak-manifest.in
download.lst |4 ++--
solenv/flatpak-manifest.in |6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit c55b45862b15ee2158c6ad05d93948899aaf42ee
Author: Andras Timar
AuthorDate: Wed Jul 17 10:15:19 2019 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Thu Jul 18 01:09:55 2019 +0200
tdf#126079 update Source Serif font to 3.0
Change-Id: I3d12b7307ad61f7fa73b19ff9ce7f82aebe3b162
Reviewed-on: https://gerrit.libreoffice.org/75758
Tested-by: Jenkins
Reviewed-by: Andras Timar
(cherry picked from commit e045fcca8699c745a2788bc73ba9b5946734eb17)
Reviewed-on: https://gerrit.libreoffice.org/75782
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/download.lst b/download.lst
index f34855ca6eef..31efbb39cbc5 100644
--- a/download.lst
+++ b/download.lst
@@ -66,8 +66,8 @@ export FONT_SOURCECODE_SHA256SUM :=
09466dce8765f189acd8358c60c6736dcd95f042
export FONT_SOURCECODE_TARBALL :=
907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz
export FONT_SOURCESANS_SHA256SUM :=
e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61
export FONT_SOURCESANS_TARBALL :=
edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
-export FONT_SOURCESERIF_SHA256SUM :=
10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb
-export FONT_SOURCESERIF_TARBALL := source-serif-font-2.007R.tar.gz
+export FONT_SOURCESERIF_SHA256SUM :=
826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3
+export FONT_SOURCESERIF_TARBALL := source-serif-pro-3.000R.tar.gz
export FONT_EMOJIONE_COLOR_SHA256SUM :=
d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7
export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz
export FONT_NOTO_SHA256SUM :=
29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 7e72c5eb795c..ba51f89fb7af 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -137,10 +137,10 @@
"dest-filename":
"external/tarballs/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz;,
-"sha256":
"10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb",
+"url":
"https://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz;,
+"sha256":
"826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3",
"type": "file",
-"dest-filename":
"external/tarballs/source-serif-font-2.007R.tar.gz"
+"dest-filename":
"external/tarballs/source-serif-pro-3.000R.tar.gz"
},
{
"url":
"https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz;,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
