From nobody Thu Nov 24 12:52:41 2022 X-Original-To: dev-commits-ports-main@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 4NHyZf070dz4j6yQ; Thu, 24 Nov 2022 12:52:42 +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 4NHyZd6QNfz48LL; Thu, 24 Nov 2022 12:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669294361; 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=QDyyAR+j6e20TU2DDXAxsBs6si5xj9dcD2h6AGBI49U=; b=iZsLOljLJkJD6mfA2gpQ2QVNKnvu09CIu4JDzcWt+KFeya2S/mLDF7eByJylXbkknyvjMM JVITylA8UeghJ428pO4gc4UtoaV0wsQ1quwu0yu57O83Tb+HdlIAWJIiO8WIfI/ApwG56+ yigPI/6DWxVkFuNeG+p38uC1Zy0ghID03/goyQR+mA7YIJ/PNYRhGUCLl/Fq4nliKev+ln YxjopTp2Mw80wLjELvV98WWuj9495Tl4YvYF4kEXNkzF9LYbcg2LY5hA1oaDj9RbN3CK+0 kqyE0V3LF9svFyOrjR473QfezqYs+pR0DC+QK90uMcQ6ESz7Pzo4FLo0krXOcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669294361; 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=QDyyAR+j6e20TU2DDXAxsBs6si5xj9dcD2h6AGBI49U=; b=xxpJbK0aMeXCUKjYKbJfrV+sA/1zgxZy/f/NnFtop8+SsLFfVjSvicspM2CReXk/bV0XHs Ouuqyn3lbU9/BCwEEzjfHXy9mjZ3rtcPqOmvotWt7OkGhgLdDc1ejj2n2qSiCj0VyOc65h CRbZd92V8vtleVcOBVKXivKWUwWc4Pa38eFHuXg24JuUhPvczD9PDUNOo/8VlGUV755ufT tv/HFVYFVD/qEc+Rqz5iIkQByqE3W6rG2VVNS4xeY8852Qcx1VQOJx/m3KYL6WT/tE9Cbg yiYSaGZRBNp/wHMfPiGlTMkRI6DLVJs2omNfkFyQJh45NObZtO764In49hH48g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669294361; a=rsa-sha256; cv=none; b=vm9Yy4bpK+FU1uz+Q8Qf/lH6c0aCZBJDGh8dhNBID6uFhojuJI2bEUD9yinm5Kb7LRVSkF cLew2fh+ZCMLQCbLz90nCtOQAxlmoVzU2v/kIw9LSEl+j7HADRzDuML3UGLPXwGxoxPsjV 4m8G6sHrgxO8c22nmjiTkklWtrsADD2mgtRtD60jcwxYXsByUOF8lEFmh/RU4Kdd0PfS7L Lw6B3A76h2Fy/IJD9xDVSDHkjCZdXtQhDeb84DxUQDmMACTMeCrOdG1B6uVWUKPQwwXFpZ +yf8YvDInNsOPPlBg1P6HhJbJZv/QY63xj9gX/8ujpxlrdUVYnB5kOY+dA6M5g== 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 4NHyZd5Tjdz12YF; Thu, 24 Nov 2022 12:52:41 +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 2AOCqfMH024979; Thu, 24 Nov 2022 12:52:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AOCqfFq024978; Thu, 24 Nov 2022 12:52:41 GMT (envelope-from git) Date: Thu, 24 Nov 2022 12:52:41 GMT Message-Id: <202211241252.2AOCqfFq024978@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: 163c60305063 - main - x11/xscreensaver: Update to 6.05 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 163c6030506313e42ca8f1e967e5e88489bd8a1b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=163c6030506313e42ca8f1e967e5e88489bd8a1b commit 163c6030506313e42ca8f1e967e5e88489bd8a1b Author: Felix Palmen AuthorDate: 2022-11-21 12:31:35 +0000 Commit: Felix Palmen CommitDate: 2022-11-24 12:52:06 +0000 x11/xscreensaver: Update to 6.05 Changelog: - X11: Cope with dumb DPMS settings that existed pre-startup. - X11: Silence new Perl warnings from xscreensaver-getimage-file. - X11: Fix sonar pthreads crash on recent Pi systems. - X11: Removed dependence on gdk-pixbuf-xlib-2.0. - X11: GTK 3 is now required. Approved by: x11 (manu, maintainer), cy, tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D37461 --- x11/xscreensaver/Makefile | 6 +++--- x11/xscreensaver/distinfo | 6 +++--- x11/xscreensaver/files/patch-config.h.in | 12 ------------ x11/xscreensaver/files/patch-configure.ac | 13 +++++++++++-- .../files/patch-hacks__config__sonar.xml | 20 -------------------- x11/xscreensaver/pkg-plist | 7 ------- 6 files changed, 17 insertions(+), 47 deletions(-) diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index cc38b9dc790c..acaa9bd41b1d 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,8 +1,8 @@ PORTNAME= xscreensaver -PORTVERSION= 6.04 -PORTREVISION= 1 +DISTVERSION= 6.05 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 @@ -22,7 +22,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ USES= autoreconf cpe gettext gl gmake gnome jpeg localbase:ldflags \ perl5 pkgconfig xorg USE_GL= gl glu -USE_GNOME= cairo gdkpixbuf2 gdkpixbuf2xlib gtk20 intltool libglade2 libxml2 +USE_GNOME= cairo gdkpixbuf2 gtk30 intltool libxml2 USE_PERL5= run USE_XORG= ice sm x11 xext xft xi xinerama xmu xrandr xrender xt xxf86vm CPE_VENDOR= xscreensaver_project diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index 31f6542aa743..705de1aee22f 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1655112914 -SHA256 (xscreensaver-6.04.tar.gz) = 787014b29f0c5793ecc2d93e1109a049ff48ab0c29b851dab34f683ceef6b152 -SIZE (xscreensaver-6.04.tar.gz) = 26112437 +TIMESTAMP = 1669032437 +SHA256 (xscreensaver-6.05.1.tar.gz) = 2da512b201cacc85c496f602e73947da4e89bfb5bb67a74e65e052fd5e677b3a +SIZE (xscreensaver-6.05.1.tar.gz) = 26110057 diff --git a/x11/xscreensaver/files/patch-config.h.in b/x11/xscreensaver/files/patch-config.h.in deleted file mode 100644 index e8ece901c93d..000000000000 --- a/x11/xscreensaver/files/patch-config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- config.h.in.orig 2022-02-20 19:12:54 UTC -+++ config.h.in -@@ -311,6 +311,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_UTIL_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_LIBUTIL_H -+ - /* Define this if you have XF86VidModeGetViewPort, for virtual desktops. */ - #undef HAVE_XF86VMODE - diff --git a/x11/xscreensaver/files/patch-configure.ac b/x11/xscreensaver/files/patch-configure.ac index e685985492fe..d7a6115c6f7e 100644 --- a/x11/xscreensaver/files/patch-configure.ac +++ b/x11/xscreensaver/files/patch-configure.ac @@ -1,6 +1,15 @@ ---- configure.ac.orig 2022-02-20 21:05:40 UTC +--- configure.ac.orig 2022-09-02 16:10:15 UTC +++ configure.ac -@@ -3986,7 +3986,7 @@ fi +@@ -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 ############################################################################### PTY_LIBS= diff --git a/x11/xscreensaver/files/patch-hacks__config__sonar.xml b/x11/xscreensaver/files/patch-hacks__config__sonar.xml deleted file mode 100644 index 59842a528bb4..000000000000 --- a/x11/xscreensaver/files/patch-hacks__config__sonar.xml +++ /dev/null @@ -1,20 +0,0 @@ ---- hacks/config/sonar.xml.orig 2016-04-08 02:15:38 UTC -+++ hacks/config/sonar.xml -@@ -31,7 +31,7 @@ - -