From 98e40ee45d36f17396574efd3c195e9ffa34e1b8 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 31 Oct 2019 17:26:41 +0000 Subject: [PATCH] allow-opensymbol-rebuild Gbp-Pq: Name allow-opensymbol-rebuild.diff --- Makefile.fetch | 3 ++- config_host.mk.in | 2 ++ configure.ac | Bin 461241 -> 461893 bytes download.lst | 1 + extras/CustomTarget_opensymbol.mk | 23 +++++++++++++++++++++++ extras/Module_extras.mk | 4 ++++ extras/Package_fonts.mk | 6 ++++-- 7 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 extras/CustomTarget_opensymbol.mk diff --git a/Makefile.fetch b/Makefile.fetch index fce291d2c3a..44f5031aac4 100644 --- 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 7104e271769..e869db5d810 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -193,6 +193,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@ @@ -436,6 +437,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 2e424356286e34bb5ad7009d10e8f4121a9715e4..5092597aaefe8887a65f5dba2ef90925c18198e0 100644 GIT binary patch delta 474 zcmdlvS?1^rnGLSn1(HfLb5eBk3sUonD|3_bb0!;pQshGuYJ4F+`P?>M53s8E_;|gN zk~BR9Cy-8s%o2snyyBA7#1uV+kc`Y?g}l_%lwvLg7)Z;{D@n^QN>2qVOU%hhP0^eD z;DA`O>-Kin?TkRo1jNih%(C5eJL|f(>1>@$GSd&#GqUj@+c*7yAFIgp1OXN{PPk*I zH|n#BPH*_eEUD<|93S8q;t?MZuVN_F+Ml@WtLS8<^UqA;>FN|VQnQpM0ku%0Wz|}7}($~q~Cq5*^&DO*+ z(aa>xI4L>J$RN?&(!eq)(a7A?(AdP%$k;H&%*@m%B{jt|ImO7r#30qu%rME+(99&o zz%nJ(I4v#F%oq~v&;Xq-c#Kij8exMHS6U_)(0Re3PQf7>2yu|jng|KFmo&G3v}HSS F8UWLHpWgrg delta 40 scmX>)LuTh>nGLSno7r}>v+ZC6VkRJF24a@&Y&%%jwQa9=U^{ji09YRor~m)} diff --git a/download.lst b/download.lst index 3b526c2befb..ffc66485e19 100644 --- 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 index 00000000000..a27718feb37 --- /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 2aa41bda390..164d38aefd1 100644 --- 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 952c8286a5e..8d2d23cbed6 100644 --- 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: -- 2.30.2