[gentoo-commits] repo/gentoo:master commit in: media-fonts/noto-emoji/files/, media-fonts/noto-emoji/
commit: 760c9bb13578bc621287372be63eb30ad48f922e
Author: Matt Jolly footclan ninja>
AuthorDate: Mon Aug 7 03:21:46 2023 +
Commit: Pacho Ramos gentoo org>
CommitDate: Tue Aug 8 09:20:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=760c9bb1
media-fonts/noto-emoji: add 20220912-r2
Add fontconfig for noto-color-emoji fallback
Signed-off-by: Matt Jolly footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/32203
Signed-off-by: Pacho Ramos gentoo.org>
.../noto-emoji/files/75-noto-emoji-fallback.conf | 31 +
.../noto-emoji/noto-emoji-20220912-r2.ebuild | 54 ++
2 files changed, 85 insertions(+)
diff --git a/media-fonts/noto-emoji/files/75-noto-emoji-fallback.conf
b/media-fonts/noto-emoji/files/75-noto-emoji-fallback.conf
new file mode 100644
index ..deb9c965b8b5
--- /dev/null
+++ b/media-fonts/noto-emoji/files/75-noto-emoji-fallback.conf
@@ -0,0 +1,31 @@
+
+
+
+:
+
+
+
+sans
+Noto Color
Emoji
+
+
+
+serif
+Noto Color
Emoji
+
+
+
+sans-serif
+Noto Color
Emoji
+
+
+
+monospace
+Noto Color
Emoji
+
+
+
diff --git a/media-fonts/noto-emoji/noto-emoji-20220912-r2.ebuild
b/media-fonts/noto-emoji/noto-emoji-20220912-r2.ebuild
new file mode 100644
index ..5d3bb6b9ac76
--- /dev/null
+++ b/media-fonts/noto-emoji/noto-emoji-20220912-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit font
+
+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="icons"
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+# https://github.com/gentoo/gentoo/pull/32203
+FONT_CONF=( "${FILESDIR}"/75-noto-emoji-fallback.conf )
+
+src_prepare() {
+ default
+
+ # Drop font for Windows 10
+ rm fonts/NotoColorEmoji_WindowsCompatible.ttf || die
+}
+
+src_compile() { :; }
+
+src_install() {
+ FONT_S="${S}/fonts"
+ # Drop non used fonts
+ rm -f fonts/*COLR*.ttf || die
+
+ # Don't lose fancy emoji icons
+ if use icons; then
+ 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
+}
[gentoo-commits] repo/gentoo:master commit in: media-fonts/noto-emoji/files/, media-fonts/noto-emoji/
commit: be3da6af87f09c3318bab72adc006c12f7b48e8b
Author: Pacho Ramos gentoo org>
AuthorDate: Thu Jul 8 12:41:24 2021 +
Commit: Pacho Ramos gentoo org>
CommitDate: Thu Jul 8 12:51:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be3da6af
media-fonts/noto-emoji: Drop old
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Pacho Ramos gentoo.org>
media-fonts/noto-emoji/Manifest| 2 -
.../files/noto-emoji-zopflipng-verbose.patch | 11 ---
.../noto-emoji/noto-emoji-20200317-r1.ebuild | 101
media-fonts/noto-emoji/noto-emoji-20200916.ebuild | 106 -
4 files changed, 220 deletions(-)
diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index 89121a3a3f4..71a5074554f 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -1,3 +1 @@
-DIST noto-emoji-20200317.tar.gz 60841240 BLAKE2B
aab99a5cbab6943b9e282b33dc113601489c7d02a3670db8675e6c90be615ceaf0f2900bdbc68ffaca6130f4e724b2ec1001cfccce80a181208ace0638492b7e
SHA512
958a589ef7d7a0b9e4fa3eb1caa20284fa7463419a740d0ca05f850618324883c13498f92839476042cfd1daffa7eff925b2f22ec318c0726391f69c04911bfb
-DIST noto-emoji-20200916.tar.gz 60016327 BLAKE2B
980a4e960f200567e34c1314d9269029749e1d9cd29ab1c5da30418d8a016b894223adf8f263222512c513feab4de856a2f48b1695011ced0c49c30e7a487e47
SHA512
d497c4ecaf299ade23b1f6a3bc6e98d7dbbb619e51f067496d4a4dbf71693c96de26263af595c0aae86c63dcea8be190718f5477af645d4338989f25cc3ab848
DIST noto-emoji-20201214.tar.gz 69885567 BLAKE2B
21d251a25740bf474e4c7e138c33d90f35cfea93ff2c72904e38a8bead0124408c67a731ed142fe96da07bbf8afb7d929293518a366157fd1393dacc560bf12b
SHA512
b3ad1f31bbb48bd5de2fbddcac5c3f27891a805ae4ac8d0b69b07c1d7259c6a5317eca9ac7e3b068d24ed5d3acd3523cfb2036f2e9f08179b85fd81dd5c9b570
diff --git a/media-fonts/noto-emoji/files/noto-emoji-zopflipng-verbose.patch
b/media-fonts/noto-emoji/files/noto-emoji-zopflipng-verbose.patch
deleted file mode 100644
index 0cb272994aa..000
--- a/media-fonts/noto-emoji/files/noto-emoji-zopflipng-verbose.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/Makefile~2020-04-22 23:07:33.0 +0200
-+++ b/Makefile 2020-04-22 23:11:46.356767595 +0200
-@@ -194,7 +194,7 @@
- ifdef MISSING_ZOPFLI
- @$(OPTIPNG) -quiet -o7 -clobber -force -out "$@" "$<"
- else
-- @$(ZOPFLIPNG) -y "$<" "$@" 1> /dev/null 2>&1
-+ @$(ZOPFLIPNG) -y "$<" "$@" 2>&1
- endif
-
-
diff --git a/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
b/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
deleted file mode 100644
index 84b1ddb0713..000
--- a/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit font python-any-r1
-
-DESCRIPTION="Google Noto Emoji fonts"
-HOMEPAGE="https://www.google.com/get/noto/
https://github.com/googlefonts/noto-emoji;
-
-COMMIT="ac1703e9d7feebbf5443a986e08332b1e1c5afcf"
-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 ~ppc64 x86"
-IUSE="buildfont"
-
-BDEPEND="
- buildfont? (
- ${PYTHON_DEPS}
- app-arch/zopfli
- $(python_gen_any_dep '
- dev-python/fonttools[${PYTHON_USEDEP}]
- dev-python/nototools[${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() {
- has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" &&
- has_version -b "dev-python/nototools[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- font_pkg_setup
-}
-
-src_prepare() {
- default
-
- 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
- eapply "${FILESDIR}"/${PN}-zopflipng-verbose.patch
-
- # Based on Fedora patch to allow graphicsmagick usage
- if has_version -b media-gfx/graphicsmagick; 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."
-
[gentoo-commits] repo/gentoo:master commit in: media-fonts/noto-emoji/files/, media-fonts/noto-emoji/
commit: babb7b9e7b1143d304a706a115fdbb8c032abfe2
Author: Pacho Ramos gentoo org>
AuthorDate: Thu Apr 23 00:29:00 2020 +
Commit: Pacho Ramos gentoo org>
CommitDate: Thu Apr 23 00:29:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=babb7b9e
media-fonts/noto-emoji: Rename patches
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Pacho Ramos gentoo.org>
.../{noto-emoji-pngquant.patch => noto-emoji-pngquant-verbose.patch} | 0
...{noto-emoji-zopflipng.patch => noto-emoji-zopflipng-verbose.patch} | 0
media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-fonts/noto-emoji/files/noto-emoji-pngquant.patch
b/media-fonts/noto-emoji/files/noto-emoji-pngquant-verbose.patch
similarity index 100%
rename from media-fonts/noto-emoji/files/noto-emoji-pngquant.patch
rename to media-fonts/noto-emoji/files/noto-emoji-pngquant-verbose.patch
diff --git a/media-fonts/noto-emoji/files/noto-emoji-zopflipng.patch
b/media-fonts/noto-emoji/files/noto-emoji-zopflipng-verbose.patch
similarity index 100%
rename from media-fonts/noto-emoji/files/noto-emoji-zopflipng.patch
rename to media-fonts/noto-emoji/files/noto-emoji-zopflipng-verbose.patch
diff --git a/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
b/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
index 15394e1f453..e34508200bf 100644
--- a/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
@@ -51,8 +51,8 @@ src_prepare() {
eapply "${FILESDIR}/${PN}-20180823-build-path.patch"
# Be more verbose, bug #717654
- eapply "${FILESDIR}"/${PN}-pngquant.patch
- eapply "${FILESDIR}"/${PN}-zopflipng.patch
+ eapply "${FILESDIR}"/${PN}-pngquant-verbose.patch
+ eapply "${FILESDIR}"/${PN}-zopflipng-verbose.patch
# Based on Fedora patch to allow graphicsmagick usage
if has_version media-gfx/graphicsmagick; then
[gentoo-commits] repo/gentoo:master commit in: media-fonts/noto-emoji/files/, media-fonts/noto-emoji/
commit: bd7710aedf195b4eaf033386ffe2bbdb9a8b6444 Author: Pacho Ramos gentoo org> AuthorDate: Fri Mar 20 15:08:28 2020 + Commit: Pacho Ramos gentoo org> CommitDate: Fri Mar 20 15:11:10 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd7710ae media-fonts/noto-emoji: Drop old Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Pacho Ramos gentoo.org> media-fonts/noto-emoji/Manifest| 2 - .../noto-emoji/files/noto-emoji-use-gm.patch | 30 -- .../files/noto-emoji-use-system-pngquant.patch | 59 --- media-fonts/noto-emoji/noto-emoji-20180823.ebuild | 66 -- media-fonts/noto-emoji/noto-emoji-20190328.ebuild | 63 - 5 files changed, 220 deletions(-) diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest index 29ec1902a9a..51b59084932 100644 --- a/media-fonts/noto-emoji/Manifest +++ b/media-fonts/noto-emoji/Manifest @@ -1,3 +1 @@ -DIST noto-emoji-20180823.tar.gz 51710829 BLAKE2B 66983bdd3cb5e95727f0ddebca5d85c3f22bb9e7b9216eb1af41c4cba19f2020592be3feb7ac47f723985574b8d57070d9d07d0ce5e5870512aecc2a55b52995 SHA512 73233f3742faae4e37f8588bda097fe9f745f5cc7e6601301c1dc9e30d656c496e074c80bf4391708f6c0dbe32043e8558e4395cce5dbf735772b0e41642b9bf -DIST noto-emoji-20190328.tar.gz 51710517 BLAKE2B ecedc52d3bdc49281942e7cb6b217928ee57412a420da251855c702e444c5d720464093c173f2878c09b4ef7123aedcfc3aa6aa517a625749d414e4c3b08bd19 SHA512 9e775a18a43edadb24fee498a8dff588949475ba27c2daddc1dfb6eacc18d1bf8810ec88e018398f18efe9ff0c414766f569eec7a714e119f3aabdfbe3ceec98 DIST noto-emoji-20200311.tar.gz 58539077 BLAKE2B 837ae7ef6a571e40b4ed83a0aa1edfd13404c3ca65e671cdc86f650e63cf77179ef283e6dc032fb93f5107411565f980e594be8880626417fa89c67347e6fe62 SHA512 cfafe9c06ccbf888eb1309dc2090abef2f92c0592460693cb45db8ab147311fdd63655d8df182043f05cf503bdfbe16563bc8cea0bddcd830fe193ca86f7fcfb diff --git a/media-fonts/noto-emoji/files/noto-emoji-use-gm.patch b/media-fonts/noto-emoji/files/noto-emoji-use-gm.patch deleted file mode 100644 index 5710fd53dc5..000 --- a/media-fonts/noto-emoji/files/noto-emoji-use-gm.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index ddc6ff881ce..000 --- a/media-fonts/noto-emoji/files/noto-emoji-use-system-pngquant.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 @@ -
[gentoo-commits] repo/gentoo:master commit in: media-fonts/noto-emoji/files/, media-fonts/noto-emoji/
commit: 621b8551914d97f4c034654b5adc1909a7248db4
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Nov 18 10:52:25 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Nov 18 10:52:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621b8551
media-fonts/noto-emoji: Use proper png.py when building
Thanks-to: ILMostro
Thanks-to: Mike Gilbert
Closes: https://bugs.gentoo.org/671290
Signed-off-by: Pacho Ramos gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../noto-emoji/files/noto-emoji-20180823-build-path.patch | 11 +++
media-fonts/noto-emoji/noto-emoji-20180823.ebuild | 3 +++
2 files changed, 14 insertions(+)
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
new file mode 100644
index 000..151f8825152
--- /dev/null
+++ b/media-fonts/noto-emoji/files/noto-emoji-20180823-build-path.patch
@@ -0,0 +1,11 @@
+--- a/add_glyphs.py.old2018-11-18 11:11:56.387323302 +0100
b/add_glyphs.py2018-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/noto-emoji-20180823.ebuild
b/media-fonts/noto-emoji/noto-emoji-20180823.ebuild
index 847572c4ae7..52be1429c0d 100644
--- a/media-fonts/noto-emoji/noto-emoji-20180823.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20180823.ebuild
@@ -38,6 +38,9 @@ PATCHES=(
# From Fedora
"${FILESDIR}/${PN}-use-system-pngquant.patch"
"${FILESDIR}/${PN}-build-all-flags.patch"
+
+ # https://github.com/googlei18n/noto-emoji/issues/240
+ "${FILESDIR}/${PN}-20180823-build-path.patch"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: media-fonts/noto-emoji/files/, media-fonts/noto-emoji/
commit: 268be533088b3305127faa9bf4dcb048d3b4934a Author: Pacho Ramos gentoo org> AuthorDate: Sun Oct 14 19:42:48 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Oct 14 19:43:54 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=268be533 media-fonts/noto-emoji: New noto-emoji fonts (splitted from noto) Signed-off-by: Pacho Ramos gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 media-fonts/noto-emoji/Manifest| 1 + .../files/noto-emoji-build-all-flags.patch | 11 .../files/noto-emoji-use-system-pngquant.patch | 59 ++ media-fonts/noto-emoji/metadata.xml| 8 +++ media-fonts/noto-emoji/noto-emoji-20180814.ebuild | 46 + 5 files changed, 125 insertions(+) diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest new file mode 100644 index 000..79d84c3fc5b --- /dev/null +++ b/media-fonts/noto-emoji/Manifest @@ -0,0 +1 @@ +DIST noto-emoji-20180814.tar.gz 51709109 BLAKE2B 9678861973b231de48b11dc9267840e4a4a6689c7c26281dfc1d6b0d4c1c1c627b503226d7eeac2f568dc19162c669b54c8dd34f5aa449850797437cf3a2e8cb SHA512 bca0fb73d3897c4ec1ba94173fda17804cdf2dfa365aa4a19bf1d24e9a94806bcdd5e6eb6304eb3e2312b37f37fa917905be6fe11c84510214f0eba70f426ea8 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 000..564b08a5907 --- /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.0 +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-system-pngquant.patch b/media-fonts/noto-emoji/files/noto-emoji-use-system-pngquant.patch new file mode 100644 index 000..ddc6ff881ce --- /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 000..3da97a9953c --- /dev/null +++ b/media-fonts/noto-emoji/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + pa...@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
