xdg-utils-mimeo: Follow Arch

Although only of interest if switching between lightweight DE and KDE

3 files changed, 53 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 884361289e8b..a09baa9d4a7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Jan  1 15:19:31 UTC 2016
+# Mon Apr 18 17:18:22 UTC 2016
 pkgbase = xdg-utils-mimeo
 	pkgdesc = Command line tools that assist applications with a variety of desktop integration tasks; patched to use mimeo
 	pkgver = 1.1.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://wiki.freedesktop.org/www/Software/xdg-utils/
 	arch = any
 	license = MIT
@@ -25,9 +25,11 @@ pkgbase = xdg-utils-mimeo
 	conflicts = xdg-utils
 	source = http://portland.freedesktop.org/download/xdg-utils-1.1.1.tar.gz
 	source = http://portland.freedesktop.org/download/xdg-utils-1.1.1.tar.gz.asc
+	source = support_for_KDE_Frameworks_5.6.diff
 	source = mimeo-detection.diff
 	md5sums = 2d0aec6037769a5f138ff404b1bb4b15
 	md5sums = SKIP
+	md5sums = fc0a612362e00cc091d2c1ebbfbfc500
 	md5sums = 0783dbeb478b91bbfc467be167a7145d
 
 pkgname = xdg-utils-mimeo
diff --git a/PKGBUILD b/PKGBUILD
index 8975dec141ec..7de9a7b1c17d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=xdg-utils
 pkgname=$_pkgname-mimeo
 pkgver=1.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks; patched to use mimeo"
 arch=('any')
 url="https://wiki.freedesktop.org/www/Software/xdg-utils/"
@@ -24,15 +24,20 @@ optdepends=('kdebase-runtime: for KDE4 support in xdg-open'
 provides=($_pkgname)
 conflicts=($_pkgname)
 source=(http://portland.freedesktop.org/download/$_pkgname-$pkgver.tar.gz{,.asc}
+        support_for_KDE_Frameworks_5.6.diff
         mimeo-detection.diff)
 md5sums=('2d0aec6037769a5f138ff404b1bb4b15'
          'SKIP'
+         'fc0a612362e00cc091d2c1ebbfbfc500'
          '0783dbeb478b91bbfc467be167a7145d')
 validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pelle@pqz.se>"
 
 
 prepare() {
 	cd $_pkgname-$pkgver
+	# fix KDE support, FS#48668
+	patch -Np1 -i $srcdir/support_for_KDE_Frameworks_5.6.diff
+
 	patch -p1 -i "${srcdir}"/mimeo-detection.diff
 }
 
diff --git a/support_for_KDE_Frameworks_5.6.diff b/support_for_KDE_Frameworks_5.6.diff
new file mode 100644
index 000000000000..eee4684c17c4
--- /dev/null
+++ b/support_for_KDE_Frameworks_5.6.diff
@@ -0,0 +1,43 @@
+From 31db8136bdf61e7f9cb866f9d47c99c63343558d Mon Sep 17 00:00:00 2001
+From: Massimiliano Torromeo <massimiliano.torromeo@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
+