Received: by mail.netbsd.org (Postfix, from userid 605) id 7509984E65; Thu, 8 Feb 2024 00:50:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A7CCB84D2E for ; Thu, 8 Feb 2024 00:50:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id g_KeKuoknSnV for ; Thu, 8 Feb 2024 00:50:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 117C384CFE for ; Thu, 8 Feb 2024 00:50:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AFEC3FA42; Thu, 8 Feb 2024 00:50:15 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1707353415295250" MIME-Version: 1.0 Date: Thu, 8 Feb 2024 00:50:15 +0000 From: "David H. Gutteridge" Subject: CVS commit: pkgsrc/x11/xscreensaver To: pkgsrc-changes@NetBSD.org Reply-To: gutteridge@netbsd.org X-Mailer: log_accum Message-Id: <20240208005015.AFEC3FA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1707353415295250 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gutteridge Date: Thu Feb 8 00:50:15 UTC 2024 Modified Files: pkgsrc/x11/xscreensaver: Makefile Added Files: pkgsrc/x11/xscreensaver/patches: patch-driver_xscreensaver-settings.desktop.in patch-driver_xscreensaver.desktop.in Log Message: xscreensaver: fix build failures If xdg-open isn't installed (as it wouldn't be in a sandboxed build, since it wasn't specified as a dependency), this will fail package checks at the end. In fact, these lines are useless anyway, as .desktop files (per spec) treat them as comments, not as paths to an interpeter. This seems to be a misunderstanding upstream. To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 pkgsrc/x11/xscreensaver/Makefile cvs rdiff -u -r0 -r1.1 \ pkgsrc/x11/xscreensaver/patches/patch-driver_xscreensaver-settings.desktop.in \ pkgsrc/x11/xscreensaver/patches/patch-driver_xscreensaver.desktop.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1707353415295250 Content-Disposition: inline Content-Length: 2358 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/xscreensaver/Makefile diff -u pkgsrc/x11/xscreensaver/Makefile:1.154 pkgsrc/x11/xscreensaver/Makefile:1.155 --- pkgsrc/x11/xscreensaver/Makefile:1.154 Sat Feb 3 21:29:43 2024 +++ pkgsrc/x11/xscreensaver/Makefile Thu Feb 8 00:50:15 2024 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.154 2024/02/03 21:29:43 abs Exp $ +# $NetBSD: Makefile,v 1.155 2024/02/08 00:50:15 gutteridge Exp $ DISTNAME= xscreensaver-6.08 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= https://www.jwz.org/xscreensaver/ @@ -46,11 +47,6 @@ INSTALLATION_DIRS= share/doc/${PKGBASE} REPLACE_PERL+= hacks/*.pl hacks/*/*.pl -REPLACE_INTERPRETER+= xdg-open -REPLACE.xdg-open.old= .*/bin/env xdg-open -REPLACE.xdg-open.new= ${PREFIX}/bin/xdg-open -REPLACE_FILES.xdg-open= driver/xscreensaver.desktop.in driver/xscreensaver-settings.desktop.in - post-install: ${INSTALL_DATA} ${FILESDIR}/README.pkgsrc ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} Added files: Index: pkgsrc/x11/xscreensaver/patches/patch-driver_xscreensaver-settings.desktop.in diff -u /dev/null pkgsrc/x11/xscreensaver/patches/patch-driver_xscreensaver-settings.desktop.in:1.1 --- /dev/null Thu Feb 8 00:50:15 2024 +++ pkgsrc/x11/xscreensaver/patches/patch-driver_xscreensaver-settings.desktop.in Thu Feb 8 00:50:15 2024 @@ -0,0 +1,11 @@ +$NetBSD: patch-driver_xscreensaver-settings.desktop.in,v 1.1 2024/02/08 00:50:15 gutteridge Exp $ + +Drop unnecessary shebang line. + +--- driver/xscreensaver-settings.desktop.in.orig 2023-08-02 19:16:05.536755617 +0000 ++++ driver/xscreensaver-settings.desktop.in +@@ -1,4 +1,3 @@ +-#!/usr/bin/env xdg-open + [Desktop Entry] + Exec=xscreensaver-settings + Icon=xscreensaver Index: pkgsrc/x11/xscreensaver/patches/patch-driver_xscreensaver.desktop.in diff -u /dev/null pkgsrc/x11/xscreensaver/patches/patch-driver_xscreensaver.desktop.in:1.1 --- /dev/null Thu Feb 8 00:50:15 2024 +++ pkgsrc/x11/xscreensaver/patches/patch-driver_xscreensaver.desktop.in Thu Feb 8 00:50:15 2024 @@ -0,0 +1,11 @@ +$NetBSD: patch-driver_xscreensaver.desktop.in,v 1.1 2024/02/08 00:50:15 gutteridge Exp $ + +Drop unnecessary shebang line. + +--- driver/xscreensaver.desktop.in.orig 2023-08-02 19:17:40.690400428 +0000 ++++ driver/xscreensaver.desktop.in +@@ -1,4 +1,3 @@ +-#!/usr/bin/env xdg-open + [Desktop Entry] + Exec=xscreensaver + Icon=xscreensaver --_----------=_1707353415295250--