From 60aaaa2f7c6819c5ee0afc68528126db592f37ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 20 Mar 2023 08:54:05 +0700 Subject: [PATCH] liberation-fonts-ttf: provides font-liberation-ttf Fix: #42873 --- srcpkgs/font-liberation-ttf/template | 17 ----------------- srcpkgs/liberation-fonts-ttf/template | 22 +++++++++------------- 2 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 srcpkgs/font-liberation-ttf/template diff --git a/srcpkgs/font-liberation-ttf/template b/srcpkgs/font-liberation-ttf/template deleted file mode 100644 index b08915b6e76..00000000000 --- a/srcpkgs/font-liberation-ttf/template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'font-liberation-ttf' -pkgname=font-liberation-ttf -version=2.1.5 -revision=1 -depends="font-util" -short_desc="Fonts with same metrics as Times, Arial and Courier" -maintainer="Đoàn Trần Công Danh " -license="GPL-3.0-or-later" -homepage="https://github.com/liberationfonts/liberation-fonts" -distfiles="https://github.com/liberationfonts/liberation-fonts/files/7261482/liberation-fonts-ttf-${version}.tar.gz" -checksum=7191c669bf38899f73a2094ed00f7b800553364f90e2637010a69c0e268f25d0 -font_dirs="/usr/share/fonts/TTF/liberation" - -do_install() { - vmkdir usr/share/fonts/TTF/liberation - vcopy "*.ttf" usr/share/fonts/TTF/liberation -} diff --git a/srcpkgs/liberation-fonts-ttf/template b/srcpkgs/liberation-fonts-ttf/template index 75427fbce1f..46c6e8f1a98 100644 --- a/srcpkgs/liberation-fonts-ttf/template +++ b/srcpkgs/liberation-fonts-ttf/template @@ -1,26 +1,22 @@ # Template file for 'liberation-fonts-ttf' pkgname=liberation-fonts-ttf version=2.1.5 -revision=1 -build_style=gnu-makefile -hostmakedepends="fontforge fonttools" +revision=2 depends="font-util" -short_desc="TrueType fonts from RedHat" +short_desc="Fonts from RedHat with same metrics as Times, Arial and Courier" maintainer="Orphaned " license="OFL-1.1" homepage="https://github.com/liberationfonts/liberation-fonts" changelog="https://raw.githubusercontent.com/liberationfonts/liberation-fonts/devel/ChangeLog" -distfiles="https://github.com/liberationfonts/liberation-fonts/archive/${version}.tar.gz" -checksum=9a823ccb33c8a8a865e84b982bcdc44d03ba4914adb91e6000df035dc0e55936 -font_dirs="/usr/share/fonts/TTF" - -pre_build() { - make versionupdate -} +distfiles="https://github.com/liberationfonts/liberation-fonts/files/7261482/liberation-fonts-ttf-${version}.tar.gz" +checksum=7191c669bf38899f73a2094ed00f7b800553364f90e2637010a69c0e268f25d0 +font_dirs="/usr/share/fonts/TTF/liberation" +provides="font-liberation-ttf-${version}_${revision}" +replaces="font-liberation-ttf>=0" do_install() { - vmkdir usr/share/fonts/TTF - install -m644 ${pkgname}-${version}/*.ttf ${DESTDIR}/usr/share/fonts/TTF + vmkdir usr/share/fonts/TTF/liberation + vcopy "*.ttf" usr/share/fonts/TTF/liberation # install fontconfig files vinstall ${FILESDIR}/30-0-liberation-mono.conf 644 \