Skip to content
Snippets Groups Projects
Commit d49de1af authored by Sertonix's avatar Sertonix Committed by Natanael Copa
Browse files

community/xdg-utils: fix xdg-screensaver with busybox sed

Fixes #16411
parent 589dff3e
No related branches found
No related tags found
1 merge request!74107community/xdg-utils: fix xdg-screensaver with busybox sed
Pipeline #268878 skipped
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xdg-utils pkgname=xdg-utils
pkgver=1.2.1 pkgver=1.2.1
pkgrel=0 pkgrel=1
pkgdesc="Basic desktop integration functions" pkgdesc="Basic desktop integration functions"
url="https://www.freedesktop.org/wiki/Software/xdg-utils/" url="https://www.freedesktop.org/wiki/Software/xdg-utils/"
arch="noarch" arch="noarch"
...@@ -20,7 +20,9 @@ makedepends=" ...@@ -20,7 +20,9 @@ makedepends="
xmlto xmlto
" "
subpackages="$pkgname-doc" subpackages="$pkgname-doc"
source="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v${pkgver/_/-}/xdg-utils-v${pkgver/_/-}.tar.gz" source="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v${pkgver/_/-}/xdg-utils-v${pkgver/_/-}.tar.gz
busybox-sed.patch
"
builddir="$srcdir/$pkgname-v${pkgver/_/-}" builddir="$srcdir/$pkgname-v${pkgver/_/-}"
build() { build() {
...@@ -40,4 +42,5 @@ package() { ...@@ -40,4 +42,5 @@ package() {
sha512sums=" sha512sums="
9b031d9c65247d0bbe0ce11fba10f88e68fa11e8d0fe5d1b09876edd21f59896a4d3be9a23f10afb7436446580b4d38fba99c622767eecec3951be4f5e4aad3e xdg-utils-v1.2.1.tar.gz 9b031d9c65247d0bbe0ce11fba10f88e68fa11e8d0fe5d1b09876edd21f59896a4d3be9a23f10afb7436446580b4d38fba99c622767eecec3951be4f5e4aad3e xdg-utils-v1.2.1.tar.gz
62063dc8667b945d6bd38c3e54d1df38dfd4356ad6968509f3acbb7c4b6130e38b98fd9bb1ac9f2ad13cae7ee5d51131ee9d7a50b5867149e0eb9578208b79b0 busybox-sed.patch
" "
Busybox sed allows } to be a label so we need to add a ;.
Ref https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/126
--- a/scripts/xdg-screensaver.in
+++ b/scripts/xdg-screensaver.in
@@ -363,7 +363,7 @@ screensaver_kde3()
xset_screensaver_timeout()
{
- xset q | sed '/^Screen Saver:/,/^[^ ]/ { s/.*timeout: *\([0-9]*\).*/\1/; t }; d'
+ xset q | sed '/^Screen Saver:/,/^[^ ]/ { s/.*timeout: *\([0-9]*\).*/\1/; t; }; d'
}
screensaver_xserver()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment