From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- media-fonts/noto-emoji/Manifest | 6 +++ .../files/noto-emoji-build-all-flags.patch | 11 ++++ .../noto-emoji/files/noto-emoji-use-gm.patch | 30 +++++++++++ .../files/noto-emoji-use-system-pngquant.patch | 59 ++++++++++++++++++++++ media-fonts/noto-emoji/metadata.xml | 8 +++ media-fonts/noto-emoji/noto-emoji-20180814.ebuild | 52 +++++++++++++++++++ 6 files changed, 166 insertions(+) create mode 100644 media-fonts/noto-emoji/Manifest create mode 100644 media-fonts/noto-emoji/files/noto-emoji-build-all-flags.patch create mode 100644 media-fonts/noto-emoji/files/noto-emoji-use-gm.patch create mode 100644 media-fonts/noto-emoji/files/noto-emoji-use-system-pngquant.patch create mode 100644 media-fonts/noto-emoji/metadata.xml create mode 100644 media-fonts/noto-emoji/noto-emoji-20180814.ebuild (limited to 'media-fonts/noto-emoji') diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest new file mode 100644 index 000000000000..13b29caded14 --- /dev/null +++ b/media-fonts/noto-emoji/Manifest @@ -0,0 +1,6 @@ +AUX noto-emoji-build-all-flags.patch 336 BLAKE2B b6c10010f9fe3b1e62ce436bbd0fae6ac85bd8feb2776d2d731a9b155818b828b7ecc1ec58861976b890eb1faf4db59bead3e86e7c39e44113b11152347cba29 SHA512 0d67afa05081da93cf05827dde54cbb6ce593e79874e823680d1c521c0953c49d4dcf12135da43b74bc72b4a79e8b7b0123ae2b2cd631f040c6797e04d3f008a +AUX noto-emoji-use-gm.patch 1488 BLAKE2B 08bb2fa62c79615992c25503093d9ee8296dd3d0103ae50e9376020730c48d8e3eb5da281f066242b25d8e5c6a293cdb013b9d276fb10350021479aade1e78ab SHA512 0719575b7d2c3f0cc15c7e7a314e4a528b0601e14b8a06f0304a784d3d5dcf27cf4f881e4b57bb4647ba0cb36ba7be842bea2df1529de55d6ca16b6326c930d8 +AUX noto-emoji-use-system-pngquant.patch 2118 BLAKE2B 55048756859ead78a013a6ff749500107d9fe02fcfe775582fade153f268c5daa6f074ea1e8ea260bd09af077cc19cd8121b570bac47649b669df196e43d2574 SHA512 6bd4dd9e45aa73d8677c671a5ee3d6f03b3e94004db9b9c715cf76402ab2a641ce79991ec583cfe3a15a6c9803de4bfa863bd30cf16e96e9cb8a4683d6c04807 +DIST noto-emoji-20180814.tar.gz 51709109 BLAKE2B 9678861973b231de48b11dc9267840e4a4a6689c7c26281dfc1d6b0d4c1c1c627b503226d7eeac2f568dc19162c669b54c8dd34f5aa449850797437cf3a2e8cb SHA512 bca0fb73d3897c4ec1ba94173fda17804cdf2dfa365aa4a19bf1d24e9a94806bcdd5e6eb6304eb3e2312b37f37fa917905be6fe11c84510214f0eba70f426ea8 +EBUILD noto-emoji-20180814.ebuild 1111 BLAKE2B 0c7dc7b7689933d5d21a108eb30496e264d17ac8401df48c60dcb87ea3c188edd33510612e86ad4857a2f8c1c53616b3af4f1f5696e208bc7c69e22fb39eca40 SHA512 b465734cfd567ad77fa30c860e0f3ddaed332db9acf0c570d0fffda95316601ad52f0ba1384f14e78a956dbce6fa92b417e72faaae5896a0d1e783ef1a8c0a81 +MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a 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 new file mode 100644 index 000000000000..564b08a59078 --- /dev/null +++ b/media-fonts/noto-emoji/files/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/media-fonts/noto-emoji/files/noto-emoji-use-gm.patch b/media-fonts/noto-emoji/files/noto-emoji-use-gm.patch new file mode 100644 index 000000000000..5710fd53dc5c --- /dev/null +++ b/media-fonts/noto-emoji/files/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/media-fonts/noto-emoji/files/noto-emoji-use-system-pngquant.patch b/media-fonts/noto-emoji/files/noto-emoji-use-system-pngquant.patch new file mode 100644 index 000000000000..ddc6ff881ce1 --- /dev/null +++ b/media-fonts/noto-emoji/files/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/media-fonts/noto-emoji/metadata.xml b/media-fonts/noto-emoji/metadata.xml new file mode 100644 index 000000000000..3da97a9953cc --- /dev/null +++ b/media-fonts/noto-emoji/metadata.xml @@ -0,0 +1,8 @@ + + + + + pacho@gentoo.org + Pacho Ramos + + diff --git a/media-fonts/noto-emoji/noto-emoji-20180814.ebuild b/media-fonts/noto-emoji/noto-emoji-20180814.ebuild new file mode 100644 index 000000000000..7dd40de2811e --- /dev/null +++ b/media-fonts/noto-emoji/noto-emoji-20180814.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit font python-any-r1 + +DESCRIPTION="Google Noto Emoji fonts" +HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-emoji" + +COMMIT="3ffd20ec7504657aa17c84f9aa475ad09b20c362" +SRC_URI="https://github.com/googlei18n/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="${PYTHON_DEPS} + app-arch/zopfli + dev-python/fonttools + dev-python/nototools + media-gfx/pngquant + x11-libs/cairo + || ( media-gfx/imagemagick media-gfx/graphicsmagick ) +" +RDEPEND="" + +RESTRICT="binchecks strip" + +S="${WORKDIR}/${PN}-${COMMIT}" + +FONT_S="${S}" +FONT_SUFFIX="ttf" + +PATCHES=( + # From Fedora + "${FILESDIR}/${PN}-use-system-pngquant.patch" + "${FILESDIR}/${PN}-build-all-flags.patch" +) + +src_prepare() { + default + # Use system pngquant + rm -rf third_party/pngquant + + # Fedora patch to allow graphicsmagick usage + if has_version media-gfx/graphicsmagick; then + eapply "${FILESDIR}/${PN}-use-gm.patch" + fi +} -- cgit v1.2.3