diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-19 15:07:24 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-19 15:12:33 +0000 |
| commit | 8b4d9b5d69f651322f6b130b03a27fcb122faca7 (patch) | |
| tree | 47f423f43bc33dbe0caa74ae7ce9119728137e10 /main | |
| parent | ee98e0e7879729d235d8b8d9b381eb2c0bb4f00c (diff) | |
| download | aports-8b4d9b5d69f651322f6b130b03a27fcb122faca7.tar.bz2 aports-8b4d9b5d69f651322f6b130b03a27fcb122faca7.tar.xz | |
main/xdg-utils: upgrade to 1.1.1
Diffstat (limited to 'main')
| -rw-r--r-- | main/xdg-utils/APKBUILD | 19 | ||||
| -rw-r--r-- | main/xdg-utils/xdg-screensaver-mv-T.patch | 16 | ||||
| -rw-r--r-- | main/xdg-utils/xfce.patch | 13 |
3 files changed, 19 insertions, 29 deletions
diff --git a/main/xdg-utils/APKBUILD b/main/xdg-utils/APKBUILD index c94a5a1e45..9b73d6c9b5 100644 --- a/main/xdg-utils/APKBUILD +++ b/main/xdg-utils/APKBUILD @@ -1,19 +1,19 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xdg-utils -pkgver=1.0.2 -pkgrel=2 +pkgver=1.1.1 +pkgrel=0 pkgdesc="Basic desktop integration functions" url="http://portland.freedesktop.org/wiki/" arch="noarch" license="MIT" depends="xset xprop" -makedepends= +makedepends="libxml2-utils libxslt xmlto links" install= subpackages="$pkgname-doc" -source="http://portland.freedesktop.org/download/xdg-utils-$pkgver.tgz +source="http://portland.freedesktop.org/download/xdg-utils-$pkgver.tar.gz xdg-screensaver-mv-T.patch - xfce.patch" + " _builddir="$srcdir"/$pkgname-$pkgver @@ -44,6 +44,9 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="348a5b91dc66426505022c74a64b2940 xdg-utils-1.0.2.tgz -f1e310a02e15ca38b07281465eff664e xdg-screensaver-mv-T.patch -328567c08a452bdbbedd2f1cca9ac116 xfce.patch" +md5sums="2d0aec6037769a5f138ff404b1bb4b15 xdg-utils-1.1.1.tar.gz +f6d1531f297ab159d873fc2d94226405 xdg-screensaver-mv-T.patch" +sha256sums="b0dd63a2576e0bb16f1aa78d6ddf7d6784784a098d4df17161cd6a17c7bc4125 xdg-utils-1.1.1.tar.gz +3490f1d1f5e3153cf517e1ca60cb1903a43281d7ac9734ee717e7983d37d2f63 xdg-screensaver-mv-T.patch" +sha512sums="6641b17daea7eecfee0d395e621dc42481582e505bff90a6df5eb0299ed2dca7a76520f000d9545a8424f06d41590382156a2e50f3d68d5c1ab825c268e90edb xdg-utils-1.1.1.tar.gz +db0896979fbc3b575826b4d732658564d08bcfc957b3fa1490fe02e4cc7b52adfa1e05956432a732dae8f50145e0040bc145739ba5692ae1b86fa74be8174436 xdg-screensaver-mv-T.patch" diff --git a/main/xdg-utils/xdg-screensaver-mv-T.patch b/main/xdg-utils/xdg-screensaver-mv-T.patch index 6452d6307c..9e209f77c0 100644 --- a/main/xdg-utils/xdg-screensaver-mv-T.patch +++ b/main/xdg-utils/xdg-screensaver-mv-T.patch @@ -1,10 +1,10 @@ ---- ./scripts/xdg-screensaver.orig -+++ ./scripts/xdg-screensaver -@@ -354,18 +354,10 @@ - return 0 - } +--- ./scripts/xdg-screensaver.in.orig ++++ ./scripts/xdg-screensaver.in +@@ -26,18 +26,10 @@ --# Check if we can use "mv -T" + #@xdg-utils-common@ + +-# 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" @@ -14,12 +14,12 @@ - # 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'` +- 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'` ++screensaver_file="$HOME/.xdg-screensaver-"`echo $(hostname)-$DISPLAY | sed 's/:/-/g'` lockfile_command=`which lockfile 2> /dev/null` lockfile() diff --git a/main/xdg-utils/xfce.patch b/main/xdg-utils/xfce.patch deleted file mode 100644 index 3899a99a50..0000000000 --- a/main/xdg-utils/xfce.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scripts/xdg-open b/scripts/xdg-open -index 4cc18a8..e7ed9c3 100755 ---- a/scripts/xdg-open -+++ b/scripts/xdg-open -@@ -303,7 +303,7 @@ detectDE() - { - if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; -- elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -+ elif [ -x /usr/bin/exo-open ]; then DE=xfce; - fi - } - |