add --enable-build-opensymbol option to build opens___.ttf from source
... and handle opens___.ttf like unowinreg.dll (-> download.lst/$(TARFILE_LOCATION)) Change-Id: Id4723fb15c4b4b04133dedf97b1262441baa4756 Reviewed-on: https://gerrit.libreoffice.org/54938 Tested-by: Rene Engelhard <rene@debian.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Rene Engelhard <rene@debian.org>
This commit is contained in:
+2
-1
@@ -52,7 +52,7 @@ $(filter 32,$(words $(shell echo $(1) | sed -e 's/./& /g')))
|
||||
endef
|
||||
|
||||
define fetch_Download__subst_var
|
||||
$(subst _DLL,_SHA256SUM,$(subst _TARBALL,_SHA256SUM,$(subst _PACK,_SHA256SUM,$(subst _JAR,_SHA256SUM,$(1)))))
|
||||
$(subst _TTF,_SHA256SUM,$(subst _DLL,_SHA256SUM,$(subst _TARBALL,_SHA256SUM,$(subst _PACK,_SHA256SUM,$(subst _JAR,_SHA256SUM,$(1))))))
|
||||
endef
|
||||
|
||||
# fetch_Download_item url variable-name
|
||||
@@ -224,6 +224,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
|
||||
,$(call fetch_Download_item,https://dev-www.libreoffice.org/src,$(item)))
|
||||
$(foreach item, \
|
||||
$(call fetch_Optional,ODK,UNOWINREG_DLL) \
|
||||
$(call fetch_Optional,OPENSYMBOL,OPENSYMBOL_TTF) \
|
||||
$(call fetch_Optional,ODFVALIDATOR,ODFVALIDATOR_JAR) \
|
||||
$(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \
|
||||
,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item)))
|
||||
|
||||
@@ -188,6 +188,7 @@ export FLEX=@FLEX@
|
||||
export FLUTE_JAR=@FLUTE_JAR@
|
||||
export FONTCONFIG_CFLAGS=$(gb_SPACE)@FONTCONFIG_CFLAGS@
|
||||
export FONTCONFIG_LIBS=$(gb_SPACE)@FONTCONFIG_LIBS@
|
||||
export FONTFORGE=@FONTFORGE@
|
||||
export FREEHAND_CFLAGS=$(gb_SPACE)@FREEHAND_CFLAGS@
|
||||
export FREEHAND_LIBS=$(gb_SPACE)@FREEHAND_LIBS@
|
||||
export FREETYPE_CFLAGS=$(gb_SPACE)@FREETYPE_CFLAGS@
|
||||
@@ -432,6 +433,7 @@ 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@
|
||||
|
||||
@@ -1315,6 +1315,12 @@ AC_ARG_ENABLE(build-unowinreg,
|
||||
compiler is needed on Linux.]),
|
||||
,)
|
||||
|
||||
AC_ARG_ENABLE(build-opensymbol,
|
||||
AS_HELP_STRING([--enable-build-opensymbol],
|
||||
[Do not use the prebuilt opens___.ttf. Build it instead. This needs
|
||||
fontforge installed.]),
|
||||
,)
|
||||
|
||||
AC_ARG_ENABLE(dependency-tracking,
|
||||
AS_HELP_STRING([--enable-dependency-tracking],
|
||||
[Do not reject slow dependency extractors.])[
|
||||
@@ -11294,6 +11300,21 @@ if test "x$with_java" != "xno"; then
|
||||
libo_CHECK_EXTENSION([LanguageTool],[LANGUAGETOOL],[languagetool],[languagetool],[])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([whether to build opens___.ttf])
|
||||
if test "$enable_build_opensymbol" = "yes"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_PATH_PROG(FONTFORGE, fontforge)
|
||||
if test -z "$FONTFORGE"; then
|
||||
AC_MSG_ERROR([fontforge not installed])
|
||||
fi
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
OPENSYMBOL_TTF=49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
|
||||
BUILD_TYPE="$BUILD_TYPE OPENSYMBOL"
|
||||
fi
|
||||
AC_SUBST(OPENSYMBOL_TTF)
|
||||
AC_SUBST(FONTFORGE)
|
||||
|
||||
TEST_FONTS_MISSING=0
|
||||
|
||||
# $1 = font family
|
||||
|
||||
@@ -256,3 +256,4 @@ export ZMF_TARBALL := libzmf-0.0.2.tar.xz
|
||||
|
||||
NUMBERTEXT_EXTENSION_SHA256SUM := 1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2
|
||||
UNOWINREG_SHA256SUM := eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
|
||||
OPENSYMBOL_SHA256SUM := 49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
||||
#
|
||||
# This file is part of the LibreOffice project.
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
|
||||
$(eval $(call gb_CustomTarget_CustomTarget,extras/fonts))
|
||||
|
||||
$(eval $(call gb_CustomTarget_register_targets,extras/fonts,opens___.ttf))
|
||||
|
||||
ifneq (,$(FONTFORGE))
|
||||
$(call gb_CustomTarget_get_workdir,extras/fonts)/opens___.ttf : \
|
||||
$(SRCDIR)/extras/source/truetype/symbol/OpenSymbol.sfd
|
||||
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),FNT,1)
|
||||
$(FONTFORGE) -lang=ff -c 'Open($$1); Generate($$2)' $< $@
|
||||
else
|
||||
$(call gb_CustomTarget_get_workdir,extras/fonts)/opens___.ttf : \
|
||||
$(TARFILE_LOCATION)/$(OPENSYMBOL_TTF)
|
||||
cp $< $@
|
||||
endif
|
||||
@@ -68,4 +68,8 @@ $(eval $(call gb_Module_add_targets,extras,\
|
||||
))
|
||||
endif
|
||||
|
||||
$(eval $(call gb_Module_add_targets,extras,\
|
||||
CustomTarget_opensymbol \
|
||||
))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
|
||||
@@ -7,8 +7,10 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
|
||||
$(eval $(call gb_Package_Package,extras_fonts,$(SRCDIR)/extras))
|
||||
$(eval $(call gb_Package_Package,extras_fonts,$(call gb_CustomTarget_get_workdir,extras/fonts)))
|
||||
|
||||
$(eval $(call gb_Package_add_file,extras_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype/opens___.ttf,source/truetype/symbol/opens___.ttf))
|
||||
$(eval $(call gb_Package_use_customtarget,extras_fonts,extras/fonts))
|
||||
|
||||
$(eval $(call gb_Package_add_file,extras_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype/opens___.ttf,opens___.ttf))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user