Thursday, October 20, 2022

[update] fonts/adobe-fonts/source-code-pro to latest release

When testing matthieu's xterm update, I noticed that xterm-374 would
exit with an error with my .Xresources containing

XTerm*faceName: Source Code Pro:antialias=true:size=12:style=Semibold

Worse, after rebuilding the font cache due to new fontconfig, -current
xterm would no longer use Source Code Pro but rather DejaVu Sans Mono,
as also described here: https://marc.info/?l=openbsd-misc&m=166631092912516&w=2

After a long and frustrating debugging session and with help from
matthieu, I found that updating the font to its latest release resolves
the issues on all my affected machines. I do not know why.

The below is the minimal diff which doesn't deal with the new variable
width parts. I kept it minimal since the full update requires more
knowledge about fonts than I want to acquire right now. Unless someone
cooks a better diff, I would also like to commit this to -stable as
according to my tests it makes the font usable again on fresh installs.

NB: The other two adobe fonts also have significantly newer releases. It
would be nice if someone knowledgeable about fonts took care of updates
after this is in.

Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/fonts/adobe-fonts/Makefile.inc,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.inc
--- Makefile.inc 11 Mar 2022 19:00:16 -0000 1.5
+++ Makefile.inc 21 Oct 2022 01:53:42 -0000
@@ -23,11 +23,13 @@ WRKDIST ?= ${WRKDIR}/${DISTNAME}

SUBST_VARS += VERSION VERSION_I

+LICENSE ?= LICENSE.txt
+
do-install:
${INSTALL_DATA_DIR} ${FONT_DIR} ${DOC_DIR}
cd ${WRKDIST}; ${INSTALL_DATA} TTF/*.ttf OTF/*.otf \
${FONT_DIR}
- cd ${WRKDIST}; ${INSTALL_DATA} LICENSE.txt README.md *.css *.json \
+ cd ${WRKDIST}; ${INSTALL_DATA} ${LICENSE} README.md *.css *.json \
${DOC_DIR}
cd ${WRKDIST}; if [ -e ReadMe.html ]; then \
${INSTALL_DATA} *.html ${DOC_DIR}; \
Index: source-code-pro/Makefile
===================================================================
RCS file: /cvs/ports/fonts/adobe-fonts/source-code-pro/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- source-code-pro/Makefile 11 Mar 2022 19:00:16 -0000 1.4
+++ source-code-pro/Makefile 21 Oct 2022 01:54:02 -0000
@@ -1,9 +1,11 @@
COMMENT = monospaced OpenType fonts designed for coding environments
-VERSION = 2.030
-VERSION_I = 1.050
-REVISION = 0
+VERSION = 2.038
+VERSION_I = 1.058
+VERSION_V = 1.018
+
+LICENSE = LICENSE.md

GH_PROJECT = source-code-pro
-GH_TAGNAME = ${VERSION}R-ro/${VERSION_I}R-it
+GH_TAGNAME = ${VERSION}R-ro/${VERSION_I}R-it/${VERSION_V}R-VAR

.include <bsd.port.mk>
Index: source-code-pro/distinfo
===================================================================
RCS file: /cvs/ports/fonts/adobe-fonts/source-code-pro/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- source-code-pro/distinfo 31 Oct 2016 09:28:43 -0000 1.3
+++ source-code-pro/distinfo 19 Oct 2022 20:19:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (adobe-fonts/source-code-pro-2.030R-ro-1.050R-it.tar.gz) = pOTdWbjgpDa5NPD2EsLpG1kykQxtHDt9GlqfOJyGMCs=
-SIZE (adobe-fonts/source-code-pro-2.030R-ro-1.050R-it.tar.gz) = 8245124
+SHA256 (adobe-fonts/source-code-pro-2.038R-ro-1.058R-it-1.018R-VAR.tar.gz) = 2Ph5/v1m7LcpHqLXOYS5wKl/tJlCTlgpC6a4F4fQxyU=
+SIZE (adobe-fonts/source-code-pro-2.038R-ro-1.058R-it-1.018R-VAR.tar.gz) = 6818951
Index: source-code-pro/pkg/PLIST
===================================================================
RCS file: /cvs/ports/fonts/adobe-fonts/source-code-pro/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- source-code-pro/pkg/PLIST 11 Mar 2022 19:00:16 -0000 1.3
+++ source-code-pro/pkg/PLIST 19 Oct 2022 20:19:38 -0000
@@ -1,10 +1,10 @@
@pkgpath fonts/adobe-source-code-pro
share/doc/adobe-source-code-pro/
-share/doc/adobe-source-code-pro/LICENSE.txt
+share/doc/adobe-source-code-pro/LICENSE.md
share/doc/adobe-source-code-pro/README.md
-share/doc/adobe-source-code-pro/bower.json
share/doc/adobe-source-code-pro/package.json
share/doc/adobe-source-code-pro/source-code-pro.css
+share/doc/adobe-source-code-pro/source-code-variable.css
share/fonts/
@fontdir share/fonts/adobe-source-code-pro/
share/fonts/adobe-source-code-pro/SourceCodePro-Black.otf

No comments:

Post a Comment