Date: Friday, May 25, 2012 @ 12:04:09
Author: andyrtr
Revision: 159503
db-move: moved xdg-utils from [testing] to [extra] (any)
Added:
xdg-utils/repos/extra-any/PKGBUILD
(from rev 159502, xdg-utils/repos/testing-any/PKGBUILD)
xdg-utils/repos/extra-any/xfce-detection.diff
(from rev 159502, xdg-utils/repos/testing-any/xfce-detection.diff)
Deleted:
xdg-utils/repos/extra-any/PKGBUILD
xdg-utils/repos/extra-any/xfce-detection.diff
xdg-utils/repos/testing-any/
---------------------+
PKGBUILD | 92 +++++++++++++++++++---------------------------
xfce-detection.diff | 98 +++++++++++++++++++++++++-------------------------
2 files changed, 87 insertions(+), 103 deletions(-)
Deleted: extra-any/PKGBUILD
===================================================================
--- extra-any/PKGBUILD 2012-05-25 16:03:35 UTC (rev 159502)
+++ extra-any/PKGBUILD 2012-05-25 16:04:09 UTC (rev 159503)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <j...@archlinux.org>
-
-pkgname=xdg-utils
-pkgver=1.1.0rc1
-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=('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}
- 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"
-}
-
-_source() {
-
- # outdated! see now http://cgit.freedesktop.org/xdg/xdg-utils/
- local _current=$(pwd)
- local _tmp=$(mktemp -d)
- cd $_tmp
-
- cvs -d:pserver:anon...@anoncvs.freedesktop.org:/cvs/portland co -d
${pkgname}-${pkgver} portland/xdg-utils
- find ${pkgname}-${pkgver} -name 'CVS' -type d -exec rm -rf {} \;
- bsdtar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}
- mv ${pkgname}-${pkgver}.tar.xz $_current
- cd $_current
- rm -rf $_tmp
-}
Copied: xdg-utils/repos/extra-any/PKGBUILD (from rev 159502,
xdg-utils/repos/testing-any/PKGBUILD)
===================================================================
--- extra-any/PKGBUILD (rev 0)
+++ extra-any/PKGBUILD 2012-05-25 16:04:09 UTC (rev 159503)
@@ -0,0 +1,38 @@
+# $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"
+}
Deleted: extra-any/xfce-detection.diff
===================================================================
--- extra-any/xfce-detection.diff 2012-05-25 16:03:35 UTC (rev 159502)
+++ extra-any/xfce-detection.diff 2012-05-25 16:04:09 UTC (rev 159503)
@@ -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 159502,
xdg-utils/repos/testing-any/xfce-detection.diff)
===================================================================
--- extra-any/xfce-detection.diff (rev 0)
+++ extra-any/xfce-detection.diff 2012-05-25 16:04:09 UTC (rev 159503)
@@ -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"
+ ;;
+
