[arch-commits] Commit in xdg-utils/repos (4 files)

[andyrtr at archlinux.org]

    Date: Saturday, October 20, 2012 @ 05:40:15
  Author: andyrtr
Revision: 169392

db-move: moved xdg-utils from [testing] to [extra] (any)

Added:
  xdg-utils/repos/extra-any/PKGBUILD
    (from rev 169391, xdg-utils/repos/testing-any/PKGBUILD)
Deleted:
  xdg-utils/repos/extra-any/PKGBUILD
  xdg-utils/repos/extra-any/xfce-detection.diff
  xdg-utils/repos/testing-any/

---------------------+
 PKGBUILD            |   73 +++++++++++++++++++++++++-------------------------
 xfce-detection.diff |   49 ---------------------------------
 2 files changed, 37 insertions(+), 85 deletions(-)

Deleted: extra-any/PKGBUILD
===================================================================
--- extra-any/PKGBUILD	2012-10-20 09:37:53 UTC (rev 169391)
+++ extra-any/PKGBUILD	2012-10-20 09:40:15 UTC (rev 169392)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at 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"
-}

Copied: xdg-utils/repos/extra-any/PKGBUILD (from rev 169391, xdg-utils/repos/testing-any/PKGBUILD)
===================================================================
--- extra-any/PKGBUILD	                        (rev 0)
+++ extra-any/PKGBUILD	2012-10-20 09:40:15 UTC (rev 169392)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xdg-utils
+_oldver=1.1.0
+_gitver=050333e34e2fe7430ad2ead37e5a0420ac0c2a3e # xdg-mime does not search mimeinfo.cache
+_gitdate=20121008
+pkgver=${_oldver}.git${_gitdate}
+pkgrel=1
+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=(http://cgit.freedesktop.org/xdg/xdg-utils/snapshot/xdg-utils-${_gitver}.tar.gz)
+md5sums=('a590889b5bbfd0c42976004bdc2eb83b')
+
+build() {
+	cd ${srcdir}/${pkgname}-${_gitver}
+	./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}-${_gitver}
+	make DESTDIR="${pkgdir}" install
+	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Deleted: extra-any/xfce-detection.diff
===================================================================
--- extra-any/xfce-detection.diff	2012-10-20 09:37:53 UTC (rev 169391)
+++ extra-any/xfce-detection.diff	2012-10-20 09:40:15 UTC (rev 169392)
@@ -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"
-     ;;
-