Date: Wed, 03 May 2023 09:54:19 -0700 From: Cy Schubert <Cy.Schubert@cschubert.com> To: Cy Schubert <Cy.Schubert@cschubert.com> Cc: Alexey Dokuchaev <danfe@FreeBSD.org>, ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: a954c97c672d - main - x11-wm/icewm: update IceWM to version 3.3.4. Message-ID: <20230503165420.1A115D3@slippy.cwsent.com> In-Reply-To: <20230503162252.A7C90CA@slippy.cwsent.com> References: <202305031510.343FAv9Y036517@gitrepo.freebsd.org> <20230503162252.A7C90CA@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <20230503162252.A7C90CA@slippy.cwsent.com>, Cy Schubert writes: > In message <202305031510.343FAv9Y036517@gitrepo.freebsd.org>, Alexey > Dokuchaev > writes: > > The branch main has been updated by danfe: > > > > URL: https://cgit.FreeBSD.org/ports/commit/?id=a954c97c672d5ab53e0abda1d963 > 2a > > e5a47c9aa8 > > > > commit a954c97c672d5ab53e0abda1d9632ae5a47c9aa8 > > Author: Alexey Dokuchaev <danfe@FreeBSD.org> > > AuthorDate: 2023-05-03 15:10:36 +0000 > > Commit: Alexey Dokuchaev <danfe@FreeBSD.org> > > CommitDate: 2023-05-03 15:10:36 +0000 > > > > x11-wm/icewm: update IceWM to version 3.3.4. > > --- > > x11-wm/icewm/Makefile | 3 +-- > > x11-wm/icewm/distinfo | 6 +++--- > > 2 files changed, 4 insertions(+), 5 deletions(-) > > > > diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile > > index 37d4c128adb0..c63dfc60b34c 100644 > > --- a/x11-wm/icewm/Makefile > > +++ b/x11-wm/icewm/Makefile > > @@ -1,6 +1,5 @@ > > PORTNAME= icewm > > -PORTVERSION= 3.3.3 > > -PORTREVISION= 1 > > +PORTVERSION= 3.3.4 > > CATEGORIES= x11-wm > > MASTER_SITES= https://github.com/ice-wm/icewm/releases/download/${POR > > TVERSION}/ > > > > diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo > > index 19bd16b06eb8..329dbcf9da64 100644 > > --- a/x11-wm/icewm/distinfo > > +++ b/x11-wm/icewm/distinfo > > @@ -1,3 +1,3 @@ > > -TIMESTAMP = 1681076422 > > -SHA256 (icewm-3.3.3.tar.lz) = e138c72003f77e7b3dcf9ee1e22d66a5a1ac510973e5 > 0f > > f31ac0cd62263dcf73 > > -SIZE (icewm-3.3.3.tar.lz) = 1797492 > > +TIMESTAMP = 1683110920 > > +SHA256 (icewm-3.3.4.tar.lz) = aebb0e9da1e443d5bb2ae931ba2650474633fc5d410c > 67 > > 5341b296813d009c88 > > +SIZE (icewm-3.3.4.tar.lz) = 1796578 > > > > This and probably prior versions of this port fail to build on 14-CURRENT. > It downloads nanosvg, which fails to #include <stdio.h>. I'm not sure why > this isn't a problem on other versions of FreeBSD, but can we use > graphics/nanosvg instead? The port is doing the correct thing however it is circumvented by ./configure by downloading and using nanosvg. The following patch fixes ./configure to use the package. diff --git a/x11-wm/icewm/files/patch-configure b/x11-wm/icewm/files/patch-c onfigure new file mode 100644 index 000000000000..b1d2ae469e0e --- /dev/null +++ b/x11-wm/icewm/files/patch-configure @@ -0,0 +1,34 @@ +--- configure.orig 2023-05-03 03:39:53.000000000 -0700 ++++ configure 2023-05-03 09:41:22.682467000 -0700 +@@ -24331,31 +24331,10 @@ + ! test -f src/nanosvgrast.h || + ! test -s src/nanosvgrast.h + then +- hub=https://raw.githubusercontent.com/memononen/nanosvg/master /src/ +- if command -v wget >/dev/null +- then +- { $as_echo "$as_me:${as_lineno-$LINENO}: downloading nanosvg using wget" >&5 +-$as_echo "$as_me: downloading nanosvg using wget" >&6;} +- if ! wget -q --timeout=3 -e robots=off -e noclobber=off \ +- -P src $hub/nanosvg.h $hub/nanosvgrast.h +- then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Download of nanosvg failed." >&5 +-$as_echo "$as_me: WARNING: Download of nanosvg failed." >&2;} +- fi +- fi + fi +- if test -f src/nanosvg.h && +- test -s src/nanosvg.h && +- test -f src/nanosvgrast.h && +- test -s src/nanosvgrast.h +- then + + $as_echo "#define CONFIG_NANOSVG 1" >>confdefs.h + +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Nanosvg includes are missing. SVG is not supported." >&5 +-$as_echo "$as_me: WARNING: Nanosvg includes are missing. SVG is not supported." >&2;} +- fi + fi + + if test "x$enable_nanosvg" != xyes && -- Cheers, Cy Schubert <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org NTP: <cy@nwtime.org> Web: https://nwtime.org e^(i*pi)+1=0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20230503165420.1A115D3>