Merge pull request #3109 from ertugerata/master

xdg-utils update

desktop/misc/xdg-utils/actions.py

@@ -9,7 +9,7 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 
 def setup():
-    autotools.autoreconf("-vif")
+    #autotools.autoreconf("-vif")
     autotools.configure()
 
 def build():

desktop/misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch

@@ -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
+

desktop/misc/xdg-utils/pspec.xml

@@ -3,7 +3,7 @@
 <PISI>
     <Source>
         <Name>xdg-utils</Name>
-        <Homepage>http://portland.freedesktop.org/wiki/</Homepage>
+        <Homepage>https://www.freedesktop.org/wiki/Software/xdg-utils</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -12,7 +12,7 @@
         <IsA>app:console</IsA>
         <Summary>Common desktop utilities</Summary>
         <Description>Xdg-utils is a set of command line tools that assist applications with a variety of desktop integration tasks. About half of the tools focus on tasks commonly required during the installation of a desktop application and the other half focuses on integration with the desktop environment while the application is running.</Description>
-        <Archive sha1sum="c72dde66a056aebcc376aae3be6f91e8d76ae2b5" type="tarxz">http://source.pisilinux.org/1.0/xdg-utils.tar.xz</Archive>
+        <Archive sha1sum="0f046491a4f43475f6371f3fb345cb26cedb5114" type="targz">https://portland.freedesktop.org/download/xdg-utils-1.1.1.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>xmlto</Dependency>
             <Dependency>docbook-xsl</Dependency>
@@ -21,11 +21,7 @@
             <Dependency>lynx</Dependency>
         </BuildDependencies>        
         <Patches>
-<!--             <Patch level="1">gksu.patch</Patch> -->
+            <Patch level="1">xdg-utils-1.1.1-ktraderclient5.patch</Patch>
-            <Patch level="1">enable-other-xdg.patch</Patch>
-            <Patch level="0">xfce-detection.patch</Patch>
-            <!--<Patch level="1">fix-terminal-detection.patch</Patch>--> <!--Fixed-->
-            <Patch level="1">drop-xmlto-stuff.patch</Patch>
         </Patches>
     </Source>
 
@@ -38,6 +34,13 @@
     </Package>
 
     <History>
+        <Update release="4">
+            <Date>2017-03-05</Date>
+            <Version>1.1.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="3">
             <Date>2017-02-17</Date>
             <Version>1.1.0_20140207</Version>