sorry for the noise, git send-email had slight problems with my smtp server…
Am Dienstag, den 07.08.2018, 14:39 +0200 schrieb Florian Bäuerle:
> As all ttfs font packages, xorg-font-ttf-android used to install fonts
> into xorg-fonts' package and defers the mkfontdir- and mkfontscale steps
> to xorg-fonts.targetinstall. This was a nice trick to spare the
> generation of fonts.{dir,scale} in every font package, but it breaks the
> collection feature for ttf-fonts.
>
> Signed-off-by: Florian Bäuerle <[email protected]>
> ---
> rules/xorg-font-ttf-android.make | 50 ++++++++++++++++++++------------
> 1 file changed, 32 insertions(+), 18 deletions(-)
>
> diff --git a/rules/xorg-font-ttf-android.make
> b/rules/xorg-font-ttf-android.make
> index 443f855aa..adad187c5 100644
> --- a/rules/xorg-font-ttf-android.make
> +++ b/rules/xorg-font-ttf-android.make
> @@ -1,6 +1,7 @@
> # -*-makefile-*-
> #
> # Copyright (C) 2015 by Michael Olbrich <[email protected]>
> +# (C) 2018 by Florian Bäuerle <[email protected]>
> #
> # See CREDITS for details about who has contributed to this project.
> #
> @@ -28,18 +29,8 @@ XORG_FONT_TTF_ANDROID_LICENSE := Apache-2.0
> XORG_FONT_TTF_ANDROID_LICENSE_FILES := \
> file://NOTICE;md5=9645f39e9db895a4aa6e02cb57294595
>
> -ifdef PTXCONF_XORG_FONT_TTF_ANDROID
> -$(STATEDIR)/xorg-fonts.targetinstall.post:
> $(STATEDIR)/xorg-font-ttf-android.targetinstall
> -endif
> -
> -#
> ----------------------------------------------------------------------------
> -# Prepare
> -#
> ----------------------------------------------------------------------------
> -
> -#
> -# autoconf
> -#
> -XORG_FONT_TTF_ANDROID_CONF_TOOL := NO
> +XORG_FONT_TTF_ANDROID_FONTDIR :=
> $(XORG_FONTDIR)/truetype/android
> +XORG_FONT_TTF_ANDROID_FONTPKGDIR :=
> $(XORG_FONT_TTF_ANDROID_PKGDIR)$(XORG_FONT_TTF_ANDROID_FONTDIR)
>
> #
> ----------------------------------------------------------------------------
> # Compile
> @@ -55,6 +46,18 @@ $(STATEDIR)/xorg-font-ttf-android.compile:
>
> $(STATEDIR)/xorg-font-ttf-android.install:
> @$(call targetinfo)
> +
> + @rm -rf $(XORG_FONT_TTF_ANDROID_PKGDIR)
> + @mkdir -p $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
> + @find $(XORG_FONT_TTF_ANDROID_DIR) \
> + -name "*.ttf" \
> + | \
> + while read file; do \
> + install -m 644 $${file} $(XORG_FONT_TTF_ANDROID_FONTPKGDIR); \
> + done
> + @mkfontscale $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
> + @mkfontdir $(XORG_FONT_TTF_ANDROID_FONTPKGDIR)
> +
> @$(call touch)
>
> #
> ----------------------------------------------------------------------------
> @@ -64,14 +67,25 @@ $(STATEDIR)/xorg-font-ttf-android.install:
> $(STATEDIR)/xorg-font-ttf-android.targetinstall:
> @$(call targetinfo)
>
> - @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
> + @$(call install_init, xorg-font-ttf-android)
> + @$(call install_fixup, xorg-font-ttf-android,PRIORITY,optional)
> + @$(call install_fixup, xorg-font-ttf-android,SECTION,base)
> + @$(call install_fixup, xorg-font-ttf-android,AUTHOR,"Florian Bäuerle
> <[email protected]>")
> + @$(call install_fixup, xorg-font-ttf-android,DESCRIPTION,missing)
>
> - @find $(XORG_FONT_TTF_ANDROID_DIR) \
> - -name "*.ttf" \
> - | \
> - while read file; do \
> - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
> + @$(call install_tree, xorg-font-ttf-android, 0, 0, -,
> $(XORG_FONT_TTF_ANDROID_FONTDIR))
> +
> +ifdef PTXCONF_XORG_FONTS_QT4_LINKS
> + @cd $(XORG_FONT_TTF_ANDROID_PKGDIR) && \
> + find . -type f -name "*.ttf" | while read file; do \
> + name=$$(basename $$file); \
> + $(call install_link, xorg-font-ttf-android, \
> + ../../..$(XORG_FONT_TTF_ANDROID_FONTDIR)/$$name, \
> + /usr/lib/fonts/$$name); \
> done
> +endif
> +
> + @$(call install_finish, xorg-font-ttf-android)
>
> @$(call touch)
>
_______________________________________________
ptxdist mailing list
[email protected]
