[arch-commits] Commit in xdg-utils/trunk (2 files)
Andreas Radke
andyrtr at archlinux.org
Mon Apr 18 16:01:46 UTC 2016
Date: Monday, April 18, 2016 @ 18:01:45
Author: andyrtr
Revision: 265137
upgpkg: xdg-utils 1.1.1-2
fix kde support; FS#48668
Added:
xdg-utils/trunk/support_for_KDE_Frameworks_5.6.diff
Modified:
xdg-utils/trunk/PKGBUILD
-------------------------------------+
PKGBUILD | 14 ++++++++---
support_for_KDE_Frameworks_5.6.diff | 43 ++++++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-04-18 15:05:20 UTC (rev 265136)
+++ PKGBUILD 2016-04-18 16:01:45 UTC (rev 265137)
@@ -4,7 +4,7 @@
pkgname=xdg-utils
pkgver=1.1.1
-pkgrel=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/"
@@ -17,11 +17,19 @@
'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})
+source=(http://portland.freedesktop.org/download/$pkgname-$pkgver.tar.gz{,.asc}
+ support_for_KDE_Frameworks_5.6.diff)
md5sums=('2d0aec6037769a5f138ff404b1bb4b15'
- 'SKIP')
+ 'SKIP'
+ 'fc0a612362e00cc091d2c1ebbfbfc500')
validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pelle at 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
Added: 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:01:45 UTC (rev 265137)
@@ -0,0 +1,43 @@
+From 31db8136bdf61e7f9cb866f9d47c99c63343558d Mon Sep 17 00:00:00 2001
+From: Massimiliano Torromeo <massimiliano.torromeo at 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
+
More information about the arch-commits
mailing list