[arch-commits] Commit in xdg-utils/trunk (2 files)

[Andreas Radke]

    Date: Monday, May 8, 2017 @ 17:53:11
  Author: andyrtr
Revision: 295462

upgpkg: xdg-utils 1.1.2-1

upstream update 1.1.2

Modified:
  xdg-utils/trunk/PKGBUILD
Deleted:
  xdg-utils/trunk/support_for_KDE_Frameworks_5.6.diff

-------------------------------------+
 PKGBUILD                            |   18 ++++----------
 support_for_KDE_Frameworks_5.6.diff |   43 ----------------------------------
 2 files changed, 6 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-08 12:07:00 UTC (rev 295461)
+++ PKGBUILD	2017-05-08 17:53:11 UTC (rev 295462)
@@ -3,8 +3,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xdg-utils
-pkgver=1.1.1
-pkgrel=5
+pkgver=1.1.2
+pkgrel=1
 pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks"
 arch=('any')
 url="https://www.freedesktop.org/wiki/Software/xdg-utils/"
@@ -18,20 +18,14 @@
             'perl-file-mimeinfo: for generic support in xdg-open'
             'perl-net-dbus: Perl extension to dbus used in xdg-screensaver'
             'perl-x11-protocol: Perl X11 protocol used in xdg-screensaver')
-source=(https://portland.freedesktop.org/download/$pkgname-$pkgver.tar.gz{,.asc}
-        support_for_KDE_Frameworks_5.6.diff)
-md5sums=('2d0aec6037769a5f138ff404b1bb4b15'
-         'SKIP'
-         'fc0a612362e00cc091d2c1ebbfbfc500')
-validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pelle at pqz.se>"
+source=(https://portland.freedesktop.org/download/$pkgname-$pkgver.tar.gz) #{,.asc}
+sha1sums=('20cd4cc5cfaa904b12abf6d584deb568367f4d83')
+#validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pelle at pqz.se>"
 
 prepare() {
 	cd $pkgname-$pkgver
 	# fix wrong hardcoded chromium binary name - FS#50184
-	sed -i "s:chromium-browser:chromium:" scripts/xdg-open.in
-	
-	# fix KDE support, FS#48668
-	patch -Np1 -i $srcdir/support_for_KDE_Frameworks_5.6.diff
+#	sed -i "s:chromium-browser:chromium:" scripts/xdg-open.in
 }
 
 build() {

Deleted: support_for_KDE_Frameworks_5.6.diff
===================================================================
--- support_for_KDE_Frameworks_5.6.diff	2017-05-08 12:07:00 UTC (rev 295461)
+++ support_for_KDE_Frameworks_5.6.diff	2017-05-08 17:53:11 UTC (rev 295462)
@@ -1,43 +0,0 @@
-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
-