Date: Monday, May 28, 2012 @ 10:14:28 Author: andyrtr Revision: 160047
archrelease: copy trunk to extra-any Added: xdg-utils/repos/extra-any/PKGBUILD (from rev 160046, xdg-utils/trunk/PKGBUILD) xdg-utils/repos/extra-any/xfce-detection.diff (from rev 160046, xdg-utils/trunk/xfce-detection.diff) Deleted: xdg-utils/repos/extra-any/PKGBUILD xdg-utils/repos/extra-any/xfce-detection.diff ---------------------+ PKGBUILD | 74 ++++++++++++++++++------------------- xfce-detection.diff | 98 +++++++++++++++++++++++++------------------------- 2 files changed, 85 insertions(+), 87 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2012-05-28 14:13:54 UTC (rev 160046) +++ PKGBUILD 2012-05-28 14:14:28 UTC (rev 160047) @@ -1,38 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=xdg-utils -pkgver=1.1.0 -_gitdate=20120520 -pkgrel=0.${_gitdate} -pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks" -arch=('any') -url="http://portland.freedesktop.org/" -license=('MIT') -depends=('sh' 'xorg-xset') # xset needed inside xdg-screensaver -makedepends=('docbook-xsl' 'lynx' 'xmlto') -optdepends=('kdebase-runtime: for KDE support in xdg-open' - 'libgnome: for GNOME support in xdg-open' - 'exo: for Xfce support in xdg-open' - 'xorg-xprop: for Xfce support in xdg-open' - 'pcmanfm: for LXDE support in xdg-open' - 'perl-file-mimeinfo: for generic support in xdg-open') -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.${_gitdate}.tar.gz # last git commit 2012-03-10 13:55:24 (GMT) allow DESKTOP_SESSION='Xfce Session' to match xfce - xfce-detection.diff) -md5sums=('4e37d65322dbc4763e85b8ba461f919b' - '061c85755b9f3ca8a8cc847518b6be3d') - -build() { - cd ${srcdir}/${pkgname}-5be359a49d4d8dc3c5f814ab89b8422ad522d837 - # disable patch for now, the grep upstream issue is solved as fixed and lots of xfce related commits should have fixed this - #patch -p0 -i "${srcdir}"/xfce-detection.diff - ./configure --prefix=/usr --mandir=/usr/share/man - make -C scripts - make -} - -package() { - cd ${srcdir}/${pkgname}-5be359a49d4d8dc3c5f814ab89b8422ad522d837 - make DESTDIR="${pkgdir}" install - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: xdg-utils/repos/extra-any/PKGBUILD (from rev 160046, xdg-utils/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2012-05-28 14:14:28 UTC (rev 160047) @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=xdg-utils +pkgver=1.1.0 +_gitdate=20120520 +pkgrel=2.${_gitdate} +pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks" +arch=('any') +url="http://portland.freedesktop.org/" +license=('MIT') +depends=('sh' 'xorg-xset') # xset needed inside xdg-screensaver +makedepends=('docbook-xsl' 'lynx' 'xmlto') +optdepends=('kdebase-runtime: for KDE support in xdg-open' + 'libgnome: for GNOME support in xdg-open' + 'exo: for Xfce support in xdg-open' + 'xorg-xprop: for Xfce support in xdg-open' + 'pcmanfm: for LXDE support in xdg-open' + 'perl-file-mimeinfo: for generic support in xdg-open') +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.${_gitdate}.tar.gz # last git commit 2012-03-10 13:55:24 (GMT) allow DESKTOP_SESSION='Xfce Session' to match xfce +) +md5sums=('4e37d65322dbc4763e85b8ba461f919b') + +build() { + cd ${srcdir}/${pkgname}-5be359a49d4d8dc3c5f814ab89b8422ad522d837 + ./configure --prefix=/usr --mandir=/usr/share/man + make scripts-clean -C scripts # needed if it's a git snapshot + make man scripts -C scripts # needed if it's a git snapshot +# make # for release builds +} + +package() { + cd ${srcdir}/${pkgname}-5be359a49d4d8dc3c5f814ab89b8422ad522d837 + make DESTDIR="${pkgdir}" install + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: xfce-detection.diff =================================================================== --- xfce-detection.diff 2012-05-28 14:13:54 UTC (rev 160046) +++ xfce-detection.diff 2012-05-28 14:14:28 UTC (rev 160047) @@ -1,49 +0,0 @@ ---- scripts/xdg-open 2011-01-01 05:03:14.000000000 -0500 -+++ scripts/xdg-open.new 2011-06-19 00:43:13.000000000 -0400 -@@ -303,12 +303,35 @@ - - detectDE() - { -+ # see https://bugs.freedesktop.org/show_bug.cgi?id=34164 -+ unset GREP_OPTIONS -+ - if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; - elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -- elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; -- else DE="" -+ elif xprop -root 2> /dev/null | grep -i '^xfce_desktop_window' >/dev/null 2>&1; then DE=xfce -+ fi -+ -+ if [ x"$DE" = x"" ]; then -+ # fallback to checking $DESKTOP_SESSION -+ case "$DESKTOP_SESSION" in -+ gnome) -+ DE=gnome; -+ ;; -+ LXDE) -+ DE=lxde; -+ ;; -+ xfce|xfce4) -+ DE=xfce; -+ ;; -+ esac -+ fi -+ -+ if [ x"$DE" = x"gnome" ]; then -+ # gnome-default-applications-properties is only available in GNOME 2.x -+ # but not in GNOME 3.x -+ which gnome-default-applications-properties > /dev/null 2>&1 || DE="gnome3" - fi - } - -@@ -535,7 +558,7 @@ - open_kde "$url" - ;; - -- gnome) -+ gnome*) - open_gnome "$url" - ;; - Copied: xdg-utils/repos/extra-any/xfce-detection.diff (from rev 160046, xdg-utils/trunk/xfce-detection.diff) =================================================================== --- xfce-detection.diff (rev 0) +++ xfce-detection.diff 2012-05-28 14:14:28 UTC (rev 160047) @@ -0,0 +1,49 @@ +--- scripts/xdg-open 2011-01-01 05:03:14.000000000 -0500 ++++ scripts/xdg-open.new 2011-06-19 00:43:13.000000000 -0400 +@@ -303,12 +303,35 @@ + + detectDE() + { ++ # see https://bugs.freedesktop.org/show_bug.cgi?id=34164 ++ unset GREP_OPTIONS ++ + if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde; + elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; + elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; + elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; +- elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; +- else DE="" ++ elif xprop -root 2> /dev/null | grep -i '^xfce_desktop_window' >/dev/null 2>&1; then DE=xfce ++ fi ++ ++ if [ x"$DE" = x"" ]; then ++ # fallback to checking $DESKTOP_SESSION ++ case "$DESKTOP_SESSION" in ++ gnome) ++ DE=gnome; ++ ;; ++ LXDE) ++ DE=lxde; ++ ;; ++ xfce|xfce4) ++ DE=xfce; ++ ;; ++ esac ++ fi ++ ++ if [ x"$DE" = x"gnome" ]; then ++ # gnome-default-applications-properties is only available in GNOME 2.x ++ # but not in GNOME 3.x ++ which gnome-default-applications-properties > /dev/null 2>&1 || DE="gnome3" + fi + } + +@@ -535,7 +558,7 @@ + open_kde "$url" + ;; + +- gnome) ++ gnome*) + open_gnome "$url" + ;; +