From nobody Wed May 03 16:54:19 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QBNMg5DHYz4935v; Wed, 3 May 2023 16:54:23 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QBNMg2tlXz4NWY; Wed, 3 May 2023 16:54:23 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTP id uDYmppDQjLAoIuFkEpwcir; Wed, 03 May 2023 16:54:22 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id uFkCpV8FJ3fOSuFkDpONwB; Wed, 03 May 2023 16:54:22 +0000 X-Authority-Analysis: v=2.4 cv=J8G5USrS c=1 sm=1 tr=0 ts=645291be a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=P0xRbXHiH_UA:10 a=VxmjJ2MpAAAA:8 a=6I5d2MoRAAAA:8 a=NEAV23lmAAAA:8 a=ThJfVtAbAAAA:20 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=BhfvOMzXmrfNv6PP_msA:9 a=CjuIK1q_8ugA:10 a=IM17x53eafMA:10 a=bA3UWDv6hWIuX7UZL3qL:22 a=7gXAzLPJhVmCkEl4_tsf:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 4E906350; Wed, 3 May 2023 09:54:20 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 1A115D3; Wed, 3 May 2023 09:54:20 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Cy Schubert cc: Alexey Dokuchaev , 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. In-reply-to: <20230503162252.A7C90CA@slippy.cwsent.com> References: <202305031510.343FAv9Y036517@gitrepo.freebsd.org> <20230503162252.A7C90CA@slippy.cwsent.com> Comments: In-reply-to Cy Schubert message dated "Wed, 03 May 2023 09:22:52 -0700." List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 03 May 2023 09:54:19 -0700 Message-Id: <20230503165420.1A115D3@slippy.cwsent.com> X-CMAE-Envelope: MS4xfFnSOUIBXno/q0dnJH6rXKlMGWAnTW8LCqkwhl1262xszgBr95Zy9qjYcHnR+qHmRMxk2mW10L7DAjxAP7BpapAnOosy5F7Us+GsLKEH8TxbKlzvPVIL katBmthdGQ9leQ6k6O6MSBcznL5glj5hk7UWZjsla0GSi8IojYBRTsSfXP0fVrqv/+5ahLtQN3CQu3HJoT2idXeuxjcAWptNgurnMWUWaojLp5o8QKuLclas 4/pp+4BPdG5n/4hb7c1wCXNulhdUQ8AOBCVIvFH6anDfKE9lhbi1POt4niTy8W6aLcym9ep0jZVkcmGEXy0SRyVueNGoqhsimsAOjitS5T8= X-Rspamd-Queue-Id: 4QBNMg2tlXz4NWY X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N 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 > > AuthorDate: 2023-05-03 15:10:36 +0000 > > Commit: Alexey Dokuchaev > > 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 . 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 FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0