commit: a3a00933657efc59adb45c0a1e89f030be5de83f Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sat Oct 20 09:11:32 2018 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sat Oct 20 11:38:50 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3a00933
media-fonts/noto-emoji: Allow to build with graphicsmagick Thanks-to: Albert W. Hopkins Thanks-to: Anthony Parsons Closes: https://bugs.gentoo.org/668718 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 .../noto-emoji/files/noto-emoji-use-gm.patch | 30 ++++++++++++++++++++++ media-fonts/noto-emoji/noto-emoji-20180814.ebuild | 6 +++++ 2 files changed, 36 insertions(+) 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 00000000000..5710fd53dc5 --- /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/noto-emoji-20180814.ebuild b/media-fonts/noto-emoji/noto-emoji-20180814.ebuild index 7d76d22e0b8..7dd40de2811 100644 --- a/media-fonts/noto-emoji/noto-emoji-20180814.ebuild +++ b/media-fonts/noto-emoji/noto-emoji-20180814.ebuild @@ -23,6 +23,7 @@ DEPEND="${PYTHON_DEPS} dev-python/nototools media-gfx/pngquant x11-libs/cairo + || ( media-gfx/imagemagick media-gfx/graphicsmagick ) " RDEPEND="" @@ -43,4 +44,9 @@ 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 }
