config_host.mk.in | 1 -
configure.ac | 2 --
download.lst | 4 ++--
3 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 9ba2231084fb788c66a3bbc16cab7c02f35b41a2
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Mon Nov 8 20:24:40 2021 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Nov 9 16:37:28 2021 +0100
download.lst: define OPENSYMBOL variables like everything else
No reason why the filename should be defined in configure?
Remove unused NUMBERTEXT_EXTENSION_SHA256SUM.
Change-Id: I3d3084e2052cb98ddbe2c1cf10691dcc5d716d19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124889
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/config_host.mk.in b/config_host.mk.in
index 43f65dfce39a..ab5cca977dd3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -474,7 +474,6 @@ export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
export OOO_VENDOR=@OOO_VENDOR@
export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@
export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
-export OPENSYMBOL_TTF=@OPENSYMBOL_TTF@
export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@
export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@
export OS=@OS@
diff --git a/configure.ac b/configure.ac
index 3cfcb7540e7f..c5b3a1ea116f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13124,10 +13124,8 @@ if test "$enable_build_opensymbol" = "yes"; then
fi
else
AC_MSG_RESULT([no])
-
OPENSYMBOL_TTF=f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
BUILD_TYPE="$BUILD_TYPE OPENSYMBOL"
fi
-AC_SUBST(OPENSYMBOL_TTF)
AC_SUBST(FONTFORGE)
dnl ===================================================================
diff --git a/download.lst b/download.lst
index fa411c8814d0..7fd55c71cbe6 100644
--- a/download.lst
+++ b/download.lst
@@ -267,7 +267,7 @@ export ZMF_SHA256SUM :=
27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639
export ZMF_TARBALL := libzmf-0.0.2.tar.xz
export ZXING_SHA256SUM :=
653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a
export ZXING_TARBALL := zxing-cpp-1.2.0.tar.gz
-NUMBERTEXT_EXTENSION_SHA256SUM :=
1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2
-OPENSYMBOL_SHA256SUM :=
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
+export OPENSYMBOL_SHA256SUM :=
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
+export OPENSYMBOL_TTF :=
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
export CUCKOO_SHA256SUM :=
471dd83a813ed2816c2246c373004470ad0f6612c7ce72038929dc5161cdd58e
export CUCKOO_TARBALL :=
libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz
