[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - download.lst include/xmloff sw/qa xmloff/source

[Michael Stahl]

 download.lst |4 -
 include/xmloff/xmltoken.hxx  |2 
 sw/qa/extras/odfexport/data/sender-initials.fodt |   71 +++
 sw/qa/extras/odfexport/odfexport.cxx |   20 ++
 xmloff/source/core/xmltoken.cxx  |2 
 xmloff/source/draw/ximppage.cxx  |6 +
 xmloff/source/text/txtflde.cxx   |1 
 xmloff/source/text/txtfldi.cxx   |   10 +--
 xmloff/source/text/txtimp.cxx|1 
 9 files changed, 109 insertions(+), 8 deletions(-)

New commits:
commit cc68977f1be22ac0f4a15eb37e05ccba13a7a554
Author: Michael Stahl 
Date:   Tue May 8 15:01:22 2018 +0200

OFFICE-3776 xmloff: adapt ODF import to renamed text:sender-initials

ODF TC decided to rename the element to meta:creator-initials, so adapt
the import so it can read this in addition to the 2 element names
produced by current and past LO versions.

Also add a test.

Unfortunately it turned out that the ODF validator had a bug in checking
character data in foreign elements, which is triggered by the test
document, see https://issues.apache.org/jira/browse/ODFTOOLKIT-475
... so update the validator jar as well.

Change-Id: I1de1e8772b41f8937f043d9a0d150e169f25ffd4
Reviewed-on: https://gerrit.libreoffice.org/53979
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit b09889a158cbc839ebc8a6061b0b261fa74930e6)
Reviewed-on: https://gerrit.libreoffice.org/54007
Reviewed-by: Thorsten Behrens 

diff --git a/download.lst b/download.lst
index 55704b5a1c02..2b194a8cd40e 100644
--- a/download.lst
+++ b/download.lst
@@ -167,8 +167,8 @@ export NSS_TARBALL := nss-3.29.5-with-nspr-4.13.1.tar.gz
 export ODFGEN_SHA256SUM := 
2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
-export ODFVALIDATOR_SHA256SUM := 
a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34
-export ODFVALIDATOR_JAR := 
a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar
+export ODFVALIDATOR_SHA256SUM := 
702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769
+export ODFVALIDATOR_JAR := 
odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar
 export OFFICEOTRON_SHA256SUM := 
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
 export OFFICEOTRON_JAR := 
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 export OPENCOLLADA_SHA256SUM := 
8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 2fee08b63871..a88b5a9132a8 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3295,6 +3295,8 @@ namespace xmloff { namespace token {
 XML_ZEROS_DENOMINATOR_DIGITS,
 XML_INTEGER_FRACTION_DELIMITER,
 
+XML_CREATOR_INITIALS,
+
 XML_TOKEN_END
 };
 
diff --git a/sw/qa/extras/odfexport/data/sender-initials.fodt 
b/sw/qa/extras/odfexport/data/sender-initials.fodt
new file mode 100644
index ..b8a5c1e67055
--- /dev/null
+++ b/sw/qa/extras/odfexport/data/sender-initials.fodt
@@ -0,0 +1,71 @@
+
+
+http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - download.lst

[Eike Rathke]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ddf51b30fede3a6c9de57a289f48523a448a6855
Author: Eike Rathke 
Date:   Fri Dec 15 19:32:22 2017 +0100

Update language-subtag-registry-2017-12-14

(cherry picked from commit 29055defc8a5e62279bab66faa4ccc191004a918)

 Conflicts:
download.lst

Change-Id: Ieab59f83159cc95faa8119b7b43779329c0a4869
Reviewed-on: https://gerrit.libreoffice.org/46573
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/download.lst b/download.lst
index a8a2f0be90c3..55704b5a1c02 100644
--- a/download.lst
+++ b/download.lst
@@ -115,8 +115,8 @@ export JFREEREPORT_SAC_SHA256SUM := 
085f2112c51fa8c1783fac12fbd45265059641512134
 export JFREEREPORT_SAC_TARBALL := 
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 export JPEG_TURBO_SHA256SUM := 
41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c
 export JPEG_TURBO_TARBALL := libjpeg-turbo-1.5.1.tar.gz
-export LANGTAGREG_SHA256SUM := 
d6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab
-export LANGTAGREG_TARBALL := language-subtag-registry-2017-08-15.tar.bz2
+export LANGTAGREG_SHA256SUM := 
0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362
+export LANGTAGREG_TARBALL := language-subtag-registry-2017-12-14.tar.bz2
 export LANGUAGETOOL_SHA256SUM := 
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
 export LANGUAGETOOL_TARBALL := 
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 export LCMS2_SHA256SUM := 
66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - download.lst

[Eike Rathke]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 875baa884dd64abc9c8e454e82f584b519058e90
Author: Eike Rathke 
Date:   Thu Aug 31 18:54:09 2017 +0200

Upgrade to language-subtag-registry-2017-08-15

Change-Id: I437a86de2de2b3f660b462cfb0ff2167d9cc7a2d
(cherry picked from commit 04d70c0999c716f5465631eca50945915ec607c4)
Reviewed-on: https://gerrit.libreoffice.org/41765
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/download.lst b/download.lst
index 0ffb0c24043f..a8a2f0be90c3 100644
--- a/download.lst
+++ b/download.lst
@@ -115,8 +115,8 @@ export JFREEREPORT_SAC_SHA256SUM := 
085f2112c51fa8c1783fac12fbd45265059641512134
 export JFREEREPORT_SAC_TARBALL := 
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 export JPEG_TURBO_SHA256SUM := 
41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c
 export JPEG_TURBO_TARBALL := libjpeg-turbo-1.5.1.tar.gz
-export LANGTAGREG_SHA256SUM := 
8333809eec6fce852a1d6de68859962106e13a84705417efb03452164da3ee7a
-export LANGTAGREG_TARBALL := language-subtag-registry-2017-04-19.tar.bz2
+export LANGTAGREG_SHA256SUM := 
d6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab
+export LANGTAGREG_TARBALL := language-subtag-registry-2017-08-15.tar.bz2
 export LANGUAGETOOL_SHA256SUM := 
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
 export LANGUAGETOOL_TARBALL := 
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 export LCMS2_SHA256SUM := 
66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - download.lst external/harfbuzz

[Khaled Hosny]

 download.lst  |4 -
 external/harfbuzz/ExternalProject_harfbuzz.mk |1 
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |5 --
 external/harfbuzz/ubsan.patch |   64 --
 4 files changed, 3 insertions(+), 71 deletions(-)

New commits:
commit ddba061b07e55dfd2c91320ca790ff88618b132c
Author: Khaled Hosny 
Date:   Sun Aug 13 23:03:43 2017 +0200

tdf#109142: Update to HarfBuzz 1.4.8

Should fix the Tibetan long U issue.

Also reverts this commit as depending on auto-detection for a required
feature is not a very good idea. The underlying issue is fixed upstream:

commit 5985bed1764358a515c378c80bb60b4d35bad6b1
Author: jan Iversen 
Date:   Mon Jun 12 14:51:42 2017 +0200

iOS, harfbuzz libcoretext not found

changed --with-libcoretext
from "yes" to "auto" for IOS and MACOSX

which seems to be a misguided attemp to fix the build breakage
introduced in:

commit b3559e5c6ce036b1a4fe96c0ffc935e0c94a7b10
Author: jan Iversen 
Date:   Sun Jun 11 19:35:53 2017 +0200

iOS, patch harfbuzz

Add support for arm64

Also had to drop ubsan.patch as it no longer applies, hopefully it is no
longer needed, otherwise it is always good idea to submit such patches
upstream.

Change-Id: I91643c542c0a5a00f36d5564052787eedef8c9cf
Reviewed-on: https://gerrit.libreoffice.org/41124
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 5aab2900dfdc9f12adda378470149670a2a069df)
Reviewed-on: https://gerrit.libreoffice.org/41210

diff --git a/download.lst b/download.lst
index ba60f47751f1..0ffb0c24043f 100644
--- a/download.lst
+++ b/download.lst
@@ -81,8 +81,8 @@ export GPGME_SHA256SUM := 
596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072
 export GPGME_TARBALL := gpgme-1.8.0.tar.bz2
 export GRAPHITE_SHA256SUM := 
aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9
 export GRAPHITE_TARBALL := graphite2-minimal-1.3.10.tgz
-export HARFBUZZ_SHA256SUM := 
8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027
-export HARFBUZZ_TARBALL := harfbuzz-1.3.2.tar.bz2
+export HARFBUZZ_SHA256SUM := 
ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131
+export HARFBUZZ_TARBALL := harfbuzz-1.4.8.tar.bz2
 export HSQLDB_SHA256SUM := 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_SHA256SUM := 
512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk 
b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 070c58ea80a7..b5f48f330b36 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -36,6 +36,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
--with-fontconfig=no \
--with-cairo=no \
--with-glib=no \
+   --with-ucdn=no \
--with-graphite2=yes \
$(if $(filter IOS MACOSX,$(OS)),--with-coretext=yes) \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 888251f1187f..01a889140df5 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -14,7 +14,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,harfbuzz,$(HARFBUZZ_TARBALL),,harfb
 $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
-external/harfbuzz/ubsan.patch \
 external/harfbuzz/clang-cl.patch \
 ))
 
@@ -24,8 +23,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
 ))
 endif
 
-$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
-external/harfbuzz/harfbuzz-ios.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/ubsan.patch b/external/harfbuzz/ubsan.patch
deleted file mode 100644
index fde85cf81761..
--- a/external/harfbuzz/ubsan.patch
+++ /dev/null
@@ -1,64 +0,0 @@
 src/hb-ot-font.cc
-+++ src/hb-ot-font.cc
-@@ -125,7 +125,7 @@
- if (glyph >= this->num_advances)
-   glyph = this->num_advances - 1;
- 
--return this->table->longMetric[glyph].advance;
-+return static_cast(this->table->longMetric)[glyph].advance;
-   }
- };
- 
-@@ -394,8 +394,9 @@
- }
- 
- static void
--_hb_ot_font_destroy (hb_ot_font_t *ot_font)
-+_hb_ot_font_destroy (void *ot_font_)
- {
-+  hb_ot_font_t *ot_font = static_cast(ot_font_);
-   ot_font->cmap.fini ();
-   ot_font->h_metrics.fini ();
-   

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - download.lst external/python3

[David Ostrovsky]

 download.lst   |4 -
 external/python3/UnpackedTarball_python3.mk|4 -
 external/python3/python-3.5.4-msvc-disable.patch.1 |7 +
 external/python3/python-3.5.4-ssl.patch.1  |   83 +++--
 4 files changed, 52 insertions(+), 46 deletions(-)

New commits:
commit a2762b96f605ab5a3269b37c3bee8e7917a9e111
Author: David Ostrovsky 
Date:   Thu Aug 10 00:18:12 2017 +0200

python3: upgrade to release 3.5.4

Change-Id: I9300b2ec1e1dcedbcbfe793e1450166af1bf1944
Reviewed-on: https://gerrit.libreoffice.org/40944
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 
(cherry picked from commit f0e68d4feaaa43f7450432ad1ebd92c2b572400f)
Reviewed-on: https://gerrit.libreoffice.org/41026

diff --git a/download.lst b/download.lst
index d7f08d41fb2f..ba60f47751f1 100644
--- a/download.lst
+++ b/download.lst
@@ -193,8 +193,8 @@ export POPPLER_SHA256SUM := 
869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e851
 export POPPLER_TARBALL := poppler-0.56.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_SHA256SUM := 
d8890b84d773cd7059e597dbefa510340de8336ec9b9e9032bf030f19291565a
-export PYTHON_TARBALL := Python-3.5.3.tgz
+export PYTHON_SHA256SUM := 
6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44
+export PYTHON_TARBALL := Python-3.5.4.tgz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
 export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
 export RASQAL_SHA256SUM := 
6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index 915416f2c952..ce2087497db8 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
$(if $(filter AIX,$(OS)),external/python3/python-3.3.3-aix.patch.1) \
external/python3/python-3.3.0-darwin.patch.1 \
-   external/python3/python-3.3.0-ssl.patch.1 \
-   external/python3/python-3.3.0-msvc-disable.patch.1 \
+   external/python3/python-3.5.4-ssl.patch.1 \
+   external/python3/python-3.5.4-msvc-disable.patch.1 \
external/python3/python-3.3.0-pythreadstate.patch.1 \
external/python3/python-3.3.0-clang.patch.1 \
external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
diff --git a/external/python3/python-3.3.0-msvc-disable.patch.1 
b/external/python3/python-3.5.4-msvc-disable.patch.1
similarity index 95%
rename from external/python3/python-3.3.0-msvc-disable.patch.1
rename to external/python3/python-3.5.4-msvc-disable.patch.1
index c571c5c4e878..54b2a5f46540 100644
--- a/external/python3/python-3.3.0-msvc-disable.patch.1
+++ b/external/python3/python-3.5.4-msvc-disable.patch.1
@@ -1,8 +1,8 @@
 Disable some stuff LO does not need, especially stuff with external 
dependencies
 
 diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln
 python3.orig/PCbuild/pcbuild.sln   2015-07-26 17:43:52.262528695 +0200
-+++ python3/PCbuild/pcbuild.sln2015-07-26 18:00:18.438594901 +0200
+--- python3.orig/PCbuild/pcbuild.sln   2017-08-10 00:04:44.359879894 +0200
 python3/PCbuild/pcbuild.sln2017-08-10 00:13:51.179873748 +0200
 @@ -12,8 +12,6 @@
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", 
"pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
@@ -45,7 +45,7 @@ diff -ru python3.orig/PCbuild/pcbuild.sln 
python3/PCbuild/pcbuild.sln
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", 
"_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C8}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", 
"python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
-@@ -58,12 +58,6 @@
+@@ -80,12 +64,6 @@
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testmultiphase", 
"_testmultiphase.vcxproj", "{16BFE6F0-22EF-40B5-B831-7E937119EF10}"
  EndProject
@@ -58,3 +58,4 @@ diff -ru python3.orig/PCbuild/pcbuild.sln 
python3/PCbuild/pcbuild.sln
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyshellext", 
"pyshellext.vcxproj", "{0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782}"
  EndProject
  Global
+Only in python3/PCbuild: pcbuild.sln~
diff --git a/external/python3/python-3.3.0-ssl.patch.1 
b/external/python3/python-3.5.4-ssl.patch.1
similarity index 80%
rename from external/python3/python-3.3.0-ssl.patch.1
rename to external/python3/python-3.5.4-ssl.patch.1
index c4bc117f5558..beb6fe38882f 100644
--- a/external/python3/python-3.3.0-ssl.patch.1
+++ 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - download.lst external/expat

[Caolán McNamara]

 download.lst |4 +-
 external/expat/StaticLibrary_expat.mk|1 
 external/expat/StaticLibrary_expat_x64.mk|1 
 external/expat/UnpackedTarball_expat.mk  |2 -
 external/expat/expat.getrandom_detection.patch.1 |   40 ---
 5 files changed, 5 insertions(+), 43 deletions(-)

New commits:
commit a5571712029f34afd343959983a5bb335e367794
Author: Caolán McNamara 
Date:   Thu Aug 3 14:03:27 2017 +0100

CVE-2017-11742: Expat 2.2.3

Reviewed-on: https://gerrit.libreoffice.org/40718
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit f680e5a441cecba4d238f031fc417ef3bccfd792)

Change-Id: I1a1de789eaa5a78d2dc0e41ef861d10fa97b689b
Reviewed-on: https://gerrit.libreoffice.org/40746
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/download.lst b/download.lst
index 8092bfcfa993..d7f08d41fb2f 100644
--- a/download.lst
+++ b/download.lst
@@ -41,8 +41,8 @@ export EPM_TARBALL := 
3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export ETONYEK_SHA256SUM := 
032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78
 export ETONYEK_VERSION_MICRO := 6
 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2
-export EXPAT_SHA256SUM := 
1868cadae4c82a018e361e2b2091de103cd820aaacb0d6cfa49bd2cd83978885
-export EXPAT_TARBALL := expat-2.2.1.tar.bz2
+export EXPAT_SHA256SUM := 
b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f
+export EXPAT_TARBALL := expat-2.2.3.tar.bz2
 export FIREBIRD_SHA256SUM := 
6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2
 export FONTCONFIG_SHA256SUM := 
b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3
diff --git a/external/expat/StaticLibrary_expat.mk 
b/external/expat/StaticLibrary_expat.mk
index bdcc767e2905..31d03d03102e 100644
--- a/external/expat/StaticLibrary_expat.mk
+++ b/external/expat/StaticLibrary_expat.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_StaticLibrary_add_cflags,expat,\
 ))
 
 $(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 a38ba28c80dd..4f92d0fb284e 100644
--- a/external/expat/StaticLibrary_expat_x64.mk
+++ b/external/expat/StaticLibrary_expat_x64.mk
@@ -25,6 +25,7 @@ $(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 5d803dcf303a..f90fc8552568 100644
--- a/external/expat/UnpackedTarball_expat.mk
+++ b/external/expat/UnpackedTarball_expat.mk
@@ -13,7 +13,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,expat,\
external/expat/expat-winapi.patch \
-   external/expat/expat.getrandom_detection.patch.1 \
 ))
 
 # This is a bit hackish.
@@ -25,6 +24,7 @@ $(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.getrandom_detection.patch.1 
b/external/expat/expat.getrandom_detection.patch.1
deleted file mode 100644
index eaf25df767dd..
--- a/external/expat/expat.getrandom_detection.patch.1
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/libexpat/libexpat/issues/52
-
-fixes /usr/include/sys/random.h:37:22: error: expected ')'
-misdetection of random.h feature, already fixed upstream:
-https://github.com/libexpat/libexpat/commit/602e6c78ca750c082b72f8cdf4a38839b312959f
-
-diff -ur expat.org/configure expat/configure
 expat.org/configure2017-07-12 17:04:34.0 +0200
-+++ expat/configure2017-07-12 17:05:59.0 +0200
-@@ -16341,7 +16341,7 @@
-   }
- 
- _ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
-+if ac_fn_c_try_link "$LINENO"; then :
- 
- 
- $as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h
-@@ -16386,7 +16386,8 @@
- conftest$ac_exeext conftest.$ac_ext
- 
- fi
--rm -f core conftest.err 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - download.lst

[David Tardon]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 59b3c472aa4243df0c5c4800c9e1f47bc3e95df5
Author: David Tardon 
Date:   Sat Jun 24 10:08:54 2017 +0200

upload poppler 0.56.0

Change-Id: If61037a2df12fd7389f46913d96f4b386460fc76
Reviewed-on: https://gerrit.libreoffice.org/39205
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit 8222d14cb5fc8f7b46e068b4b3f86cc867e05972)
Reviewed-on: https://gerrit.libreoffice.org/39233
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 383be7d9e0b1..8092bfcfa993 100644
--- a/download.lst
+++ b/download.lst
@@ -189,8 +189,8 @@ export PIXMAN_SHA256SUM := 
21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3
 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
 export PNG_SHA256SUM := 
b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2
 export PNG_TARBALL := libpng-1.6.28.tar.gz
-export POPPLER_SHA256SUM := 
537f2bc60d796525705ad9ca8e46899dcc99c2e9480b80051808bae265cdc658
-export POPPLER_TARBALL := poppler-0.55.0.tar.xz
+export POPPLER_SHA256SUM := 
869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173
+export POPPLER_TARBALL := poppler-0.56.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
 export PYTHON_SHA256SUM := 
d8890b84d773cd7059e597dbefa510340de8336ec9b9e9032bf030f19291565a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - download.lst

[Michael Stahl]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2b999fc50afe7bf166ffd2f4f51ad91483f221ef
Author: Michael Stahl 
Date:   Wed Jun 21 22:28:49 2017 +0200

expat: upgrade to release 2.2.1

fixes CVE-2017-9233 and CVE-2016-9063

Change-Id: Iee70d1265ff4e9dd4d0bff9602bd70b85d6b83f3
Reviewed-on: https://gerrit.libreoffice.org/39078
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit fb1b69a78742373f5652e731d0f32da1d159422c)
Reviewed-on: https://gerrit.libreoffice.org/39087
Tested-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 8f95309d7fd6..383be7d9e0b1 100644
--- a/download.lst
+++ b/download.lst
@@ -41,8 +41,8 @@ export EPM_TARBALL := 
3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export ETONYEK_SHA256SUM := 
032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78
 export ETONYEK_VERSION_MICRO := 6
 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2
-export EXPAT_SHA256SUM := 
d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff
-export EXPAT_TARBALL := expat-2.2.0.tar.bz2
+export EXPAT_SHA256SUM := 
1868cadae4c82a018e361e2b2091de103cd820aaacb0d6cfa49bd2cd83978885
+export EXPAT_TARBALL := expat-2.2.1.tar.bz2
 export FIREBIRD_SHA256SUM := 
6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2
 export FONTCONFIG_SHA256SUM := 
b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - download.lst

[David Tardon]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5d87b80683513a47d4ed2a9de2ff5477da93cf42
Author: David Tardon 
Date:   Thu Jun 15 16:02:48 2017 +0200

upload graphite 1.3.10

Change-Id: Ib70e1c08a11465f5a65be8cd0c892e8f7667b478
Reviewed-on: https://gerrit.libreoffice.org/38837
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 619d93c8f660b26e19f41c6908807819ac783958)
Reviewed-on: https://gerrit.libreoffice.org/38844

diff --git a/download.lst b/download.lst
index a9e8d1c7b168..8f95309d7fd6 100644
--- a/download.lst
+++ b/download.lst
@@ -79,8 +79,8 @@ export GLM_SHA256SUM := 
d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c8106299
 export GLM_TARBALL := 
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 export GPGME_SHA256SUM := 
596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33
 export GPGME_TARBALL := gpgme-1.8.0.tar.bz2
-export GRAPHITE_SHA256SUM := 
4fcbfa52527fd6fd6b54786c82bdbb96ec6b34fa2e799361e5164b6bbb671b76
-export GRAPHITE_TARBALL := 
3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz
+export GRAPHITE_SHA256SUM := 
aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9
+export GRAPHITE_TARBALL := graphite2-minimal-1.3.10.tgz
 export HARFBUZZ_SHA256SUM := 
8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027
 export HARFBUZZ_TARBALL := harfbuzz-1.3.2.tar.bz2
 export HSQLDB_SHA256SUM := 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - download.lst external/poppler

[David Tardon]

 download.lst|4 ++--
 external/poppler/ExternalProject_poppler.mk |2 +-
 external/poppler/ubsan.patch.0  |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 51775f495f0399177edbcabb2ad881cdd9f57e0f
Author: David Tardon 
Date:   Wed May 24 19:09:54 2017 +0200

upload poppler 0.55.0

Change-Id: I19b7d324a2dc50d006b4d255ddb6a5c1f15bc616
Reviewed-on: https://gerrit.libreoffice.org/37998
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit b12e16f8fc186117cbb20cc3866bf052a3d75515)
Signed-off-by: David Tardon 

diff --git a/download.lst b/download.lst
index 8abec7d647d6..d545b9668fed 100644
--- a/download.lst
+++ b/download.lst
@@ -191,8 +191,8 @@ export PIXMAN_SHA256SUM := 
21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3
 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
 export PNG_SHA256SUM := 
b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2
 export PNG_TARBALL := libpng-1.6.28.tar.gz
-export POPPLER_SHA256SUM := 
528b661738839f9a25f6e580fcd2d5db007e0a1948580c6489f0062798ca1992
-export POPPLER_TARBALL := poppler-0.52.0.tar.xz
+export POPPLER_SHA256SUM := 
537f2bc60d796525705ad9ca8e46899dcc99c2e9480b80051808bae265cdc658
+export POPPLER_TARBALL := poppler-0.55.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
 export PYTHON_SHA256SUM := 
d8890b84d773cd7059e597dbefa510340de8336ec9b9e9032bf030f19291565a
diff --git a/external/poppler/ExternalProject_poppler.mk 
b/external/poppler/ExternalProject_poppler.mk
index 2a83b164ce4d..83d51b9ea9e7 100644
--- a/external/poppler/ExternalProject_poppler.mk
+++ b/external/poppler/ExternalProject_poppler.mk
@@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,poppler,build) :
--disable-shared \
--enable-xpdf-headers \
--disable-poppler-cpp \
-   --disable-libopenjpeg \
+   --enable-libopenjpeg=none \
--disable-libtiff \
--enable-libjpeg \
--disable-libpng \
diff --git a/external/poppler/ubsan.patch.0 b/external/poppler/ubsan.patch.0
index 67675253b5ad..e0bf164ce7fc 100644
--- a/external/poppler/ubsan.patch.0
+++ b/external/poppler/ubsan.patch.0
@@ -195,7 +195,7 @@
 +return f;
 +  }
  
-   virtual ~FormFieldChoice();
+   ~FormFieldChoice();
  
 @@ -491,8 +523,16 @@
  //
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits