diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-30 20:37:10 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-30 20:37:10 +0000 |
| commit | ead17333788dd3d2f10668267546ace81089103a (patch) | |
| tree | 89219cd25f012102e098ee173b36a0d2ebcb02e5 /main/xdg-utils | |
| parent | 4ed607998a9fa94b6c13e867ad33e330d752e0f0 (diff) | |
| download | aports-ead17333788dd3d2f10668267546ace81089103a.tar.bz2 aports-ead17333788dd3d2f10668267546ace81089103a.tar.xz | |
main/xdg-utils: misc xdg-screensaver fixes
- depend on xset and xprop
- never use the non-posix 'mv -T'. The test for support of it is
broke.
Diffstat (limited to 'main/xdg-utils')
| -rw-r--r-- | main/xdg-utils/APKBUILD | 6 | ||||
| -rw-r--r-- | main/xdg-utils/xdg-screensaver-mv-T.patch | 25 |
2 files changed, 29 insertions, 2 deletions
diff --git a/main/xdg-utils/APKBUILD b/main/xdg-utils/APKBUILD index 40478cb464..b31b5f1213 100644 --- a/main/xdg-utils/APKBUILD +++ b/main/xdg-utils/APKBUILD @@ -2,16 +2,17 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xdg-utils pkgver=1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Basic desktop integration functions" url="http://portland.freedesktop.org/wiki/" arch="noarch" license="MIT" -depends= +depends="xset xprop" makedepends= install= subpackages="$pkgname-doc" source="http://portland.freedesktop.org/download/xdg-utils-$pkgver.tgz + xdg-screensaver-mv-T.patch xfce.patch" _builddir="$srcdir"/$pkgname-$pkgver @@ -40,4 +41,5 @@ package() { } md5sums="348a5b91dc66426505022c74a64b2940 xdg-utils-1.0.2.tgz +f1e310a02e15ca38b07281465eff664e xdg-screensaver-mv-T.patch 328567c08a452bdbbedd2f1cca9ac116 xfce.patch" diff --git a/main/xdg-utils/xdg-screensaver-mv-T.patch b/main/xdg-utils/xdg-screensaver-mv-T.patch new file mode 100644 index 0000000000..6452d6307c --- /dev/null +++ b/main/xdg-utils/xdg-screensaver-mv-T.patch @@ -0,0 +1,25 @@ +--- ./scripts/xdg-screensaver.orig ++++ ./scripts/xdg-screensaver +@@ -354,18 +354,10 @@ + return 0 + } + +-# Check if we can use "mv -T" +-if mv -T ... ... 2>&1 | grep '\.\.\.' > /dev/null ; then +- # We can securely move files in /tmp with mv -T +- DEBUG 1 "mv -T available" +- MV="mv -T" +- screensaver_file="/tmp/xdg-screensaver-$USER-"`echo $DISPLAY | sed 's/:/-/g'` +-else +- # No secure moves available, use home dir +- DEBUG 1 "mv -T not available" +- MV="mv" +- screensaver_file="$HOME/.xdg-screensaver-"`echo $HOSTNAME-$DISPLAY | sed 's/:/-/g'` +-fi ++# No secure moves available, use home dir ++DEBUG 1 "mv -T not available" ++MV="mv" ++screensaver_file="$HOME/.xdg-screensaver-"`echo $HOSTNAME-$DISPLAY | sed 's/:/-/g'` + lockfile_command=`which lockfile 2> /dev/null` + + lockfile() |