Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

font-adobe-source-code-pro: update to 2.038R. #29564

Merged
merged 1 commit into from Jul 2, 2021

Conversation

travankor
Copy link
Contributor

@travankor travankor commented Mar 18, 2021

General

Have the results of the proposed changes been tested?

  • I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
  • I generally don't use the affected packages but briefly tested this PR

Should the transitional dummy package be removed?

@travankor travankor force-pushed the source-code-pro branch 2 times, most recently from 02e7c9c to c97d307 Compare March 18, 2021 13:19
@ericonr
Copy link
Member

ericonr commented Apr 11, 2021

@sgn satisfied or still need to add the custom do_extract?

@sgn
Copy link
Member

sgn commented Apr 11, 2021

I don't care that much.
I look into the template once again, I think it's better to have 2 variables for italic and var version.
I don't know 🤷

@sgn
Copy link
Member

sgn commented Apr 12, 2021

I'm thinking about something like this:

diff --git a/srcpkgs/font-adobe-source-code-pro/template b/srcpkgs/font-adobe-source-code-pro/template
index b40277d7aa..a58d81e5fd 100644
--- a/srcpkgs/font-adobe-source-code-pro/template
+++ b/srcpkgs/font-adobe-source-code-pro/template
@@ -1,14 +1,15 @@
 # Template file for 'font-adobe-source-code-pro'
 pkgname=font-adobe-source-code-pro
-version=2.038R
+version=2.038R~ro+1.058R~it+1.018R~VAR
 revision=1
-wrksrc="source-code-pro-${version}-ro-1.058R-it-1.018R-VAR"
+_version="${version//\~/-}"
+wrksrc="source-code-pro-${_version//+/-}"
 depends="font-util"
 short_desc="Monospaced font family for user interface and coding environments"
 maintainer="Piero La Terza <platerza@protonmail.com>"
 license="OFL-1.1"
 homepage="https://adobe-fonts.github.io/source-code-pro/"
-distfiles="https://github.com/adobe-fonts/source-code-pro/archive/${version}-ro/1.058R-it/1.018R-VAR.tar.gz"
+distfiles="https://github.com/adobe-fonts/source-code-pro/archive/${_version//+//}.tar.gz"
 checksum=d8f879fefd66ecb7291ea2d73984b9c0a97fb499424e58290ba6b81787d0c725
 font_dirs="/usr/share/fonts/OTF/"
 

@sgn
Copy link
Member

sgn commented Apr 12, 2021

Or even this:

diff --git a/srcpkgs/font-adobe-source-code-pro/template b/srcpkgs/font-adobe-source-code-pro/template
index b40277d7aa..b804f0c916 100644
--- a/srcpkgs/font-adobe-source-code-pro/template
+++ b/srcpkgs/font-adobe-source-code-pro/template
@@ -1,19 +1,21 @@
 # Template file for 'font-adobe-source-code-pro'
 pkgname=font-adobe-source-code-pro
-version=2.038R
+version=2.038R~ro+1.058R~it
 revision=1
-wrksrc="source-code-pro-${version}-ro-1.058R-it-1.018R-VAR"
+_version="${version//\~/-}"
+create_wrksrc=yes
 depends="font-util"
 short_desc="Monospaced font family for user interface and coding environments"
 maintainer="Piero La Terza <platerza@protonmail.com>"
 license="OFL-1.1"
 homepage="https://adobe-fonts.github.io/source-code-pro/"
-distfiles="https://github.com/adobe-fonts/source-code-pro/archive/${version}-ro/1.058R-it/1.018R-VAR.tar.gz"
-checksum=d8f879fefd66ecb7291ea2d73984b9c0a97fb499424e58290ba6b81787d0c725
+distfiles="https://github.com/adobe-fonts/source-code-pro/archive/${_version//+//}.tar.gz"
+distfiles="https://github.com/adobe-fonts/source-code-pro/releases/download/${_version//+/%2F}%2F1.018R-VAR/OTF-source-code-pro-${_version//+/-}.zip"
+checksum=478028ec70adc1ff73848a546c3ad266716a0096cd1f1a1ef18aeff0199d5996
 font_dirs="/usr/share/fonts/OTF/"
 
 do_install() {
-	for i in ${wrksrc}/*/*.otf; do
+	for i in SourceCodePro-*.otf; do
 		vinstall $i 644 usr/share/fonts/OTF/
 	done
 }

@sgn sgn merged commit 5146260 into void-linux:master Jul 2, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 30, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants