diff options
| author | Christopher Pence | 2020-08-30 01:45:54 -0700 |
|---|---|---|
| committer | Christopher Pence | 2020-08-30 02:03:10 -0700 |
| commit | 4b17f804fa50c3dacca2651f3c3aa333adb1517b (patch) | |
| tree | ad7b450a84cbb0c62f327c77862d9a0cbec797d6 | |
| parent | d9f97a15202806d6e4bd361fd526280c7f143617 (diff) | |
| download | aur-4b17f804fa50c3dacca2651f3c3aa333adb1517b.tar.gz | |
Fix migration template xscreensaver-config.xsl
xscreensaver-config.xsl defines .desktop entries for an xscreensaver
backend, but it sets the executable parameters as:
TryExec=zoom
Exec=zoom -root
These reference the screensaver's executable ("zoom") by a relative
path. If there's a conflicting executable on the machine (e.g. zoom,
the popular video conferencing app), then that other executable would
be run instead of the screensaver when the screen blanks.
Using an absolute path removes the ambiguity:
TryExec=/usr/lib/xscreensaver/zoom
Exec=/usr/lib/xscreensaver/zoom -root
This commit adds absolute paths, on top of:
- Rewrites some of the template to use variables and concat() on
input strings.
- Adds `Hidden=true` to avoid adding the screensavers as application
menu items.
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rw-r--r-- | xscreensaver-config.xsl | 11 |
3 files changed, 9 insertions, 6 deletions
@@ -22,7 +22,7 @@ pkgbase = xscreensaver-backends sha1sums = 3e93aa745aa986cf521de31b6e731f990302c920 sha1sums = 3eedb8b91b13c29df9b1fe5cbb027e1470b802d2 sha1sums = 19195ef59f0dbc61c6ed599a968213a8f0a7a5d4 - sha1sums = 3b5fd07d97cce754071e6f54db681dfea482a87d + sha1sums = e561e36c7bae61c3f5da65e4fb19a22e698f4584 pkgname = xscreensaver-backends @@ -18,7 +18,7 @@ source=(http://www.jwz.org/xscreensaver/${_srcname}-${pkgver}.tar.gz sha1sums=('3e93aa745aa986cf521de31b6e731f990302c920' '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2' '19195ef59f0dbc61c6ed599a968213a8f0a7a5d4' - '3b5fd07d97cce754071e6f54db681dfea482a87d') + 'e561e36c7bae61c3f5da65e4fb19a22e698f4584') # HAVE_GTK2 is needed to build with arch gdk-pixbuf2 even if no gtk2 installed diff --git a/xscreensaver-config.xsl b/xscreensaver-config.xsl index 6ba4f0f0f27d..b5bc4454c4d0 100644 --- a/xscreensaver-config.xsl +++ b/xscreensaver-config.xsl @@ -10,18 +10,21 @@ Encoding=UTF-8 Name=<xsl:value-of select="@_label" /> Comment=<xsl:value-of select="normalize-space(_description)" /> <xsl:if test="count(command/@name) != 0"> -TryExec=<xsl:value-of select="normalize-space(command/@name)" /> -Exec=<xsl:value-of select="normalize-space(command/@name)" /><xsl:text> </xsl:text><xsl:value-of select="normalize-space(command/@arg)" /> +<xsl:variable name="executable" select="concat('/usr/lib/xscreensaver/', normalize-space(command/@name))" /> +TryExec=<xsl:value-of select="$executable" /> +Exec=<xsl:value-of select="concat($executable, ' ', normalize-space(command/@arg))" /> </xsl:if> <xsl:if test="count(command/@name) = 0"> -TryExec=<xsl:value-of select="normalize-space(@name)" /> -Exec=<xsl:value-of select="normalize-space(@name)" /><xsl:text> </xsl:text><xsl:value-of select="normalize-space(command/@arg)" /> +<xsl:variable name="executable" select="concat('/usr/lib/xscreensaver/', normalize-space(@name))" /> +TryExec=<xsl:value-of select="$executable" /> +Exec=<xsl:value-of select="concat($executable, ' ', normalize-space(command/@arg))" /> </xsl:if> StartupNotify=false Terminal=false Type=Application Categories=Screensaver; OnlyShowIn=MATE;GNOME;XFCE; +Hidden=true </xsl:template> </xsl:stylesheet> |