.gitignore

@@ -16,4 +16,12 @@
 /results_google-noto-emoji-fonts/
 /noto-emoji-153e1d4.tar.gz
 /noto-emoji-352632e.tar.gz
+/noto-emoji-3ffd20e.tar.gz
+/noto-emoji-f09acc5.tar.gz
+/noto-emoji-833a43d.tar.gz
+/noto-emoji-16151a2.tar.gz
+/noto-emoji-ac1703e.tar.gz
+/noto-emoji-f8131fc.tar.gz
+/noto-emoji-d5e2614.tar.gz
 /noto-emoji-aac7cca.tar.gz
+/noto-emoji-9a5261d.tar.gz

gating.yaml

@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-8
+  - rhel-9
 decision_context: osci_compose_gate
 rules:
   # this is the testcase identifier, which OSCI pipeline uses

google-noto-emoji-fonts.spec

@@ -1,4 +1,4 @@
-%global commit0 aac7ccaa4d1dea4543453b96f7d6fc47066a57ff
+%global commit0 9a5261d871451f9b5183c93483cbd68ed916b1e9
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 %global fontname google-noto-emoji
@@ -11,8 +11,8 @@
 
 
 Name:           %{fontname}-fonts
-Version:        20200916
-Release:        2%{?dist}
+Version:        20211102
+Release:        1%{?dist}
 Summary:        Google “Noto Emoji” Black-and-White emoji font
 
 # In noto-emoji-fonts source
@@ -29,23 +29,25 @@ Source0:        https://github.com/googlei18n/noto-emoji/archive/%{commit0}.tar.
 Source2:        %{fontname}.metainfo.xml
 Source3:        %{fontname}-color.metainfo.xml
 
-Patch0:         noto-emoji-use-system-pngquant.patch
-Patch1:         noto-emoji-build-all-flags.patch
-Patch2:         noto-emoji-use-gm.patch
+Patch0:         noto-emoji-build-all-flags.patch
+Patch1:         noto-emoji-use-gm.patch
+Patch2:         noto-emoji-use-system-pngquant.patch
 
 BuildArch:      noarch
+BuildRequires:  gcc
 BuildRequires:  fontpackages-devel
 %if %buildfont
 BuildRequires:  fonttools
-BuildRequires:  python2-fonttools
+BuildRequires:  python3-fonttools
 BuildRequires:  nototools
-BuildRequires:  python2-nototools
-BuildRequires:  python2-devel
+BuildRequires:  python3-nototools
+BuildRequires:  python3-devel
 BuildRequires:  GraphicsMagick
 BuildRequires:  pngquant
 BuildRequires:  zopfli
 BuildRequires:  cairo-devel
 %endif
+BuildRequires: make
 
 Requires:       fontpackages-filesystem
 
@@ -65,7 +67,10 @@ Provides:       google-noto-color-emoji-fonts = 20150617
 This package provides the Google “Noto Color Emoji” colored emoji font.
 
 %prep
-%autosetup -n noto-emoji-%{commit0}
+%setup -n noto-emoji-%{commit0}
+%patch0 -p1 -b .noto-emoji-build-all-flags
+%patch1 -p1 -b .noto-emoji-use-gm.patch
+%patch2 -p1 -b .noto-emoji-use-system-pngquant
 
 rm -rf third_party/pngquant
 
@@ -74,7 +79,7 @@ rm -rf third_party/pngquant
 # Work around UTF-8
 export LANG=C.UTF-8
 
-make %{?_smp_mflags} OPT_CFLAGS="$RPM_OPT_FLAGS"
+%make_build OPT_CFLAGS="$RPM_OPT_FLAGS" BYPASS_SEQUENCE_CHECK='True'
 %endif
 
 %install
@@ -107,19 +112,72 @@ install -m 0644 -p %{SOURCE3} %{buildroot}%{_datadir}/appdata
 
 
 %changelog
-* Tue May 25 2021 Peng Wu <pwu@redhat.com> - 20200916-2
-- Rebuild the package
-- Resolves: RHBZ#1897541
+* Tue Nov  1 2022 Peng Wu <pwu@redhat.com> - 20211102-1
+- Update to v2.034
+- Resolves: #2118299
 
-* Tue May 25 2021 Peng Wu <pwu@redhat.com> - 20200916-1
-- Update to Unicode 13.1.0 support
-- Resolves: RHBZ#1897541
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 20200916-4
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Thu Jun 28 2018 Peng Wu <pwu@redhat.com> - 20180508-4
-- Resolves: RHBZ#1591712
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 20200916-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Wed Jun 27 2018 Lumír Balhar <lbalhar@redhat.com> - 20180508-3
-- Disable build of fonts and rather ship pre-built ones
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20200916-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Dec 24 2020 Peng Wu <pwu@redhat.com> - 20200916-1
+- Update to upstream snapshot tarball (Unicode 13.1.0 support)
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200723-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 21 2020 Mike FABIAN <mfabian@redhat.com> - 20200723-1
+- Update to upstream snapshot tarball (Unicode 13.0.0 support)
+
+* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 20200402-2
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+
+* Thu Apr 02 2020 Mike FABIAN <mfabian@redhat.com> - 20200402-1
+- Update to upstream snapshot tarball (fixes U+1F9D1 U+200D U+1F3A8 "artist"
+  and many other sequences)
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20191019-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Oct 19 2019 Mike FABIAN <mfabian@redhat.com> - 20191019-1
+- Update to upstream snapshot tarball (Fixes for people holding hands)
+
+* Thu Aug 29 2019 Mike FABIAN <mfabian@redhat.com> - 20190829-1
+- Update to upstream snapshot tarball (Fixes FR and NL flags)
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20190709-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jul 09 2019 Mike FABIAN <mfabian@redhat.com> - 20190709-1
+- Update to upstream snapshot tarball (Contains the new emoji added in Unicode 12.0.0,
+  also fixes the "people holding hands" sequence.
+- Port to Python3 and build using Python3
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20180814-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Aug 14 2018 Mike FABIAN <mfabian@redhat.com> - 20180814-1
+- Update to upstream snapshot tarball (Contains the new emoji added in Unicode 11.0.0)
+
+* Mon Jul 23 2018 Mike FABIAN <mfabian@redhat.com> - 20180508-6
+- Fix build in rawhide
+- Resolves: rhbz#1604247
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20180508-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 26 2018 Peng Wu <pwu@redhat.com> - 20180508-4
+- Fixes buildfont macro
+
+* Tue Jun 19 2018 Peng Wu <pwu@redhat.com> - 20180508-3
+- Only build emoji color font since Fedora 26
 
 * Wed May 23 2018 Peng Wu <pwu@redhat.com> - 20180508-2
 - Use GraphicsMagick instead of ImageMagick

noto-emoji-check-sequence.patch

@@ -0,0 +1,20 @@
+Index: noto-emoji-aac7ccaa4d1dea4543453b96f7d6fc47066a57ff/Makefile
+===================================================================
+--- noto-emoji-aac7ccaa4d1dea4543453b96f7d6fc47066a57ff.orig/Makefile
++++ noto-emoji-aac7ccaa4d1dea4543453b96f7d6fc47066a57ff/Makefile
+@@ -207,7 +207,7 @@ $(COMPRESSED_DIR)/%.png: $(QUANTIZED_DIR
+ 	@rm -f "$@"
+ 	ttx "$<"
+ 
+-$(EMOJI).ttf: check_sequence $(EMOJI).tmpl.ttf $(EMOJI_BUILDER) $(PUA_ADDER) \
++$(EMOJI).ttf: $(EMOJI).tmpl.ttf $(EMOJI_BUILDER) $(PUA_ADDER) \
+ 	$(ALL_COMPRESSED_FILES) | check_tools
+ 
+ 	@$(PYTHON) $(EMOJI_BUILDER) $(SMALL_METRICS) -V $(word 2,$^) "$@" "$(COMPRESSED_DIR)/emoji_u"
+@@ -231,5 +231,5 @@ clean:
+ .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_tools
++.PHONY:	clean flags emoji renamed_flags quantized compressed check_tools check_sequence
+ 

noto-emoji-use-system-pngquant.patch

@@ -1,9 +1,10 @@
-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
+Index: noto-emoji-c05b4b47c8250ccd232780cae46d66a8179e77ab/Makefile
+===================================================================
+--- noto-emoji-c05b4b47c8250ccd232780cae46d66a8179e77ab.orig/Makefile
++++ noto-emoji-c05b4b47c8250ccd232780cae46d66a8179e77ab/Makefile
+@@ -16,10 +16,10 @@ EMOJI = NotoColorEmoji
+ EMOJI_WINDOWS = NotoColorEmoji_WindowsCompatible
+ all: $(EMOJI).ttf $(EMOJI_WINDOWS).ttf
  
 -CFLAGS = -std=c99 -Wall -Wextra `pkg-config --cflags --libs cairo`
 +CFLAGS = $(OPT_CFLAGS) -Wextra `pkg-config --cflags --libs cairo`
@@ -14,7 +15,7 @@ diff -ru noto-emoji-d5e261484286d33a1fe8a02676f5907ecc02106f.orig/Makefile noto-
  PYTHON = python3
  PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
  BODY_DIMENSIONS = 136x128
-@@ -87,9 +87,9 @@
+@@ -88,9 +88,9 @@ ifeq (,$(shell which $(ZOPFLIPNG)))
    endif
  endif
  

sources

@@ -1 +1 @@
-SHA512 (noto-emoji-aac7cca.tar.gz) = d497c4ecaf299ade23b1f6a3bc6e98d7dbbb619e51f067496d4a4dbf71693c96de26263af595c0aae86c63dcea8be190718f5477af645d4338989f25cc3ab848
+SHA512 (noto-emoji-9a5261d.tar.gz) = b80d3ca838e0cc66b6b6af9b368164da3f40bd22cfbb1d923a172bd51e87f1db9b7722494f220e4e912160664bb1c5318bbd9253981c1262ce563482d6cad7a4