commit ea0be1fbaf86a06b60e8b1833e2e6e59da3ba3a2 Author: overweight <5324761+overweight@user.noreply.gitee.com> Date: Mon Sep 30 10:51:00 2019 -0400 Package init diff --git a/google-noto-emoji-color.metainfo.xml b/google-noto-emoji-color.metainfo.xml new file mode 100644 index 0000000..4316bcd --- /dev/null +++ b/google-noto-emoji-color.metainfo.xml @@ -0,0 +1,11 @@ + + + + google-noto-emoji-color + CC-BY-3.0 + Noto Color Emoji + Google Noto Color Emoji Font + https://github.com/googlei18n/noto-emoji + + google-noto + diff --git a/google-noto-emoji-fonts.spec b/google-noto-emoji-fonts.spec new file mode 100644 index 0000000..1ec1480 --- /dev/null +++ b/google-noto-emoji-fonts.spec @@ -0,0 +1,69 @@ +Name: google-noto-emoji-fonts +Version: 20180814 +Release: 2 +Summary: Color and Black-and-White noto emoji fonts + +License: OFL and ASL 2.0 +URL: https://github.com/googlei18n/noto-emoji +Source0: https://github.com/googlefonts/noto-emoji/archive/v2018-08-10-unicode11.tar.gz +Source1: google-noto-emoji.metainfo.xml +Source2: google-noto-emoji-color.metainfo.xml + +Patch0: noto-emoji-use-system-pngquant.patch +Patch1: noto-emoji-build-all-flags.patch +Patch2: noto-emoji-use-gm.patch +Patch3: noto-emoji-python2.patch + +BuildArch: noarch + +BuildRequires: fontpackages-devel fonttools python2-fonttools nototools python2-devel +BuildRequires: GraphicsMagick pngquant zopfli cairo-devel python2-nototools + +Requires: fontpackages-filesystem + +Provides: google-noto-color-emoji-fonts = 20150617 google-noto-emoji-color-fonts +Obsoletes: google-noto-color-emoji-fonts < 20150617 google-noto-emoji-color-fonts + +%description +This package includes color and Black-and-White noto emoji fonts, and tools for working with them. + +%_font_pkg NotoEmoji-Regular.ttf NotoColorEmoji.ttf +%license LICENSE +%doc AUTHORS CONTRIBUTING.md CONTRIBUTORS README.md + +%{_datadir}/appdata/google-noto-emoji.metainfo.xml +%{_datadir}/appdata/google-noto-emoji-color.metainfo.xml + +%prep +%autosetup -n noto-emoji-2018-08-10-unicode11 + +rm -rf third_party/pngquant + +%build +export LANG=C.UTF-8 +%make_build OPT_CFLAGS="$RPM_OPT_FLAGS" + +%install +mkdir -p %{buildroot}%{_fontdir} +chmod 755 %{buildroot}%{_fontdir} + +cp NotoColorEmoji.ttf %{buildroot}%{_fontdir} +chmod 644 %{buildroot}%{_fontdir}/NotoColorEmoji.ttf +touch %{buildroot}%{_fontdir}/NotoColorEmoji.ttf + +cp fonts/NotoEmoji-Regular.ttf %{buildroot}%{_fontdir} +chmod 644 %{buildroot}%{_fontdir}/NotoEmoji-Regular.ttf +touch %{buildroot}%{_fontdir}/NotoEmoji-Regular.ttf + +mkdir -p %{buildroot}%{_datadir}/appdata +cp %{SOURCE1} %{buildroot}%{_datadir}/appdata +chmod 644 %{buildroot}%{_datadir}/appdata/google-noto-emoji.metainfo.xml +touch %{buildroot}%{_datadir}/appdata/google-noto-emoji.metainfo.xml + +cp %{SOURCE2} %{buildroot}%{_datadir}/appdata +chmod 644 %{buildroot}%{_datadir}/appdata/google-noto-emoji-color.metainfo.xml +touch %{buildroot}%{_datadir}/appdata/google-noto-emoji-color.metainfo.xml + +%changelog +* Thu Sep 19 2019 dongjian - 20180814-2 +- Package init diff --git a/google-noto-emoji.metainfo.xml b/google-noto-emoji.metainfo.xml new file mode 100644 index 0000000..beecdc8 --- /dev/null +++ b/google-noto-emoji.metainfo.xml @@ -0,0 +1,11 @@ + + + + google-noto-emoji + CC-BY-3.0 + Noto Emoji + Google Noto Emoji Font + https://github.com/googlei18n/noto-emoji + + google-noto + diff --git a/noto-emoji-build-all-flags.patch b/noto-emoji-build-all-flags.patch new file mode 100644 index 0000000..564b08a --- /dev/null +++ b/noto-emoji-build-all-flags.patch @@ -0,0 +1,11 @@ +--- old/Makefile 2018-05-03 20:32:14.000000000 +0200 ++++ new/Makefile 2018-05-08 11:48:20.811073447 +0200 +@@ -78,7 +78,7 @@ + + ALL_FLAGS = $(basename $(notdir $(wildcard $(FLAGS_SRC_DIR)/*.png))) + +-FLAGS = $(SELECTED_FLAGS) ++FLAGS = $(ALL_FLAGS) + + FLAG_NAMES = $(FLAGS:%=%.png) + FLAG_FILES = $(addprefix $(FLAGS_DIR)/, $(FLAG_NAMES)) diff --git a/noto-emoji-python2.patch b/noto-emoji-python2.patch new file mode 100644 index 0000000..4ebb847 --- /dev/null +++ b/noto-emoji-python2.patch @@ -0,0 +1,176 @@ +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/Makefile noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/Makefile +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/Makefile 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/Makefile 2018-08-14 14:16:40.601744161 +0200 +@@ -209,7 +209,7 @@ + # Run make without -j if this happens. + + %.ttx: %.ttx.tmpl $(ADD_GLYPHS) $(ALL_COMPRESSED_FILES) +- @python $(ADD_GLYPHS) -f "$<" -o "$@" -d "$(COMPRESSED_DIR)" $(ADD_GLYPHS_FLAGS) ++ @python2 $(ADD_GLYPHS) -f "$<" -o "$@" -d "$(COMPRESSED_DIR)" $(ADD_GLYPHS_FLAGS) + + %.ttf: %.ttx + @rm -f "$@" +@@ -217,8 +217,8 @@ + + $(EMOJI).ttf: $(EMOJI).tmpl.ttf $(EMOJI_BUILDER) $(PUA_ADDER) \ + $(ALL_COMPRESSED_FILES) | check_vs_adder +- @python $(EMOJI_BUILDER) $(SMALL_METRICS) -V $< "$@" "$(COMPRESSED_DIR)/emoji_u" +- @python $(PUA_ADDER) "$@" "$@-with-pua" ++ @python2 $(EMOJI_BUILDER) $(SMALL_METRICS) -V $< "$@" "$(COMPRESSED_DIR)/emoji_u" ++ @python2 $(PUA_ADDER) "$@" "$@-with-pua" + @$(VS_ADDER) -vs 2640 2642 2695 --dstdir '.' -o "$@-with-pua-varsel" "$@-with-pua" + @mv "$@-with-pua-varsel" "$@" + @rm "$@-with-pua" +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/add_aliases.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/add_aliases.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/add_aliases.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/add_aliases.py 2018-08-14 14:15:28.586483050 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2017 Google Inc. All rights reserved. + # +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/add_emoji_gsub.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/add_emoji_gsub.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/add_emoji_gsub.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/add_emoji_gsub.py 2018-08-14 14:15:28.586483050 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2014 Google Inc. All rights reserved. + # +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/add_glyphs.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/add_glyphs.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/add_glyphs.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/add_glyphs.py 2018-08-14 14:15:28.587483040 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + """Extend a ttx file with additional data. + +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/add_svg_glyphs.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/add_svg_glyphs.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/add_svg_glyphs.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/add_svg_glyphs.py 2018-08-14 14:15:28.588483029 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2015 Google, Inc. All Rights Reserved. + # + # Licensed under the Apache License, Version 2.0 (the "License"); +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/check_emoji_sequences.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/check_emoji_sequences.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/check_emoji_sequences.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/check_emoji_sequences.py 2018-08-14 14:15:28.588483029 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2016 Google Inc. All rights reserved. + # +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/collect_emoji_svg.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/collect_emoji_svg.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/collect_emoji_svg.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/collect_emoji_svg.py 2018-08-14 14:15:28.589483019 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2015 Google, Inc. All Rights Reserved. + # + # Licensed under the Apache License, Version 2.0 (the "License"); +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/flag_glyph_name.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/flag_glyph_name.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/flag_glyph_name.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/flag_glyph_name.py 2018-08-14 14:15:28.589483019 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2014 Google Inc. All rights reserved. + # +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/flag_info.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/flag_info.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/flag_info.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/flag_info.py 2018-08-14 14:15:28.590483009 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright 2016 Google Inc. All rights reserved. + # +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/gen_version.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/gen_version.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/gen_version.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/gen_version.py 2018-08-14 14:15:28.590483009 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2015 Google Inc. All rights reserved. + # +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/generate_emoji_html.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/generate_emoji_html.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/generate_emoji_html.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/generate_emoji_html.py 2018-08-14 14:15:28.591482998 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2016 Google Inc. All rights reserved. + # +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/generate_emoji_name_data.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/generate_emoji_name_data.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/generate_emoji_name_data.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/generate_emoji_name_data.py 2018-08-14 14:15:28.591482998 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # -*- coding: utf-8 -*-# + # + # Copyright 2015 Google Inc. All rights reserved. +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/generate_emoji_thumbnails.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/generate_emoji_thumbnails.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/generate_emoji_thumbnails.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/generate_emoji_thumbnails.py 2018-08-14 14:15:28.592482988 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2017 Google Inc. All rights reserved. + # + # Licensed under the Apache License, Version 2.0 (the "License"); +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/generate_test_html.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/generate_test_html.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/generate_test_html.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/generate_test_html.py 2018-08-14 14:15:28.592482988 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2015 Google, Inc. All Rights Reserved. + # + # Licensed under the Apache License, Version 2.0 (the "License"); +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/map_pua_emoji.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/map_pua_emoji.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/map_pua_emoji.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/map_pua_emoji.py 2018-08-14 14:15:28.593482978 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2014 Google Inc. All rights reserved. + # +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/materialize_emoji_images.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/materialize_emoji_images.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/materialize_emoji_images.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/materialize_emoji_images.py 2018-08-14 14:15:28.593482978 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2016 Google Inc. All rights reserved. + # +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/strip_vs_from_filenames.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/strip_vs_from_filenames.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/strip_vs_from_filenames.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/strip_vs_from_filenames.py 2018-08-14 14:15:28.594482968 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2017 Google Inc. All rights reserved. + # +diff -ru noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/svg_cleaner.py noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/svg_cleaner.py +--- noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362.orig/svg_cleaner.py 2018-08-10 22:25:19.000000000 +0200 ++++ noto-emoji-3ffd20ec7504657aa17c84f9aa475ad09b20c362/svg_cleaner.py 2018-08-14 14:15:28.594482968 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2015 Google, Inc. All Rights Reserved. + # + # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/noto-emoji-use-gm.patch b/noto-emoji-use-gm.patch new file mode 100644 index 0000000..5710fd5 --- /dev/null +++ b/noto-emoji-use-gm.patch @@ -0,0 +1,30 @@ +Index: noto-emoji-352632eb1935fd2b732f6f3ca0a24e9754c3eccf/Makefile +=================================================================== +--- noto-emoji-352632eb1935fd2b732f6f3ca0a24e9754c3eccf.orig/Makefile ++++ noto-emoji-352632eb1935fd2b732f6f3ca0a24e9754c3eccf/Makefile +@@ -20,7 +20,8 @@ LDFLAGS = -lm `pkg-config --libs cairo` + PNGQUANT = pngquant + PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force + BODY_DIMENSIONS = 136x128 +-IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center ++#IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center ++IMOPS = -size 136x128 -background none -gravity center -extent 136x128 -compose copy + + # zopflipng is better (about 5-10%) but much slower. it will be used if + # present. pass ZOPFLIPNG= as an arg to make to use optipng instead. +@@ -172,13 +173,13 @@ waveflag: waveflag.c + # imagemagick packaged with ubuntu trusty (6.7.7-10) by using -composite. + + $(EMOJI_DIR)/%.png: $(EMOJI_SRC_DIR)/%.png | $(EMOJI_DIR) +- @convert $(IMOPS) "$<" -composite "PNG32:$@" ++ @gm convert $(IMOPS) "$<" "PNG32:$@" + + $(FLAGS_DIR)/%.png: $(FLAGS_SRC_DIR)/%.png ./waveflag $(PNGQUANT) | $(FLAGS_DIR) + @./waveflag $(FLAGS_DIR)/ "$<" + + $(RESIZED_FLAGS_DIR)/%.png: $(FLAGS_DIR)/%.png | $(RESIZED_FLAGS_DIR) +- @convert $(IMOPS) "$<" -composite "PNG32:$@" ++ @gm convert $(IMOPS) "$<" "PNG32:$@" + + flag-symlinks: $(RESIZED_FLAG_FILES) | $(RENAMED_FLAGS_DIR) + @$(subst ^, , \ diff --git a/noto-emoji-use-system-pngquant.patch b/noto-emoji-use-system-pngquant.patch new file mode 100644 index 0000000..ddc6ff8 --- /dev/null +++ b/noto-emoji-use-system-pngquant.patch @@ -0,0 +1,59 @@ +diff -ru noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5.orig/Makefile noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5/Makefile +--- noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5.orig/Makefile 2018-03-07 09:22:49.670696985 +0100 ++++ noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5/Makefile 2018-03-07 09:23:06.824506178 +0100 +@@ -15,10 +15,9 @@ + EMOJI = NotoColorEmoji + font: $(EMOJI).ttf + +-CFLAGS = -std=c99 -Wall -Wextra `pkg-config --cflags --libs cairo` ++CFLAGS = $(OPT_CFLAGS) `pkg-config --cflags --libs cairo` + LDFLAGS = -lm `pkg-config --libs cairo` +-PNGQUANTDIR := third_party/pngquant +-PNGQUANT := $(PNGQUANTDIR)/pngquant ++PNGQUANT = pngquant + PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force + BODY_DIMENSIONS = 136x128 + IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center +@@ -97,6 +96,12 @@ + ALL_COMPRESSED_FILES = $(addprefix $(COMPRESSED_DIR)/, $(ALL_NAMES)) + + # tool checks ++ifeq (,$(shell which $(PNGQUANT))) ++ ifeq (,$(wildcard $(PNGQUANT))) ++ MISSING_PNGQUANT = fail ++ endif ++endif ++ + ifeq (,$(shell which $(ZOPFLIPNG))) + ifeq (,$(wildcard $(ZOPFLIPNG))) + MISSING_ZOPFLI = fail +@@ -126,6 +131,11 @@ + + compressed: $(ALL_COMPRESSED_FILES) + ++check_quantization_tool: ++ifdef MISSING_PNGQUANT ++ $(error "$(PNGQUANT) is not available") ++endif ++ + check_compress_tool: + ifdef MISSING_ZOPFLI + ifdef MISSING_OPTIPNG +@@ -146,8 +156,7 @@ + $(EMOJI_DIR) $(FLAGS_DIR) $(RESIZED_FLAGS_DIR) $(RENAMED_FLAGS_DIR) $(QUANTIZED_DIR) $(COMPRESSED_DIR): + mkdir -p "$@" + +-$(PNGQUANT): +- $(MAKE) -C $(PNGQUANTDIR) ++$(PNGQUANT): check_quantization_tool + + waveflag: waveflag.c + $(CC) $< -o $@ $(CFLAGS) $(LDFLAGS) +@@ -227,5 +236,5 @@ + .SECONDARY: $(EMOJI_FILES) $(FLAG_FILES) $(RESIZED_FLAG_FILES) $(RENAMED_FLAG_FILES) \ + $(ALL_QUANTIZED_FILES) $(ALL_COMPRESSED_FILES) + +-.PHONY: clean flags emoji renamed_flags quantized compressed check_compress_tool ++.PHONY: clean flags emoji renamed_flags quantized compressed check_compress_tool check_quantization_tool + +noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5/ のみに存在: Makefile.orig diff --git a/v2018-08-10-unicode11.tar.gz b/v2018-08-10-unicode11.tar.gz new file mode 100644 index 0000000..b86b42b Binary files /dev/null and b/v2018-08-10-unicode11.tar.gz differ