summarylogtreecommitdiffstats
path: root/support_for_KDE_Frameworks_5.6.diff
diff options
context:
space:
mode:
authorVyacheslav Artemiev2017-05-09 07:06:21 +0300
committerVyacheslav Artemiev2017-05-09 07:10:22 +0300
commitc6a9516f41c56189bd2194761d88a456947f6056 (patch)
treeebd088b21693abcbace144c813dc8125cb3e6a75 /support_for_KDE_Frameworks_5.6.diff
downloadaur-c6a9516f41c56189bd2194761d88a456947f6056.tar.gz
Initial commit
Diffstat (limited to 'support_for_KDE_Frameworks_5.6.diff')
-rw-r--r--support_for_KDE_Frameworks_5.6.diff43
1 files changed, 43 insertions, 0 deletions
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
+