From fe505e9983bb6c19eb4ae1c7af54d45cb054a9bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Fri, 2 Jul 2021 16:31:33 -0300 Subject: [PATCH] fonts-roboto-ttf: fix google-fonts-ttf being uninstallable After commit 70eb5aec70ed8722515a318ae3e64b360d420741, google-fonts-ttf started depending on fonts-roboto-ttf, but fonts-roboto-ttf was still listed as conflicting with it. fonts-robot-ttf should only conflict with old versions of google-fonts-ttf, not new ones. --- srcpkgs/fonts-roboto-ttf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fonts-roboto-ttf/template b/srcpkgs/fonts-roboto-ttf/template index 7c0f6b0edc..4357eba2a8 100644 --- a/srcpkgs/fonts-roboto-ttf/template +++ b/srcpkgs/fonts-roboto-ttf/template @@ -1,7 +1,7 @@ # Template file for 'fonts-roboto-ttf' pkgname=fonts-roboto-ttf version=2.138 -revision=2 +revision=3 wrksrc=roboto-${version} depends="font-util" short_desc="Google's signature family of fonts" @@ -11,7 +11,7 @@ homepage="https://fonts.google.com/specimen/Roboto" distfiles="https://github.com/google/roboto/archive/v${version}.tar.gz" checksum=5427a734ba778333956093f85f5a67b7134ea925ef9dea236a2c5bd0d200341b font_dirs="/usr/share/fonts/TTF" -conflicts=google-fonts-ttf +conflicts="google-fonts-ttf<=20190605_2" do_install() { vmkdir usr/share/fonts/TTF