Index | Thread | Search

From:
"Ariel Popper" <a@arielp.com>
Subject:
Re: fonts/nerd-fonts: update to 3.3.0;
To:
"Stuart Henderson" <stu@spacehopper.org>, <manuel@ledu-giraud.fr>, <ports@openbsd.org>
Date:
Tue, 10 Dec 2024 07:42:29 -0500

Download raw body.

Thread
On Tue Dec 10, 2024 at 7:32 AM EST, Stuart Henderson wrote:
> On 2024/12/10 12:36, Kirill A. Korinsky wrote:
> > On Tue, 10 Dec 2024 10:14:04 +0100,
> > Manuel Giraud <manuel@ledu-giraud.fr> wrote:
> > >
> > > Kirill A. Korinsky <kirill@korins.ky> writes:
> > >
> > > > On Tue, 03 Dec 2024 14:59:08 +0100,
> > > > Kirill A. Korinsky <kirill@korins.ky> wrote:
> > > >>
> > > >> On Wed, 20 Nov 2024 21:11:30 +0100,
> > > >> Kirill A. Korinsky <kirill@korins.ky> wrote:
> > > >> >
> > > >> > ports@,
> > > >> >
> > > >> > I'd like to update fonts/nerd-fonts to 3.3.0
> > > >> >
> > > >> > Notable changes:
> > > >> >
> > > >> >  - 3.1.0 changed family name on some fonts, only Noto affected from our
> > > >> >    fonts, see details: https://github.com/ryanoasis/nerd-fonts/issues/1434
> > > >> >
> > > >> >  - 3.3.0 drops and replaces some icons due to switch devicons -> devicon
> > > >> >    see details: https://github.com/ryanoasis/nerd-fonts/pull/1691
> > > >> >
> > > >> > Full changelogs available here:
> > > >> >  - https://github.com/ryanoasis/nerd-fonts/releases/tag/v3.3.0
> > > >> >  - https://github.com/ryanoasis/nerd-fonts/releases/tag/v3.2.1
> > > >> >  - https://github.com/ryanoasis/nerd-fonts/releases/tag/v3.2.0
> > > >> >  - https://github.com/ryanoasis/nerd-fonts/releases/tag/v3.1.1
> > > >> >  - https://github.com/ryanoasis/nerd-fonts/releases/tag/v3.1.0
> > > >> >
> > > >> > Additionally, I had attached an updated version of a port for the Nerd Font
> > > >> > Icons. I.e Symbol font only. Which doesn't patch any existed fonts.
> > > >> >
> > > >> > I'd like to import it as well.
> > > >> >
> > > >> > Feedback? Ok?
> > > >> >
> > > >>
> > > >
> > > > Update was commited some time ago, but I still looking for OK to import
> > > > nerd-fonts-symbols-only. Anyone?
> > >
> > > It builds and install ok on amd64 but I think the Makefile should be:
> > >
> > > diff -u Makefile.orig Makefile
> > > --- Makefile.orig	Tue Dec 10 10:09:13 2024
> > > +++ Makefile	Tue Dec 10 10:09:22 2024
> > > @@ -1,4 +1,4 @@
> > > -NF_FONT =	NerdFontsSymbolsOnly
> > > +NF_FONT =	SymbolsOnly
> > >
> > >  post-install:
> > >  	${INSTALL_DATA_DIR} ${DOCDIR}
> > >
> > > Otherwise the package is named "nerdfontssymbolsonly-nerd-fonts-3.3.0".
> > > I guess that it also need this in the parent Makefile:
> > >
> > 
> > Yes, the package is called that way, but the archive with the font is called
> > NerdFontsSymbolsOnly.zip and I think the right way make nice package name is:
> > 
> > Index: Makefile.inc
> > ===================================================================
> > RCS file: /home/cvs/ports/fonts/nerd-fonts/Makefile.inc,v
> > diff -u -p -r1.8 Makefile.inc
> > --- Makefile.inc	4 Dec 2024 22:04:25 -0000	1.8
> > +++ Makefile.inc	10 Dec 2024 11:34:17 -0000
> > @@ -3,7 +3,7 @@ DIST_SUBDIR =	${NF_PROJECT}-${VERSION}
> >  
> >  NF_PROJECT =	nerd-fonts
> >  VERSION =	3.3.0
> > -PKGNAME =	${NF_FONT:L}-${NF_PROJECT}-${VERSION}
> > +PKGNAME =	${NF_FONT:L:S/nerdfonts//g}-${NF_PROJECT}-${VERSION}
> >  CATEGORIES =	fonts
> >  HOMEPAGE =	https://www.nerdfonts.com/
>
> that seems a sensible approach.
>
> I'd prefer if the dir was named the same way as the package,
> i.e. "symbolsonly" (unfortunately that didn't happen for
> ubuntu-mono but it did for the others)


I have been using for a while the following.  Which seems nice, but i'm not sure how well it plays with others.

Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/fonts/nerd-fonts/Makefile.inc,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.inc
--- Makefile.inc	15 Apr 2024 16:08:17 -0000	1.6
+++ Makefile.inc	10 Dec 2024 12:33:36 -0000
@@ -2,7 +2,7 @@ COMMENT =	${NF_FONT} Nerd Font
DIST_SUBDIR =	${NF_PROJECT}-${VERSION}
 
NF_PROJECT =	nerd-fonts
-VERSION =	3.0.2
+VERSION =	3.3.0
PKGNAME =	${NF_FONT:L}-${NF_PROJECT}-${VERSION}
CATEGORIES =	fonts
HOMEPAGE =	https://www.nerdfonts.com/
@@ -13,7 +13,7 @@ HOMEPAGE =	https://www.nerdfonts.com/
PERMIT_PACKAGE =	Yes

SITES =			https://github.com/ryanoasis/${NF_PROJECT}/releases/download/v${VERSION}/
-DISTFILES =		${NF_FONT}${EXTRACT_SUFX}
+DISTFILES =		${NF_FONT:S/^Symbols$/NerdFontsSymbolsOnly/}${EXTRACT_SUFX}
 EXTRACT_SUFX =		.zip

MODULES =		font

$ cat symbols/Makefile                                                                               
NF_FONT =	Symbols

.include <bsd.port.mk>

$ cd symbols/; make show=PKGNAME                                                                     
symbols-nerd-fonts-3.3.0