[arch-commits] Commit in xdg-utils/trunk (PKGBUILD xfce-detection.diff)
Eric Bélanger
eric at archlinux.org
Sun Jun 19 04:59:11 UTC 2011
Date: Sunday, June 19, 2011 @ 00:59:10
Author: eric
Revision: 127870
upgpkg: xdg-utils 1.1.0rc1-3
Added patch from git to fix Xfce detection (close FS#22848), Added optdepends for xdg-open backend (close FS#20741), Fixed license
Added:
xdg-utils/trunk/xfce-detection.diff
Modified:
xdg-utils/trunk/PKGBUILD
---------------------+
PKGBUILD | 34 +++++++++++++++++++++-------------
xfce-detection.diff | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 70 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-06-19 00:11:41 UTC (rev 127869)
+++ PKGBUILD 2011-06-19 04:59:10 UTC (rev 127870)
@@ -3,31 +3,39 @@
pkgname=xdg-utils
pkgver=1.1.0rc1
-pkgrel=2
-pkgdesc='Command line tools that assist applications with a variety of desktop integration tasks.'
+pkgrel=3
+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')
makedepends=('docbook-xsl' 'lynx' 'xmlto')
-optdepends=('xorg-utils: needed if using Xfce')
-license=('custom')
-source=( #"ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz"
- http://portland.freedesktop.org/download/${pkgname}-${pkgver/rc1/-rc1}.tar.gz)
-md5sums=('fadf5e7a08e0526fc60dbe3e5b7ef8d6')
+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}.tar.xz"
+ http://portland.freedesktop.org/download/${pkgname}-${pkgver/rc1/-rc1}.tar.gz \
+ xfce-detection.diff)
+md5sums=('fadf5e7a08e0526fc60dbe3e5b7ef8d6'
+ '061c85755b9f3ca8a8cc847518b6be3d')
build() {
- #cd ${srcdir}/${pkgname}-${pkgver}
- cd ${srcdir}/${pkgname}-${pkgver/rc1/-rc1}
+ #cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}"/${pkgname}-${pkgver/rc1/-rc1}
+ patch -p0 -i "${srcdir}"/xfce-detection.diff
./configure --prefix=/usr --mandir=/usr/share/man
make -C scripts
make
}
package() {
- #cd ${srcdir}/${pkgname}-${pkgver}
- cd ${srcdir}/${pkgname}-${pkgver/rc1/-rc1}
- make DESTDIR=${pkgdir} install
- install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ #cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}"/${pkgname}-${pkgver/rc1/-rc1}
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
_source() {
Added: xfce-detection.diff
===================================================================
--- xfce-detection.diff (rev 0)
+++ xfce-detection.diff 2011-06-19 04:59:10 UTC (rev 127870)
@@ -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"
+ ;;
+
More information about the arch-commits
mailing list