From 07d6dabbbdf5978fb9142d06f7e8c03214c29f14 Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Mon, 29 Aug 2022 11:28:38 +0200 Subject: [PATCH] Add workaround for people not building with clean source Signed-off-by: Knut Ahlers --- .SRCINFO | 18 +++++++++--------- .gitignore | 1 + PKGBUILD | 41 ++++++++++++++++++++++++----------------- 3 files changed, 34 insertions(+), 26 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3828b03..480fc43 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -6,15 +6,15 @@ pkgbase = nerd-fonts-dejavu-complete arch = any license = MIT provides = ttf-font - source = DejaVu-Sans-Mono-Bold-Nerd-Font-Complete.ttf::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/patched-fonts/DejaVuSansMono/Bold/complete/DejaVu%20Sans%20Mono%20Bold%20Nerd%20Font%20Complete.ttf - source = DejaVu-Sans-Mono-Bold-Nerd-Font-Complete-Mono.ttf::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/patched-fonts/DejaVuSansMono/Bold/complete/DejaVu%20Sans%20Mono%20Bold%20Nerd%20Font%20Complete%20Mono.ttf - source = DejaVu-Sans-Mono-Bold-Oblique-Nerd-Font-Complete-Mono.ttf::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/patched-fonts/DejaVuSansMono/Bold-Italic/complete/DejaVu%20Sans%20Mono%20Bold%20Oblique%20Nerd%20Font%20Complete%20Mono.ttf - source = DejaVu-Sans-Mono-Bold-Oblique-Nerd-Font-Complete.ttf::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/patched-fonts/DejaVuSansMono/Bold-Italic/complete/DejaVu%20Sans%20Mono%20Bold%20Oblique%20Nerd%20Font%20Complete.ttf - source = DejaVu-Sans-Mono-Oblique-Nerd-Font-Complete.ttf::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/patched-fonts/DejaVuSansMono/Italic/complete/DejaVu%20Sans%20Mono%20Oblique%20Nerd%20Font%20Complete.ttf - source = DejaVu-Sans-Mono-Oblique-Nerd-Font-Complete-Mono.ttf::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/patched-fonts/DejaVuSansMono/Italic/complete/DejaVu%20Sans%20Mono%20Oblique%20Nerd%20Font%20Complete%20Mono.ttf - source = DejaVu-Sans-Mono-Nerd-Font-Complete.ttf::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/patched-fonts/DejaVuSansMono/Regular/complete/DejaVu%20Sans%20Mono%20Nerd%20Font%20Complete.ttf - source = DejaVu-Sans-Mono-Nerd-Font-Complete-Mono.ttf::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/patched-fonts/DejaVuSansMono/Regular/complete/DejaVu%20Sans%20Mono%20Nerd%20Font%20Complete%20Mono.ttf - source = LICENSE::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/LICENSE + source = nerd-fonts-dejavu-complete-2.2.1_DejaVu-Sans-Mono-Bold-Nerd-Font-Complete.ttf::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/patched-fonts/DejaVuSansMono/Bold/complete/DejaVu%20Sans%20Mono%20Bold%20Nerd%20Font%20Complete.ttf + source = nerd-fonts-dejavu-complete-2.2.1_DejaVu-Sans-Mono-Bold-Nerd-Font-Complete-Mono.ttf::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/patched-fonts/DejaVuSansMono/Bold/complete/DejaVu%20Sans%20Mono%20Bold%20Nerd%20Font%20Complete%20Mono.ttf + source = nerd-fonts-dejavu-complete-2.2.1_DejaVu-Sans-Mono-Bold-Oblique-Nerd-Font-Complete-Mono.ttf::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/patched-fonts/DejaVuSansMono/Bold-Italic/complete/DejaVu%20Sans%20Mono%20Bold%20Oblique%20Nerd%20Font%20Complete%20Mono.ttf + source = nerd-fonts-dejavu-complete-2.2.1_DejaVu-Sans-Mono-Bold-Oblique-Nerd-Font-Complete.ttf::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/patched-fonts/DejaVuSansMono/Bold-Italic/complete/DejaVu%20Sans%20Mono%20Bold%20Oblique%20Nerd%20Font%20Complete.ttf + source = nerd-fonts-dejavu-complete-2.2.1_DejaVu-Sans-Mono-Oblique-Nerd-Font-Complete.ttf::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/patched-fonts/DejaVuSansMono/Italic/complete/DejaVu%20Sans%20Mono%20Oblique%20Nerd%20Font%20Complete.ttf + source = nerd-fonts-dejavu-complete-2.2.1_DejaVu-Sans-Mono-Oblique-Nerd-Font-Complete-Mono.ttf::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/patched-fonts/DejaVuSansMono/Italic/complete/DejaVu%20Sans%20Mono%20Oblique%20Nerd%20Font%20Complete%20Mono.ttf + source = nerd-fonts-dejavu-complete-2.2.1_DejaVu-Sans-Mono-Nerd-Font-Complete.ttf::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/patched-fonts/DejaVuSansMono/Regular/complete/DejaVu%20Sans%20Mono%20Nerd%20Font%20Complete.ttf + source = nerd-fonts-dejavu-complete-2.2.1_DejaVu-Sans-Mono-Nerd-Font-Complete-Mono.ttf::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/patched-fonts/DejaVuSansMono/Regular/complete/DejaVu%20Sans%20Mono%20Nerd%20Font%20Complete%20Mono.ttf + source = nerd-fonts-dejavu-complete-2.2.1_LICENSE::https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.2.1/LICENSE sha512sums = 2d03d7a8692d5826e9103b04e8bcf6ae0943fbc5a893ceee43e31ec72168c94dcd0bf2592264332e7d229383ac464b2922e14b53dc761574a407f5e095292f1f sha512sums = fd137e1be01519ceb91cdcd38aad4a3453d6bd390c2ec71a1900acf5d4763b636fa3934524f49e87989548451cce090be8c1b29c7fa73fca0f86714d1827a1a2 sha512sums = 8a4ba7bdfe001c350149f75c36efbfcbb948dd4d515fe627224c697b68558046054a6927b9a1f807e65a20482b3203a8f1a2e70b0a7defa9362fa9710114da84 diff --git a/.gitignore b/.gitignore index b3ff5d1..cd6689e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,5 +17,6 @@ src/ *.sig LICENSE +*LICENSE .AURINFO diff --git a/PKGBUILD b/PKGBUILD index 27106e6..9f5a46a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,19 +12,19 @@ _raw_font_url="${_raw_base_url}/patched-fonts/DejaVuSansMono" license=(MIT) provides=(ttf-font) source=( - "DejaVu-Sans-Mono-Bold-Nerd-Font-Complete.ttf::${_raw_font_url}/Bold/complete/DejaVu%20Sans%20Mono%20Bold%20Nerd%20Font%20Complete.ttf" - "DejaVu-Sans-Mono-Bold-Nerd-Font-Complete-Mono.ttf::${_raw_font_url}/Bold/complete/DejaVu%20Sans%20Mono%20Bold%20Nerd%20Font%20Complete%20Mono.ttf" - \ - "DejaVu-Sans-Mono-Bold-Oblique-Nerd-Font-Complete-Mono.ttf::${_raw_font_url}/Bold-Italic/complete/DejaVu%20Sans%20Mono%20Bold%20Oblique%20Nerd%20Font%20Complete%20Mono.ttf" - "DejaVu-Sans-Mono-Bold-Oblique-Nerd-Font-Complete.ttf::${_raw_font_url}/Bold-Italic/complete/DejaVu%20Sans%20Mono%20Bold%20Oblique%20Nerd%20Font%20Complete.ttf" - \ - "DejaVu-Sans-Mono-Oblique-Nerd-Font-Complete.ttf::${_raw_font_url}/Italic/complete/DejaVu%20Sans%20Mono%20Oblique%20Nerd%20Font%20Complete.ttf" - "DejaVu-Sans-Mono-Oblique-Nerd-Font-Complete-Mono.ttf::${_raw_font_url}/Italic/complete/DejaVu%20Sans%20Mono%20Oblique%20Nerd%20Font%20Complete%20Mono.ttf" - \ - "DejaVu-Sans-Mono-Nerd-Font-Complete.ttf::${_raw_font_url}/Regular/complete/DejaVu%20Sans%20Mono%20Nerd%20Font%20Complete.ttf" - "DejaVu-Sans-Mono-Nerd-Font-Complete-Mono.ttf::${_raw_font_url}/Regular/complete/DejaVu%20Sans%20Mono%20Nerd%20Font%20Complete%20Mono.ttf" - \ - "LICENSE::${_raw_base_url}/LICENSE" + "${pkgname}-${pkgver}_DejaVu-Sans-Mono-Bold-Nerd-Font-Complete.ttf::${_raw_font_url}/Bold/complete/DejaVu%20Sans%20Mono%20Bold%20Nerd%20Font%20Complete.ttf" + "${pkgname}-${pkgver}_DejaVu-Sans-Mono-Bold-Nerd-Font-Complete-Mono.ttf::${_raw_font_url}/Bold/complete/DejaVu%20Sans%20Mono%20Bold%20Nerd%20Font%20Complete%20Mono.ttf" + + "${pkgname}-${pkgver}_DejaVu-Sans-Mono-Bold-Oblique-Nerd-Font-Complete-Mono.ttf::${_raw_font_url}/Bold-Italic/complete/DejaVu%20Sans%20Mono%20Bold%20Oblique%20Nerd%20Font%20Complete%20Mono.ttf" + "${pkgname}-${pkgver}_DejaVu-Sans-Mono-Bold-Oblique-Nerd-Font-Complete.ttf::${_raw_font_url}/Bold-Italic/complete/DejaVu%20Sans%20Mono%20Bold%20Oblique%20Nerd%20Font%20Complete.ttf" + + "${pkgname}-${pkgver}_DejaVu-Sans-Mono-Oblique-Nerd-Font-Complete.ttf::${_raw_font_url}/Italic/complete/DejaVu%20Sans%20Mono%20Oblique%20Nerd%20Font%20Complete.ttf" + "${pkgname}-${pkgver}_DejaVu-Sans-Mono-Oblique-Nerd-Font-Complete-Mono.ttf::${_raw_font_url}/Italic/complete/DejaVu%20Sans%20Mono%20Oblique%20Nerd%20Font%20Complete%20Mono.ttf" + + "${pkgname}-${pkgver}_DejaVu-Sans-Mono-Nerd-Font-Complete.ttf::${_raw_font_url}/Regular/complete/DejaVu%20Sans%20Mono%20Nerd%20Font%20Complete.ttf" + "${pkgname}-${pkgver}_DejaVu-Sans-Mono-Nerd-Font-Complete-Mono.ttf::${_raw_font_url}/Regular/complete/DejaVu%20Sans%20Mono%20Nerd%20Font%20Complete%20Mono.ttf" + + "${pkgname}-${pkgver}_LICENSE::${_raw_base_url}/LICENSE" ) sha512sums=('2d03d7a8692d5826e9103b04e8bcf6ae0943fbc5a893ceee43e31ec72168c94dcd0bf2592264332e7d229383ac464b2922e14b53dc761574a407f5e095292f1f' 'fd137e1be01519ceb91cdcd38aad4a3453d6bd390c2ec71a1900acf5d4763b636fa3934524f49e87989548451cce090be8c1b29c7fa73fca0f86714d1827a1a2' @@ -36,8 +36,15 @@ sha512sums=('2d03d7a8692d5826e9103b04e8bcf6ae0943fbc5a893ceee43e31ec72168c94dcd0 'bd4922c080690d852b9408aab18f66d78fe785fb6df470ccb9c044b6ea2ebc043996de16ddd80421394a49b6c8ee7e4ca45e1658860abc43f9564e09202359d3' '941169ae9f04d4d706fead04cc2391c57b681c934f5d646a1444d9a1240ba42500a5ea79ae5d1bb172666f6d48d44d95fa757a5785593088d887736d58f4cc82') -package() { - install -dm0755 "${pkgdir}/usr/share/fonts/TTF" - install -Dm0644 -t "${pkgdir}/usr/share/fonts/TTF" ${srcdir}/*.ttf - install -Dm0644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ${srcdir}/LICENSE +prepare() { + mkdir "${srcdir}/${pkgname}-${pkgver}" + for srcfile in "${srcdir}/${pkgname}-${pkgver}_"*; do + ln "${srcfile}" "${srcdir}/${pkgname}-${pkgver}/${srcfile#${srcdir}/${pkgname}-${pkgver}_}" + done +} + +package() { + install -dm0755 "${pkgdir}/usr/share/fonts/TTF" + install -Dm0644 -t "${pkgdir}/usr/share/fonts/TTF" ${srcdir}/${pkgname}-${pkgver}/*.ttf + install -Dm0644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ${srcdir}/${pkgname}-${pkgver}/LICENSE }