From ead17333788dd3d2f10668267546ace81089103a Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 30 Jan 2012 20:37:10 +0000
Subject: 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.
---
 main/xdg-utils/APKBUILD                   |  6 ++++--
 main/xdg-utils/xdg-screensaver-mv-T.patch | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 main/xdg-utils/xdg-screensaver-mv-T.patch

(limited to 'main/xdg-utils')

diff --git a/main/xdg-utils/APKBUILD b/main/xdg-utils/APKBUILD
index 40478cb46..b31b5f121 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 000000000..6452d6307
--- /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()
-- 
cgit v1.2.3