allow-opensymbol-rebuild

Gbp-Pq: Name allow-opensymbol-rebuild.diff

diff --git a/Makefile.fetch b/Makefile.fetch
index fce291d2c3acee1c1ec1326bb602d9a6f57a4ba5..44f5031aac4a45789971e078cd35950f4990a454 100644 (file)
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -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)))

diff --git a/config_host.mk.in b/config_host.mk.in
index c1ba96497ed69278ea3f42bf4c8fa6ea6152c6f9..534968c82c4a94f3223a758830fca5084145de49 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -191,6 +191,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@
@@ -434,6 +435,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@

diff --git a/configure.ac b/configure.ac
index 59d83eec679f9d1894aabc15a693a116730b5c66..804c6a3860bb59abcf534e706050911c6a465ef7 100644 (file)
Binary files a/configure.ac and b/configure.ac differ

diff --git a/download.lst b/download.lst
index 9caade65142145671528b7bd4466626d78c76ede..4b59f8e54db1961a17fc1d073dac3fb278396912 100644 (file)
--- a/download.lst
+++ b/download.lst
@@ -256,3 +256,4 @@ export ZMF_TARBALL := libzmf-0.0.2.tar.xz
 
 NUMBERTEXT_EXTENSION_SHA256SUM := 1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2
 UNOWINREG_SHA256SUM := eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
+OPENSYMBOL_SHA256SUM := 49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63

diff --git a/extras/CustomTarget_opensymbol.mk b/extras/CustomTarget_opensymbol.mk
new file mode 100644 (file)
index 0000000..a27718f
--- /dev/null
+++ b/extras/CustomTarget_opensymbol.mk
@@ -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

diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 2aa41bda39013fc0a7ce3b06264b5340c9588eef..164d38aefd1cf1645ff348536dc398d0b8bc59ee 100644 (file)
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -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:

diff --git a/extras/Package_fonts.mk b/extras/Package_fonts.mk
index 952c8286a5e7d222926518b07938ed5a345b7b78..8d2d23cbed6bc21320f8ac005988584cf31b0a12 100644 (file)
--- a/extras/Package_fonts.mk
+++ b/extras/Package_fonts.mk
@@ -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: