[Libreoffice-commits] core.git: 2 commits - bin/oss-fuzz-build.sh configure.ac download.lst extras/source solenv/flatpak-manifest.in

[Andras Timar (via logerrit)]

 bin/oss-fuzz-build.sh                |    2 +-
 configure.ac                         |    2 +-
 download.lst                         |    2 +-
 extras/source/truetype/symbol/README |    6 ++++++
 solenv/flatpak-manifest.in           |    6 +++---
 5 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 02aa72b7a894e20888456024bba544a1313de937
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Jul 14 15:10:16 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Jul 14 18:26:03 2019 +0200

    instructions how to update opens___.ttf on TDF server
    
    Change-Id: Ie33cceab8b959466059040deb756b50c2fd75b46
    Reviewed-on: https://gerrit.libreoffice.org/75578
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/extras/source/truetype/symbol/README b/extras/source/truetype/symbol/README
index 80d8975a113d..0fb8bdeb3963 100644
--- a/extras/source/truetype/symbol/README
+++ b/extras/source/truetype/symbol/README
@@ -23,3 +23,9 @@ Fragments of OpenSymbol are mapped internally to a number of other
 fonts for interoperability purposes. See
 unotools/source/misc/fontcvt.cxx pwrt, the StarSymbol conversion
 tables.
+
+Update opens___.ttf on TDF server:
+scp opens___.ttf libreoffice at dev-www.libreoffice.org:/srv/www/dev-www.libreoffice.org/extern/$(sha256sum opens___.ttf | awk '{ print $1 }')-opens___.ttf
+
+Update sha256sums in source files like in this example commit:
+https://gerrit.libreoffice.org/#/c/75577/
commit 231fb0441981de788716c7574f03a9cef9c0e268
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Jul 14 14:39:20 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Jul 14 18:25:55 2019 +0200

    tdf#120047 use new opens___.ttf version 102.11
    
    Change-Id: Iad48c663708dc9cda00d2a8534981f34c1c6f9d0
    Reviewed-on: https://gerrit.libreoffice.org/75577
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 0e37243c8a7c..646accc8a017 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -31,7 +31,7 @@ for a in *fuzzer; do
     #some minimal fonts required
     mv $a $OUT
     mkdir -p $OUT/$a.fonts
-    cp $SRC/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf ../share/fonts/truetype/Liberation* $OUT/$a.fonts
+    cp $SRC/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf ../share/fonts/truetype/Liberation* $OUT/$a.fonts
     #minimal runtime requirements
     cp templateservices.rdb $OUT/$a.services.rdb
     cp types.rdb $OUT/$a.types.rdb
diff --git a/configure.ac b/configure.ac
index 1a46666725a2..2ef45d1cdd7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11552,7 +11552,7 @@ if test "$enable_build_opensymbol" = "yes"; then
     fi
 else
     AC_MSG_RESULT([no])
-    OPENSYMBOL_TTF=49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
+    OPENSYMBOL_TTF=884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
     BUILD_TYPE="$BUILD_TYPE OPENSYMBOL"
 fi
 AC_SUBST(OPENSYMBOL_TTF)
diff --git a/download.lst b/download.lst
index 0fea7d9b17c2..8888d6e4716f 100644
--- a/download.lst
+++ b/download.lst
@@ -258,4 +258,4 @@ export ZMF_TARBALL := libzmf-0.0.2.tar.xz
 
 NUMBERTEXT_EXTENSION_SHA256SUM := 1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2
 UNOWINREG_SHA256SUM := eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
-OPENSYMBOL_SHA256SUM := 49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63
+OPENSYMBOL_SHA256SUM := 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index ad6cdd6a3c83..7e72c5eb795c 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -563,10 +563,10 @@
                     "dest-filename": "external/tarballs/libatomic_ops-7.6.8.tar.gz"
                 },
                 {
-                    "url": "https://dev-www.libreoffice.org/extern/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf",
-                    "sha256": "49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63",
+                    "url": "https://dev-www.libreoffice.org/extern/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf",
+                    "sha256": "884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc",
                     "type": "file",
-                    "dest-filename": "external/tarballs/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf"
+                    "dest-filename": "external/tarballs/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf"
                 }
             ],
             "buildsystem": "simple",