Date: Monday, April 18, 2016 @ 18:02:12 Author: andyrtr Revision: 265138
archrelease: copy trunk to extra-any Added: xdg-utils/repos/extra-any/PKGBUILD (from rev 265137, xdg-utils/trunk/PKGBUILD) xdg-utils/repos/extra-any/support_for_KDE_Frameworks_5.6.diff (from rev 265137, xdg-utils/trunk/support_for_KDE_Frameworks_5.6.diff) Deleted: xdg-utils/repos/extra-any/PKGBUILD -------------------------------------+ PKGBUILD | 85 ++++++++++++++++++---------------- support_for_KDE_Frameworks_5.6.diff | 43 +++++++++++++++++ 2 files changed, 89 insertions(+), 39 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2016-04-18 16:01:45 UTC (rev 265137) +++ PKGBUILD 2016-04-18 16:02:12 UTC (rev 265138) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Andreas Radke <andy...@archlinux.org> -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=xdg-utils -pkgver=1.1.1 -pkgrel=1 -pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks" -arch=('any') -url="http://www.freedesktop.org/wiki/Software/xdg-utils/" -license=('MIT') -depends=('sh' 'xorg-xset') # xset needed inside xdg-screensaver -makedepends=('docbook-xsl' 'lynx' 'xmlto' 'git') -optdepends=('kdebase-runtime: for KDE4 support in xdg-open' - 'kde-cli-tools: for KDE Plasma5 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://portland.freedesktop.org/download/$pkgname-$pkgver.tar.gz{,.asc}) -md5sums=('2d0aec6037769a5f138ff404b1bb4b15' - 'SKIP') -validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pe...@pqz.se>" - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - # install empty directory to prevent xdg-desktop-menu install *.desktop to fail, see FS#33316 - install -dm755 $pkgdir/usr/share/desktop-directories -} Copied: xdg-utils/repos/extra-any/PKGBUILD (from rev 265137, xdg-utils/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2016-04-18 16:02:12 UTC (rev 265138) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=xdg-utils +pkgver=1.1.1 +pkgrel=2 +pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks" +arch=('any') +url="http://www.freedesktop.org/wiki/Software/xdg-utils/" +license=('MIT') +depends=('sh' 'xorg-xset') # xset needed inside xdg-screensaver +makedepends=('docbook-xsl' 'lynx' 'xmlto' 'git') +optdepends=('kde-cli-tools: for KDE Plasma5 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://portland.freedesktop.org/download/$pkgname-$pkgver.tar.gz{,.asc} + support_for_KDE_Frameworks_5.6.diff) +md5sums=('2d0aec6037769a5f138ff404b1bb4b15' + 'SKIP' + 'fc0a612362e00cc091d2c1ebbfbfc500') +validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pe...@pqz.se>" + +prepare() { + cd $pkgname-$pkgver + # fix KDE support, FS#48668 + patch -Np1 -i $srcdir/support_for_KDE_Frameworks_5.6.diff +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + # install empty directory to prevent xdg-desktop-menu install *.desktop to fail, see FS#33316 + install -dm755 $pkgdir/usr/share/desktop-directories +} Copied: xdg-utils/repos/extra-any/support_for_KDE_Frameworks_5.6.diff (from rev 265137, xdg-utils/trunk/support_for_KDE_Frameworks_5.6.diff) =================================================================== --- support_for_KDE_Frameworks_5.6.diff (rev 0) +++ support_for_KDE_Frameworks_5.6.diff 2016-04-18 16:02:12 UTC (rev 265138) @@ -0,0 +1,43 @@ +From 31db8136bdf61e7f9cb866f9d47c99c63343558d Mon Sep 17 00:00:00 2001 +From: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +Date: Fri, 15 Apr 2016 11:17:37 +0200 +Subject: xdg-mime: support for KDE Frameworks 5.6 + + +diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in +index 129850f..63b8a82 100644 +--- a/scripts/xdg-mime.in ++++ b/scripts/xdg-mime.in +@@ -428,13 +428,9 @@ defapp_kde() + case "${KDE_SESSION_VERSION}" in + 4) + KTRADER=`which ktraderclient 2> /dev/null` +- MIMETYPE="--mimetype" +- SERVICETYPE="--servicetype" + ;; + 5) + KTRADER=`which ktraderclient${KDE_SESSION_VERSION} 2> /dev/null` +- MIMETYPE="--mimetype" +- SERVICETYPE="--servicetype" + ;; + esac + else +@@ -442,8 +438,8 @@ defapp_kde() + fi + if [ -n "$KTRADER" ] ; then + DEBUG 1 "Running KDE trader query \"$MIME\" mimetype and \"Application\" servicetype" +- trader_result=`$KTRADER $MIMETYPE "$MIME" $SERVICETYPE Application 2>/dev/null \ +- | grep DesktopEntryPath | head -n 1 | cut -d ':' -f 2 | cut -d \' -f 2` ++ trader_result=`$KTRADER --mimetype "$MIME" --servicetype Application 2>/dev/null \ ++ | grep -E "^DesktopEntryPath : |\.desktop$" | head -n1 | sed "s/^DesktopEntryPath : '\(.*\.desktop\)'\$/\1/"` + if [ -n "$trader_result" ] ; then + basename "$trader_result" + exit_success +@@ -954,4 +950,3 @@ esac + update_mime_database $xdg_base_dir + + exit_success +- +-- +cgit v0.10.2 +