From 2caf26e32b1be14447a48686ee6b7579cabe51df Mon Sep 17 00:00:00 2001 From: Sullivan SENECHAL Date: Sat, 16 Mar 2019 18:30:19 +0100 Subject: [PATCH] noto-fonts-emoji: remove conflict with google-fonts-ttf The emoji font is not provided by google-fonts, so no conflict should be set here. closes #9929 --- srcpkgs/noto-fonts-emoji/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/noto-fonts-emoji/template b/srcpkgs/noto-fonts-emoji/template index 8c5eabff1a9..7b8b1371cc8 100644 --- a/srcpkgs/noto-fonts-emoji/template +++ b/srcpkgs/noto-fonts-emoji/template @@ -1,19 +1,19 @@ -# Template build file for 'noto-fonts-emoji'. +# Template file for 'noto-fonts-emoji' pkgname=noto-fonts-emoji version=20180810 -revision=1 +revision=2 archs=noarch _githash=07ad7f0f4dc1bfb03221c2004c7cc60c6b79b25e wrksrc="noto-emoji-${_githash}" depends="font-util" -font_dirs="/usr/share/fonts/noto" short_desc="Google Noto Emoji Fonts" maintainer="Peter Bui " license="OFL-1.1" homepage="https://www.google.com/get/noto/" distfiles="https://github.com/googlei18n/noto-emoji/archive/${_githash}.tar.gz>${pkgname}-${version}.tar.gz" checksum=ec53029d47743d41c5979aa180353b9ce4652d76aac5f04fedac6990bf9c40a9 -conflicts="google-fonts-ttf>=0" + +font_dirs="/usr/share/fonts/noto" do_install() { vmkdir usr/share/fonts/noto