diff --git a/desktop/misc/xdg-utils/actions.py b/desktop/misc/xdg-utils/actions.py index 49cd44e248..b965e06b72 100644 --- a/desktop/misc/xdg-utils/actions.py +++ b/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(): diff --git a/desktop/misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch b/desktop/misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch new file mode 100644 index 0000000000..eee4684c17 --- /dev/null +++ b/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 +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 + diff --git a/desktop/misc/xdg-utils/pspec.xml b/desktop/misc/xdg-utils/pspec.xml index 3d163cbf39..0b60ce0a3c 100644 --- a/desktop/misc/xdg-utils/pspec.xml +++ b/desktop/misc/xdg-utils/pspec.xml @@ -3,7 +3,7 @@ xdg-utils - http://portland.freedesktop.org/wiki/ + https://www.freedesktop.org/wiki/Software/xdg-utils PisiLinux Community admins@pisilinux.org @@ -12,7 +12,7 @@ app:console Common desktop utilities 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. - http://source.pisilinux.org/1.0/xdg-utils.tar.xz + https://portland.freedesktop.org/download/xdg-utils-1.1.1.tar.gz xmlto docbook-xsl @@ -21,11 +21,7 @@ lynx - - enable-other-xdg.patch - xfce-detection.patch - - drop-xmlto-stuff.patch + xdg-utils-1.1.1-ktraderclient5.patch @@ -38,6 +34,13 @@ + + 2017-03-05 + 1.1.1 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2017-02-17 1.1.0_20140207