xdg-utils-mimeo: Update to 1.1.2

Remove obsolete stuff from prepare.

Of note is, this release isn't signed yet.

Upstream provided checksums:
md5sum: 361e75eb76c94d19f6f4f330d8ee626b  xdg-utils-1.1.2.tar.gz
sha1sum: 20cd4cc5cfaa904b12abf6d584deb568367f4d83  xdg-utils-1.1.2.tar.gz

3 files changed, 34 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f0f60d9377ca..113df04d30ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 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 = 5
+	pkgver = 1.1.2
+	pkgrel = 1
 	url = https://wiki.freedesktop.org/www/Software/xdg-utils/
 	arch = any
 	license = MIT
@@ -21,15 +21,10 @@ pkgbase = xdg-utils-mimeo
 	optdepends = perl-x11-protocol: Perl X11 protocol used in xdg-screensaver
 	provides = xdg-utils
 	conflicts = xdg-utils
-	source = https://portland.freedesktop.org/download/xdg-utils-1.1.1.tar.gz
-	source = https://portland.freedesktop.org/download/xdg-utils-1.1.1.tar.gz.asc
-	source = support_for_KDE_Frameworks_5.6.diff
+	source = https://portland.freedesktop.org/download/xdg-utils-1.1.2.tar.gz
 	source = mimeo-detection.patch
-	validpgpkeys = 8B75CA7811367175D05F3B03C43570F80CC295E6
-	md5sums = 2d0aec6037769a5f138ff404b1bb4b15
-	md5sums = SKIP
-	md5sums = fc0a612362e00cc091d2c1ebbfbfc500
-	md5sums = 0783dbeb478b91bbfc467be167a7145d
+	md5sums = 361e75eb76c94d19f6f4f330d8ee626b
+	md5sums = 81b8920bf164863ddeb6ac999cd0d046
 
 pkgname = xdg-utils-mimeo
 
diff --git a/PKGBUILD b/PKGBUILD
index 2c26421691e0..85ec2b891577 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 _pkgname=xdg-utils
 pkgname=$_pkgname-mimeo
-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; patched to use mimeo"
 arch=('any')
 url="https://wiki.freedesktop.org/www/Software/xdg-utils/"
@@ -23,23 +23,15 @@ optdepends=('kde-cli-tools: for KDE Plasma5 support in xdg-open'
             'perl-x11-protocol: Perl X11 protocol used in xdg-screensaver')
 provides=($_pkgname)
 conflicts=($_pkgname)
-source=(https://portland.freedesktop.org/download/$_pkgname-$pkgver.tar.gz{,.asc}
-        support_for_KDE_Frameworks_5.6.diff
+source=(https://portland.freedesktop.org/download/$_pkgname-$pkgver.tar.gz #{,.asc}
         mimeo-detection.patch)
-md5sums=('2d0aec6037769a5f138ff404b1bb4b15'
-         'SKIP'
-         'fc0a612362e00cc091d2c1ebbfbfc500'
-         '0783dbeb478b91bbfc467be167a7145d')
-validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pelle@pqz.se>"
+md5sums=('361e75eb76c94d19f6f4f330d8ee626b'
+         '81b8920bf164863ddeb6ac999cd0d046')
+#validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pelle@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
 
 	patch -p1 -i "${srcdir}"/mimeo-detection.diff
 }
diff --git a/mimeo-detection.patch b/mimeo-detection.patch
index e28efa472396..b0a16c310143 100644
--- a/mimeo-detection.patch
+++ b/mimeo-detection.patch
@@ -1,15 +1,15 @@
-commit 4e5075542e5247c14c329821d011a711982479b2
-Author: Narrat
-Date:   Thu Oct 8 02:45:32 2015 +0200
+commit 9535ad85e547f437e1fc2ff7ee68a859c144e38d
+Author: Narrat <autumn-wind@web.de>
+Date:   Mon May 8 21:12:37 2017 +0200
 
     Add support for mimeo
 
 diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in
-index 2819e28..d95e938 100644
+index 3614776..046bd39 100644
 --- a/scripts/xdg-email.in
 +++ b/scripts/xdg-email.in
-@@ -213,6 +213,18 @@ open_envvar()
-     exit_failure_operation_failed
+@@ -234,6 +234,18 @@ open_flatpak()
+     fi
  }
  
 +open_mimeo()
@@ -27,22 +27,22 @@ index 2819e28..d95e938 100644
  open_generic()
  {
      local client
-@@ -459,6 +471,10 @@ case "$DE" in
-     open_xfce "${mailto}"
+@@ -484,6 +496,10 @@ case "$DE" in
+     open_flatpak "$url"
      ;;
  
 +    mimeo)
 +    open_mimeo "${mailto}"
 +    ;;
 +
-     generic)
+     generic|lxqt|enlightenment)
      open_generic "${mailto}"
      ;;
 diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
-index 074256c..da57bb0 100644
+index b67581c..04aa038 100644
 --- a/scripts/xdg-mime.in
 +++ b/scripts/xdg-mime.in
-@@ -90,6 +90,16 @@ info_gnome()
+@@ -93,6 +93,16 @@ info_gnome()
      fi
  }
  
@@ -59,7 +59,7 @@ index 074256c..da57bb0 100644
  info_generic()
  {
      if mimetype --version >/dev/null 2>&1; then
-@@ -590,6 +600,10 @@ if [ "$action" = "info" ]; then
+@@ -598,6 +608,10 @@ if [ "$action" = "info" ]; then
          info_gnome "$filename"
          ;;
  
@@ -71,10 +71,10 @@ index 074256c..da57bb0 100644
          info_generic "$filename"
          ;;
 diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
-index 0fbd63d..1ed4385 100644
+index 9817c5f..6c95a11 100644
 --- a/scripts/xdg-open.in
 +++ b/scripts/xdg-open.in
-@@ -211,6 +211,17 @@ open_enlightenment()
+@@ -246,6 +246,17 @@ open_flatpak()
      fi
  }
  
@@ -92,8 +92,8 @@ index 0fbd63d..1ed4385 100644
  #-----------------------------------------
  # Recursively search .desktop file
  
-@@ -492,6 +503,10 @@ case "$DE" in
-     open_darwin "$url"
+@@ -531,6 +542,10 @@ case "$DE" in
+     open_flatpak "$url"
      ;;
  
 +    mimeo)
@@ -104,10 +104,10 @@ index 0fbd63d..1ed4385 100644
      open_generic "$url"
      ;;
 diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in
-index 1dd7bf7..96c1e3d 100644
+index aecd8e3..c22909d 100644
 --- a/scripts/xdg-screensaver.in
 +++ b/scripts/xdg-screensaver.in
-@@ -114,7 +114,7 @@ perform_action()
+@@ -118,7 +118,7 @@ perform_action()
        [ -n "$DISPLAY" ] && screensaver_xserver "$1"
        ;;
  
@@ -117,7 +117,7 @@ index 1dd7bf7..96c1e3d 100644
        ;;
    esac
 diff --git a/scripts/xdg-settings.in b/scripts/xdg-settings.in
-index 3d03507..7585d1c 100644
+index b65e659..304bd94 100644
 --- a/scripts/xdg-settings.in
 +++ b/scripts/xdg-settings.in
 @@ -463,6 +463,42 @@ set_browser_xfce()
@@ -196,17 +196,17 @@ index 3d03507..7585d1c 100644
 +    dispatch_specific mimeo "$@"
 +    ;;
 +
-     generic)
+     generic|lxqt|enlightenment)
      dispatch_specific generic "$@"
      ;;
 diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in
-index f920799..1ac95bc 100644
+index 8b85883..817effe 100644
 --- a/scripts/xdg-utils-common.in
 +++ b/scripts/xdg-utils-common.in
-@@ -294,6 +294,7 @@ detectDE()
-       elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
+@@ -316,6 +316,7 @@ detectDE()
        elif xprop -root 2> /dev/null | grep -i '^xfce_desktop_window' >/dev/null 2>&1; then DE=xfce
        elif echo $DESKTOP | grep -q '^Enlightenment'; then DE=enlightenment;
+       elif [ x"$LXQT_SESSION_CONFIG" != x"" ]; then DE=lxqt;
 +      elif which mimeo > /dev/null; then DE=mimeo;
        fi
      fi