From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F0EE715A7D9 for ; Sun, 19 Mar 2023 16:56:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FAEEE0895; Sun, 19 Mar 2023 16:56:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D4ED1E0895 for ; Sun, 19 Mar 2023 16:56:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CEB08340F4A for ; Sun, 19 Mar 2023 16:56:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28155804 for ; Sun, 19 Mar 2023 16:56:44 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1679244992.70234672c7fb2716c2284bb17f0798c5488d49ab.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-fonts/noto-emoji/, media-fonts/noto-emoji/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-fonts/noto-emoji/files/noto-emoji-20180823-build-path.patch media-fonts/noto-emoji/files/noto-emoji-20190328-use-gm.patch media-fonts/noto-emoji/files/noto-emoji-build-all-flags.patch media-fonts/noto-emoji/files/noto-emoji-pngquant-verbose.patch media-fonts/noto-emoji/noto-emoji-20220912.ebuild X-VCS-Directories: media-fonts/noto-emoji/ media-fonts/noto-emoji/files/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 70234672c7fb2716c2284bb17f0798c5488d49ab X-VCS-Branch: master Date: Sun, 19 Mar 2023 16:56:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d2dcb28a-38c2-4b6b-ab3b-681284f1e183 X-Archives-Hash: 789a2cd0fa2a70cf7dbede31324b5e3a commit: 70234672c7fb2716c2284bb17f0798c5488d49ab Author: Pacho Ramos gentoo org> AuthorDate: Sun Mar 19 16:34:39 2023 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sun Mar 19 16:56:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70234672 media-fonts/noto-emoji: drop 20220912 Signed-off-by: Pacho Ramos gentoo.org> .../files/noto-emoji-20180823-build-path.patch | 11 -- .../files/noto-emoji-20190328-use-gm.patch | 27 ----- .../files/noto-emoji-build-all-flags.patch | 11 -- .../files/noto-emoji-pngquant-verbose.patch | 11 -- media-fonts/noto-emoji/noto-emoji-20220912.ebuild | 116 --------------------- 5 files changed, 176 deletions(-) diff --git a/media-fonts/noto-emoji/files/noto-emoji-20180823-build-path.patch b/media-fonts/noto-emoji/files/noto-emoji-20180823-build-path.patch deleted file mode 100644 index 151f88251524..000000000000 --- a/media-fonts/noto-emoji/files/noto-emoji-20180823-build-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/add_glyphs.py.old 2018-11-18 11:11:56.387323302 +0100 -+++ b/add_glyphs.py 2018-11-18 11:12:18.203529159 +0100 -@@ -22,7 +22,7 @@ - import add_emoji_gsub - import add_aliases - --sys.path.append( -+sys.path.insert(0, - path.join(os.path.dirname(__file__), 'third_party', 'color_emoji')) - from png import PNG - diff --git a/media-fonts/noto-emoji/files/noto-emoji-20190328-use-gm.patch b/media-fonts/noto-emoji/files/noto-emoji-20190328-use-gm.patch deleted file mode 100644 index 6b51d0f52168..000000000000 --- a/media-fonts/noto-emoji/files/noto-emoji-20190328-use-gm.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/Makefile~ 2019-03-28 17:45:53.000000000 +0100 -+++ b/Makefile 2019-06-02 10:36:55.587055453 +0200 -@@ -21,7 +21,7 @@ - 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 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. -@@ -165,13 +165,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 | $(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/media-fonts/noto-emoji/files/noto-emoji-build-all-flags.patch b/media-fonts/noto-emoji/files/noto-emoji-build-all-flags.patch deleted file mode 100644 index 564b08a59078..000000000000 --- a/media-fonts/noto-emoji/files/noto-emoji-build-all-flags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/media-fonts/noto-emoji/files/noto-emoji-pngquant-verbose.patch b/media-fonts/noto-emoji/files/noto-emoji-pngquant-verbose.patch deleted file mode 100644 index 8a152bea23d9..000000000000 --- a/media-fonts/noto-emoji/files/noto-emoji-pngquant-verbose.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile~ 2020-04-22 23:04:44.000000000 +0200 -+++ b/Makefile 2020-04-22 23:06:42.069275340 +0200 -@@ -20,7 +20,7 @@ - - PNGQUANT = pngquant - PYTHON = python3 --PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force -+PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force -v - BODY_DIMENSIONS = 136x128 - IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center - diff --git a/media-fonts/noto-emoji/noto-emoji-20220912.ebuild b/media-fonts/noto-emoji/noto-emoji-20220912.ebuild deleted file mode 100644 index 2d31c4c23a4f..000000000000 --- a/media-fonts/noto-emoji/noto-emoji-20220912.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) - -inherit font python-any-r1 - -DESCRIPTION="Google Noto Emoji fonts" -HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji" - -COMMIT="e8073ab740292f8d5f19b5de144087ac58044d06" -SRC_URI="https://github.com/googlefonts/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0 OFL-1.1" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="buildfont" - -BDEPEND=" - buildfont? ( - ${PYTHON_DEPS} - app-arch/zopfli - $(python_gen_any_dep ' - >=dev-python/fonttools-4.7.0[${PYTHON_USEDEP}] - >=dev-python/nototools-0.2.13[${PYTHON_USEDEP}] - ') - media-gfx/pngquant - x11-libs/cairo - || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) - ) -" - -RESTRICT="binchecks strip" - -S="${WORKDIR}/${PN}-${COMMIT}" - -python_check_deps() { - python_has_version ">=dev-python/fonttools-4.7.0[${PYTHON_USEDEP}]" \ - ">=dev-python/nototools-0.2.13[${PYTHON_USEDEP}]" -} - -pkg_setup() { - font_pkg_setup - use buildfont && python-any-r1_pkg_setup -} - -src_prepare() { - default - - # Drop font for Windows 10 - rm fonts/NotoColorEmoji_WindowsCompatible.ttf || die - - if use buildfont; then - # From Fedora - eapply "${FILESDIR}/${PN}-build-all-flags.patch" - - # https://github.com/googlei18n/noto-emoji/issues/240 - eapply "${FILESDIR}/${PN}-20180823-build-path.patch" - - # Be more verbose, bug #717654 - eapply "${FILESDIR}"/${PN}-pngquant-verbose.patch - sed -i -e 's:@$(ZOPFLIPNG) -y "$<" "$@" 1> /dev/null 2>&1:@$(ZOPFLIPNG) -y "$<" "$@":g' Makefile || die - - # Based on Fedora patch to allow graphicsmagick usage - if has_version -b media-gfx/graphicsmagick[png]; then - eapply "${FILESDIR}/${PN}-20190328-use-gm.patch" - fi - fi -} - -src_compile() { - if ! use buildfont; then - einfo "Installing pre-built fonts provided by upstream." - einfo "They could be not fully updated or miss some items." - einfo "To build fonts based on latest images enable 'buildfont'" - einfo "USE (that will require more time and resources too)." - else - python_setup - einfo "Building fonts..." - - # From Debian: - # The build requires a VIRTUAL_ENV variable and sequence check isn't working - VIRTUAL_ENV=true \ - BYPASS_SEQUENCE_CHECK=true \ - default - fi -} - -src_install() { - if ! use buildfont; then - FONT_S="${S}/fonts" - # Drop non used fonts - rm -f fonts/*COLR*.ttf || die - else - # Drop Windows compatible fonts and temporal files - rm -f *tmpl.ttf *Windows*.ttf *COLR*.ttf || die - - # Built fonts - FONT_S="${S}" - - # Don't lose fancy emoji icons - for i in 32 72 128 512; do - insinto "/usr/share/icons/${PN}/${i}/emotes/" - doins png/"${i}"/*.png - done - - insinto /usr/share/icons/"${PN}"/scalable/emotes/ - doins svg/*.svg - fi - - FONT_SUFFIX="ttf" - font_src_install - - dodoc README.md -}