From 635470d2d206d11989a9a45b80f94a805635efd3 Mon Sep 17 00:00:00 2001 From: gutteridge Date: Thu, 8 Feb 2024 00:50:15 +0000 Subject: [PATCH] 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. --- x11/xscreensaver/Makefile | 8 ++------ .../patch-driver_xscreensaver-settings.desktop.in | 11 +++++++++++ .../patches/patch-driver_xscreensaver.desktop.in | 11 +++++++++++ 3 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 x11/xscreensaver/patches/patch-driver_xscreensaver-settings.desktop.in create mode 100644 x11/xscreensaver/patches/patch-driver_xscreensaver.desktop.in diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index e1b329ac29f3..a8d5ff2399a2 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -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} diff --git a/x11/xscreensaver/patches/patch-driver_xscreensaver-settings.desktop.in b/x11/xscreensaver/patches/patch-driver_xscreensaver-settings.desktop.in new file mode 100644 index 000000000000..f1d977ab6139 --- /dev/null +++ b/x11/xscreensaver/patches/patch-driver_xscreensaver-settings.desktop.in @@ -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 diff --git a/x11/xscreensaver/patches/patch-driver_xscreensaver.desktop.in b/x11/xscreensaver/patches/patch-driver_xscreensaver.desktop.in new file mode 100644 index 000000000000..8f6bdeb3e5eb --- /dev/null +++ b/x11/xscreensaver/patches/patch-driver_xscreensaver.desktop.in @@ -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