Skip to content

Commit

Permalink
xscreensaver: fix build failures
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
dhgutteridge committed Feb 8, 2024
1 parent 5f78ef1 commit 635470d
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 6 deletions.
8 changes: 2 additions & 6 deletions x11/xscreensaver/Makefile
Original file line number Diff line number Diff line change
@@ -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/

Expand Down Expand Up @@ -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}

Expand Down
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions x11/xscreensaver/patches/patch-driver_xscreensaver.desktop.in
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 635470d

Please sign in to comment.