oasis

commit: ec86e05e61d2141da06802133967bbe4a98f04e5
parent fe52fa32d44e46beb491cca5c5e84d5545578b11
Author: Michael Forney <mforney@mforney.org>
Date:   Sat, 30 Jan 2021 17:07:16 -0800

adobe-source-fonts: Update to latest versions

Diffstat:
M
pkg/adobe-source-fonts/.gitignore
6
+++---
M
pkg/adobe-source-fonts/gen.lua
64
++++++++++++++++++++++++++++++++--------------------------------
M
pkg/adobe-source-fonts/sha256
6
+++---
M
pkg/adobe-source-fonts/url
12
++++++------
M
pkg/adobe-source-fonts/ver
2
+-
M
pkg/netsurf/config.h
16
++++++++--------

6 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/pkg/adobe-source-fonts/.gitignore b/pkg/adobe-source-fonts/.gitignore
@@ -1,4 +1,4 @@
-/source-code-pro-2.030R-ro_1.050R-it.tar.gz
-/source-sans-pro-2.020R-ro_1.075R-it.tar.gz
-/source-serif-pro-2.000R.tar.gz
+/source-code-pro-2.038R-ro_1.058R-it_1.018R-VAR.tar.gz
+/source-sans-pro-3.028R.tar.gz
+/source-serif-4.004R.tar.gz
 /src
diff --git a/pkg/adobe-source-fonts/gen.lua b/pkg/adobe-source-fonts/gen.lua
@@ -1,12 +1,4 @@
-local function font(name, styles)
-	for _, style in ipairs(styles) do
-		local path = string.format('share/fonts/%s/%s.otf', name, style)
-		local src = string.format('$srcdir/OTF/%s.otf', style)
-		file(path, '644', src)
-	end
-end
-
-font('source-code-pro', {
+local fonts = {
 	'SourceCodePro-Black',
 	'SourceCodePro-BlackIt',
 	'SourceCodePro-Bold',
@@ -21,30 +13,38 @@ font('source-code-pro', {
 	'SourceCodePro-Regular',
 	'SourceCodePro-Semibold',
 	'SourceCodePro-SemiboldIt',
-})
 
-font('source-sans-pro', {
-	'SourceSansPro-Black',
-	'SourceSansPro-BlackIt',
-	'SourceSansPro-Bold',
-	'SourceSansPro-BoldIt',
-	'SourceSansPro-ExtraLight',
-	'SourceSansPro-ExtraLightIt',
-	'SourceSansPro-It',
-	'SourceSansPro-Light',
-	'SourceSansPro-LightIt',
-	'SourceSansPro-Regular',
-	'SourceSansPro-Semibold',
-	'SourceSansPro-SemiboldIt',
-})
+	'SourceSans3-Black',
+	'SourceSans3-BlackIt',
+	'SourceSans3-Bold',
+	'SourceSans3-BoldIt',
+	'SourceSans3-ExtraLight',
+	'SourceSans3-ExtraLightIt',
+	'SourceSans3-It',
+	'SourceSans3-Light',
+	'SourceSans3-LightIt',
+	'SourceSans3-Regular',
+	'SourceSans3-Semibold',
+	'SourceSans3-SemiboldIt',
 
-font('source-serif-pro', {
-	'SourceSerifPro-Black',
-	'SourceSerifPro-Bold',
-	'SourceSerifPro-ExtraLight',
-	'SourceSerifPro-Light',
-	'SourceSerifPro-Regular',
-	'SourceSerifPro-Semibold',
-})
+	'SourceSerif4-Black',
+	'SourceSerif4-BlackIt',
+	'SourceSerif4-Bold',
+	'SourceSerif4-BoldIt',
+	'SourceSerif4-ExtraLight',
+	'SourceSerif4-ExtraLightIt',
+	'SourceSerif4-It',
+	'SourceSerif4-Light',
+	'SourceSerif4-LightIt',
+	'SourceSerif4-Regular',
+	'SourceSerif4-Semibold',
+	'SourceSerif4-SemiboldIt',
+}
+
+for _, font in ipairs(fonts) do
+	local path = ('share/fonts/%s.otf'):format(font)
+	local src = ('$srcdir/OTF/%s.otf'):format(font)
+	file(path, '644', src)
+end
 
 fetch 'curl'
diff --git a/pkg/adobe-source-fonts/sha256 b/pkg/adobe-source-fonts/sha256
@@ -1,3 +1,3 @@
-a4e4dd59b8e0a436b934f0f612c2e91b5932910c6d1c3b7d1a5a9f389c86302b  source-code-pro-2.030R-ro_1.050R-it.tar.gz
-bb45283fa9979c4821c99da3b54313012821aba0246e2ec0057f2b03ca24912c  source-sans-pro-2.020R-ro_1.075R-it.tar.gz
-47c32bab874e9c30c79ee50beab4a176eb74ffd88906808f693fef563fd3a1dd  source-serif-pro-2.000R.tar.gz
+d8f879fefd66ecb7291ea2d73984b9c0a97fb499424e58290ba6b81787d0c725  source-code-pro-2.038R-ro_1.058R-it_1.018R-VAR.tar.gz
+12faf267e40f1be46daf44afce47facd6efb996e2f2f5abe0a3dde161d54e251  source-sans-pro-3.028R.tar.gz
+dfb364735699cb830caad534cf7741234804d28e4b6fc5e4736b2401f6131aba  source-serif-4.004R.tar.gz
diff --git a/pkg/adobe-source-fonts/url b/pkg/adobe-source-fonts/url
@@ -1,8 +1,8 @@
-output = "source-sans-pro-2.020R-ro_1.075R-it.tar.gz"
-url = "https://github.com/adobe-fonts/source-sans-pro/archive/2.020R-ro/1.075R-it.tar.gz"
+output = "source-sans-pro-3.028R.tar.gz"
+url = "https://github.com/adobe-fonts/source-sans-pro/archive/3.028R.tar.gz"
 
-output = "source-serif-pro-2.000R.tar.gz"
-url = "https://github.com/adobe-fonts/source-serif-pro/archive/2.000R.tar.gz"
+output = "source-serif-4.004R.tar.gz"
+url = "https://github.com/adobe-fonts/source-serif/archive/4.004R.tar.gz"
 
-output = "source-code-pro-2.030R-ro_1.050R-it.tar.gz"
-url = "https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.tar.gz"
+output = "source-code-pro-2.038R-ro_1.058R-it_1.018R-VAR.tar.gz"
+url = "https://github.com/adobe-fonts/source-code-pro/archive/2.038R-ro/1.058R-it/1.018R-VAR.tar.gz"
diff --git a/pkg/adobe-source-fonts/ver b/pkg/adobe-source-fonts/ver
@@ -1 +1 @@
-2.020R-ro/1.075R-it 2.000R 2.030R-ro/1.050R-it r1
+2.038R-ro/1.058R-it/1.018R-var 3.028R 4.004R r0
diff --git a/pkg/netsurf/config.h b/pkg/netsurf/config.h
@@ -4,14 +4,14 @@
 #define NETSURF_HOMEPAGE "https://lite.duckduckgo.com/lite"
 #define TINY_RESPATH "/share/netsurf:/share/fonts"
 
-#define TINY_FONT_SANS_SERIF "source-sans-pro/SourceSansPro-Regular.otf"
-#define TINY_FONT_SANS_SERIF_BOLD "source-sans-pro/SourceSansPro-Bold.otf"
-#define TINY_FONT_SANS_SERIF_ITALIC "source-sans-pro/SourceSansPro-It.otf"
-#define TINY_FONT_SANS_SERIF_ITALIC_BOLD "source-sans-pro/SourceSansPro-BoldIt.otf"
-#define TINY_FONT_SERIF "source-serif-pro/SourceSerifPro-Regular.otf"
-#define TINY_FONT_SERIF_BOLD "source-serif-pro/SourceSerifPro-Bold.otf"
-#define TINY_FONT_MONOSPACE "source-code-pro/SourceCodePro-Regular.otf"
-#define TINY_FONT_MONOSPACE_BOLD "source-code-pro/SourceCodePro-Bold.otf"
+#define TINY_FONT_SANS_SERIF "SourceSans3-Regular.otf"
+#define TINY_FONT_SANS_SERIF_BOLD "SourceSans3-Bold.otf"
+#define TINY_FONT_SANS_SERIF_ITALIC "SourceSans3-It.otf"
+#define TINY_FONT_SANS_SERIF_ITALIC_BOLD "SourceSans3-BoldIt.otf"
+#define TINY_FONT_SERIF "SourceSerif4-Regular.otf"
+#define TINY_FONT_SERIF_BOLD "SourceSerif4-Bold.otf"
+#define TINY_FONT_MONOSPACE "SourceCodePro-Regular.otf"
+#define TINY_FONT_MONOSPACE_BOLD "SourceCodePro-Bold.otf"
 #define TINY_FONT_CURSIVE TINY_FONT_SANS_SERIF
 #define TINY_FONT_FANTASY TINY_FONT_SANS_SERIF
 #define TINY_DPI 96