update to 20200916

2020-10-29 15:14:37 +08:00 · 2020-10-29 15:14:37 +08:00 · fa1e3f0487
commit fa1e3f0487
parent a0cf3fec81
5 changed files with 70 additions and 267 deletions
--- a/google-noto-emoji-fonts.spec
+++ b/google-noto-emoji-fonts.spec
@ -1,62 +1,71 @@
-Name:               google-noto-emoji-fonts
-Version:            20180814
-Release:            4
-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
-
+%global fontname google-noto-emoji
+ 
+Name:           %{fontname}-fonts
+Version:        20200916
+Release:        1
+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/googlei18n/noto-emoji/archive/v2020-09-16-unicode13_1.tar.gz
+Source1:        %{fontname}.metainfo.xml
+Source2:        %{fontname}-color.metainfo.xml
+ 
+Patch0:         noto-emoji-build-all-flags.patch
+Patch1:         noto-emoji-use-gm.patch
+Patch2:         noto-emoji-use-system-pngquant.patch 
+ 
 BuildArch:          noarch

-BuildRequires:      fontpackages-devel fonttools python2-fonttools nototools python2-devel
-BuildRequires:      GraphicsMagick pngquant zopfli cairo-devel python2-nototools gdb
-
+BuildRequires:      fontpackages-devel fonttools python3-fonttools nototools python3-devel
+BuildRequires:      GraphicsMagick pngquant zopfli cairo-devel python3-nototools gdb
+ 
 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
-
+%autosetup -n noto-emoji-2020-09-16-unicode13_1 -p1
+ 
 rm -rf third_party/pngquant
-
+ 
 %build
-
+export LANG=C.UTF-8
+ 
+%make_build OPT_CFLAGS="$RPM_OPT_FLAGS" BYPASS_SEQUENCE_CHECK='True'
+ 
 %install
-install -m 0755 -d %{buildroot}/usr/share/fonts/google-noto-emoji
-install -m 0644 -p fonts/NotoColorEmoji.ttf %{buildroot}/usr/share/fonts/google-noto-emoji
-install -m 0644 -p fonts/NotoEmoji-Regular.ttf %{buildroot}/usr/share/fonts/google-noto-emoji
+install -m 0755 -d %{buildroot}%{_fontdir}
+
+install -m 0644 -p NotoColorEmoji.ttf %{buildroot}%{_fontdir}
+install -m 0644 -p fonts/NotoEmoji-Regular.ttf %{buildroot}%{_fontdir}
+ 
 mkdir -p %{buildroot}%{_datadir}/appdata
 install -m 0644 -p %{SOURCE1} %{buildroot}%{_datadir}/appdata
 install -m 0644 -p %{SOURCE2} %{buildroot}%{_datadir}/appdata
-
+ 
 %files
 %defattr(-,root,root)
 %doc AUTHORS CONTRIBUTING.md CONTRIBUTORS README.md
 %license LICENSE
 %{_datadir}/fonts/google-noto-emoji/*.ttf
 %{_datadir}/appdata/google-noto-emoji*.xml
-
+ 
 %changelog
+* Thu Oct 29 2020 jinzhimin <jinzhimin2@huawei.com> - 20200916-1
+- update to 20200916
+
 * Fri Mar 20 2020 songnannan <songnannan2@huawei.com> - 20180814-4
 - add gdb in buildrequires

--- a/noto-emoji-python2.patch
+++ b/noto-emoji-python2.patch
@ -1,176 +0,0 @@
-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");
--- a/noto-emoji-use-gm.patch
+++ b/noto-emoji-use-gm.patch
@ -1,25 +1,24 @@
-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
+diff -ru noto-emoji-f8131fc45736000552cd04a8388dc414d666a829.orig/Makefile noto-emoji-f8131fc45736000552cd04a8388dc414d666a829/Makefile
+--- noto-emoji-f8131fc45736000552cd04a8388dc414d666a829.orig/Makefile	2020-06-25 16:02:56.000000000 +0200
+++ noto-emoji-f8131fc45736000552cd04a8388dc414d666a829/Makefile	2020-07-21 11:12:06.948389580 +0200
+@@ -22,7 +22,8 @@
+ PYTHON = python3
 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
+ ZOPFLIPNG = zopflipng
+ TTX = ttx
+@@ -163,13 +164,13 @@
 # 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)
+ $(FLAGS_DIR)/%.png: $(FLAGS_SRC_DIR)/%.png ./waveflag | $(FLAGS_DIR)
 	@./waveflag $(FLAGS_DIR)/ "$<"
 
 $(RESIZED_FLAGS_DIR)/%.png: $(FLAGS_DIR)/%.png | $(RESIZED_FLAGS_DIR)
@ -28,3 +27,4 @@ Index: noto-emoji-352632eb1935fd2b732f6f3ca0a24e9754c3eccf/Makefile
 
 flag-symlinks: $(RESIZED_FLAG_FILES) | $(RENAMED_FLAGS_DIR)
 	@$(subst ^, ,                                  \
+
--- a/noto-emoji-use-system-pngquant.patch
+++ b/noto-emoji-use-system-pngquant.patch
@ -1,59 +1,29 @@
-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 @@
+diff -ru noto-emoji-d5e261484286d33a1fe8a02676f5907ecc02106f.orig/Makefile noto-emoji-d5e261484286d33a1fe8a02676f5907ecc02106f/Makefile
+--- noto-emoji-d5e261484286d33a1fe8a02676f5907ecc02106f.orig/Makefile	2020-07-23 18:53:36.935321925 +0200
+++ noto-emoji-d5e261484286d33a1fe8a02676f5907ecc02106f/Makefile	2020-07-23 19:05:20.380141144 +0200
+@@ -15,10 +15,10 @@
 EMOJI = NotoColorEmoji
 font: $(EMOJI).ttf
 
 -CFLAGS = -std=c99 -Wall -Wextra `pkg-config --cflags --libs cairo`
-+CFLAGS = $(OPT_CFLAGS) `pkg-config --cflags --libs cairo`
+CFLAGS = $(OPT_CFLAGS) -Wextra `pkg-config --cflags --libs cairo`
 LDFLAGS = -lm `pkg-config --libs cairo`
-PNGQUANTDIR := third_party/pngquant
-PNGQUANT := $(PNGQUANTDIR)/pngquant
-+PNGQUANT = pngquant
+ 
+-PNGQUANT = pngquant
+PNGQUANT = /usr/bin/pngquant
+ PYTHON = python3
 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))
+@@ -87,9 +87,9 @@
+   endif
+ endif
 
- # 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 @@
+-ifndef VIRTUAL_ENV
+-  MISSING_VENV = fail
+-endif
+#ifndef VIRTUAL_ENV
+#  MISSING_VENV = fail
+#endif
 
- 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
+ ifeq (, $(shell which $(VS_ADDER)))
+   MISSING_PY_TOOLS = fail
--- a/v2020-09-16-unicode13_1.tar.gz
+++ b/v2020-09-16-unicode13_1.tar.gz