From nobody Tue Dec 20 08:46:56 2022 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 4Nbqv50cb2z1GCYB; Tue, 20 Dec 2022 08:46:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nbqv507Mqz3MNj; Tue, 20 Dec 2022 08:46:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671526017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m0/pvNdHPePfbDQ0mBpNvWzTRV3BBWU/8o5+tTYwbkM=; b=Dx9yPShMTS6w9D2cu597Y6ERAK7e9Ld/1IRmOFmnwbuF7pudG2hIkJNsv2L2FIt62wTGaG NKeGnmArt/3r56XYOyjhfLtdcB5vhZx+gUPy57aKt21j2WXT0yIXiLSY/ge0+3LDw0+aOC Ton8vfBvv2fxZJ5tjL8SDDCYTeWxzSMsMbU+ADc5naLqJG/V8jIFCdtkisKHzsPOKabmJZ Z4IlKiZw/7eP7Ta3Bwi6MI+0NVtRU6TJa0Z2jEYhO16rHQrpznlcOnsubqsSS0riIWg/JQ 4N15B2aiMzJuhMD55umSL4YtldHmYkxANQN1Pjp4kRhzvHzKjtREISkVYLo2kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671526017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m0/pvNdHPePfbDQ0mBpNvWzTRV3BBWU/8o5+tTYwbkM=; b=XbC8YtPopg5T+oTPXgaMbJ4IgZOgyPelewYpbUcHr5OZ1I3e+2bOSnuWVqe0XT9yscQ1b3 gySY84IKfG5xvLh2/OZEJW/guVA9+NeqSQNfx5vxhqESrJ0mZxVHFpRdAKrpMyBWbC/xd2 q7a1NG5OhmJ5lEoLdeNPx3Ysr8YlRq4fja19ftBXH6BRb8X6U/lyTmuWIbSqeZUIrSwTH9 OwREc+ItEfv2zCuDXv1T5FI/T706UylhzVmqEuRNj1nS5csbqC6OaPDkDvXilfQGxLJ1TX r1M0IUi1Vn1ehEViVkh4U/OEROjYNc+oPmgt07dw56AbuUxFzXRLb8zYFo+lXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671526017; a=rsa-sha256; cv=none; b=CpYIY7VmLXplhgaA2Yxmu/CfYx5FVECtb7cdkHjNSJdL8qcfqIZpb1VtAbWLc/+BCekbB8 mVdra1R5xPhDw79K7CNBqqP+Pyw2aQN7ZQ5AB/KUjbDQtDxB/bFO1WEt6VBSYGAwWDq1yP 0rFmfGfSpmHOh/jOONOBFDERua0l1yGbz/6sOf9sUQF3cW4qrv19/YUZy9Kt9xpBJxmq21 4sq1medo9Jx3KTryvNSCN7rZJEGxcNTho/Q6bVK7YtuHBgpRckoUJJqQtoKGt1yPN39U12 Xzh1rtpE71cyhU1YCj41qOHeQ69R3sm9dkMZhNhSGLooZcW0U78YXIIXqt/cWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nbqv46JpgzV4l; Tue, 20 Dec 2022 08:46:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BK8kuQd062183; Tue, 20 Dec 2022 08:46:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BK8kuFB062182; Tue, 20 Dec 2022 08:46:56 GMT (envelope-from git) Date: Tue, 20 Dec 2022 08:46:56 GMT Message-Id: <202212200846.2BK8kuFB062182@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 84cc186d713e - main - x11/xscreensaver: Update to 6.06 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84cc186d713eb266ed04de49e0da435a00c2666e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=84cc186d713eb266ed04de49e0da435a00c2666e commit 84cc186d713eb266ed04de49e0da435a00c2666e Author: Felix Palmen AuthorDate: 2022-12-19 11:16:39 +0000 Commit: Felix Palmen CommitDate: 2022-12-20 08:46:29 +0000 x11/xscreensaver: Update to 6.06 Changelog: - New hack, hextrail. - marbling works again. - Adjusted some of the very old hacks, which were written when pixels were larger, to be more visible on today's higher rez displays. - X11: More robust desktop image grabbing. - X11: Various improvements to xscreensaver-settings. - X11: Silence new new Perl warnings from xscreensaver-getimage-file. Approved by: x11 (manu, maintainer), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D37744 --- x11/xscreensaver/Makefile | 3 +-- x11/xscreensaver/distinfo | 6 +++--- x11/xscreensaver/files/patch-configure.ac | 13 ++----------- x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in | 12 ++++++------ x11/xscreensaver/pkg-plist | 6 +++--- 5 files changed, 15 insertions(+), 25 deletions(-) diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index acaa9bd41b1d..3b1068c59fc0 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,8 +1,7 @@ PORTNAME= xscreensaver -DISTVERSION= 6.05 +DISTVERSION= 6.06 CATEGORIES= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ -EXTRACT_SUFX= .1.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= Save your screen while you entertain your cat diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index 705de1aee22f..8a1e98ee0ce8 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669032437 -SHA256 (xscreensaver-6.05.1.tar.gz) = 2da512b201cacc85c496f602e73947da4e89bfb5bb67a74e65e052fd5e677b3a -SIZE (xscreensaver-6.05.1.tar.gz) = 26110057 +TIMESTAMP = 1671446342 +SHA256 (xscreensaver-6.06.tar.gz) = f534fab85a836de5b8be8e91fc21b80ca7d6a4ed9386ebe207d4be7a4e7499a7 +SIZE (xscreensaver-6.06.tar.gz) = 26334374 diff --git a/x11/xscreensaver/files/patch-configure.ac b/x11/xscreensaver/files/patch-configure.ac index d7a6115c6f7e..3b9074f4114e 100644 --- a/x11/xscreensaver/files/patch-configure.ac +++ b/x11/xscreensaver/files/patch-configure.ac @@ -1,15 +1,6 @@ ---- configure.ac.orig 2022-09-02 16:10:15 UTC +--- configure.ac.orig 2022-12-19 10:45:37 UTC +++ configure.ac -@@ -2822,7 +2822,7 @@ if test "$with_gtk" = yes; then - - GTK_DATADIR="" - if test "$have_gtk" = yes; then -- GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` -+ GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0` - GTK_DATADIR="$GTK_DATADIR/share" - fi - -@@ -4031,7 +4031,7 @@ fi +@@ -4003,7 +4003,7 @@ fi ############################################################################### PTY_LIBS= diff --git a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in index 9a5f1ed4b211..e12efbf02fbb 100644 --- a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in +++ b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in @@ -1,4 +1,4 @@ ---- driver/XScreenSaver.ad.in.orig 2021-06-09 15:47:14 UTC +--- driver/XScreenSaver.ad.in.orig 2022-12-11 20:32:55 UTC +++ driver/XScreenSaver.ad.in @@ -55,7 +55,7 @@ *splashDuration: 0:00:05 @@ -8,7 +8,7 @@ +*ignoreUninstalledPrograms: True *authWarningSlack: 20 - *textMode: file + *textMode: url @@ -103,7 +103,7 @@ @@ -34,10 +34,10 @@ + -label -origin moon \n\ +- xsnow -bg SkyBlue3 -solidbg \n\ +@GL_KLUDGE@ GL: fireflies -root \n\ - maze -root \n\ - @GL_KLUDGE@ GL: superquadrics -root \n\ - attraction -root \n\ -@@ -602,7 +614,6 @@ XScreenSaver.bourneShell: /bin/sh + maze --root \n\ + @GL_KLUDGE@ GL: superquadrics --root \n\ + attraction --root \n\ +@@ -610,7 +622,6 @@ XScreenSaver.bourneShell: /bin/sh *hacks.dangerball.name: Danger Ball *hacks.decayscreen.name: Decay Screen *hacks.deepstars.name: Deep Stars diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist index 365e4dc6a9d1..d3d7094990cf 100644 --- a/x11/xscreensaver/pkg-plist +++ b/x11/xscreensaver/pkg-plist @@ -115,6 +115,7 @@ bin/xscreensaver-hacks/headroom bin/xscreensaver-hacks/helix bin/xscreensaver-hacks/hexadrop bin/xscreensaver-hacks/hexstrut +bin/xscreensaver-hacks/hextrail bin/xscreensaver-hacks/hilbert bin/xscreensaver-hacks/hopalong bin/xscreensaver-hacks/hydrostat @@ -229,7 +230,6 @@ bin/xscreensaver-hacks/surfaces bin/xscreensaver-hacks/swirl bin/xscreensaver-hacks/tangram bin/xscreensaver-hacks/tessellimage -bin/xscreensaver-hacks/thornbird bin/xscreensaver-hacks/timetunnel bin/xscreensaver-hacks/topblock bin/xscreensaver-hacks/triangle @@ -386,6 +386,7 @@ man/man6/headroom.6.gz man/man6/helix.6.gz man/man6/hexadrop.6.gz man/man6/hexstrut.6.gz +man/man6/hextrail.6.gz man/man6/hilbert.6.gz man/man6/hopalong.6.gz man/man6/hydrostat.6.gz @@ -490,7 +491,6 @@ man/man6/surfaces.6.gz man/man6/swirl.6.gz man/man6/tangram.6.gz man/man6/tessellimage.6.gz -man/man6/thornbird.6.gz man/man6/timetunnel.6.gz man/man6/topblock.6.gz man/man6/triangle.6.gz @@ -666,6 +666,7 @@ share/pixmaps/xscreensaver.png %%DATADIR%%/config/helix.xml %%DATADIR%%/config/hexadrop.xml %%DATADIR%%/config/hexstrut.xml +%%DATADIR%%/config/hextrail.xml %%DATADIR%%/config/hilbert.xml %%DATADIR%%/config/hopalong.xml %%DATADIR%%/config/hydrostat.xml @@ -772,7 +773,6 @@ share/pixmaps/xscreensaver.png %%DATADIR%%/config/swirl.xml %%DATADIR%%/config/tangram.xml %%DATADIR%%/config/tessellimage.xml -%%DATADIR%%/config/thornbird.xml %%DATADIR%%/config/timetunnel.xml %%DATADIR%%/config/topblock.xml %%DATADIR%%/config/triangle.xml