From 573fcb371f4e5a113c720f25a0d67e7f2f0c7a92 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 9 Dec 2020 18:10:32 +0100 Subject: [PATCH 1/3] xscreensaver: Update version from 5.43 to 5.45 Logging into Xfce, XScreenSaver shows a warning, that the installed version is too old. https://www.jwz.org/xscreensaver/changelog.html --- xscreensaver.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xscreensaver.be0 b/xscreensaver.be0 index 40fbe11fe..ecc7435e5 100755 --- a/xscreensaver.be0 +++ b/xscreensaver.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION xscreensaver-5.43-2 +# BEE_VERSION xscreensaver-5.45-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 72f4d84c47d5008720aea0028716aefc4574072e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 9 Dec 2020 18:12:53 +0100 Subject: [PATCH 2/3] xscreensaver: Indent with two spaces --- xscreensaver.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xscreensaver.be0 b/xscreensaver.be0 index ecc7435e5..6add6f2db 100755 --- a/xscreensaver.be0 +++ b/xscreensaver.be0 @@ -57,7 +57,7 @@ mee_configure() { start_cmd sed 's/gdmflexiserver -ls/dm-tool switch-to-greeter/' -i ${S}/configure # can't find configure switch to do this. 'with-login-manager' doesn't work like expected bee_configure \ - --with-setcap-hacks=no + --with-setcap-hacks=no } #mee_build() { From 718df0ff9ce71827254b521223961be32fa4c031 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 9 Dec 2020 18:21:19 +0100 Subject: [PATCH 3/3] xscreensaver: Disable sonar hack using configure script The patch does not apply anymore. The configure script allows us to disable it. --- xscreensaver.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xscreensaver.be0 b/xscreensaver.be0 index 6add6f2db..1be356453 100755 --- a/xscreensaver.be0 +++ b/xscreensaver.be0 @@ -15,7 +15,7 @@ SRCURL[0]="https://www.jwz.org/xscreensaver/xscreensaver-${PKGVERSION}.tar.gz" ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -PATCHURL[0]="/src/mariux/patches/xscreensaver-remove-sonar.diff" +# PATCHURL[0]="" ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not @@ -57,6 +57,7 @@ mee_configure() { start_cmd sed 's/gdmflexiserver -ls/dm-tool switch-to-greeter/' -i ${S}/configure # can't find configure switch to do this. 'with-login-manager' doesn't work like expected bee_configure \ + --with-setuid-hacks=no \ --with-setcap-hacks=no }