xdg-utils-mimeo: follow the repo package

3 files changed, 24 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6672caea87cf..f8e1dedb9960 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.3+21+g1a58bc2
-	pkgrel = 2
+	pkgver = 1.1.3+25+g8ae0263
+	pkgrel = 1
 	url = https://www.freedesktop.org/wiki/Software/xdg-utils/
 	arch = any
 	license = MIT
@@ -10,7 +10,6 @@ pkgbase = xdg-utils-mimeo
 	makedepends = xmlto
 	makedepends = git
 	depends = sh
-	depends = which
 	depends = file
 	depends = xorg-xset
 	depends = xorg-xprop
@@ -24,9 +23,9 @@ pkgbase = xdg-utils-mimeo
 	provides = xdg-utils
 	conflicts = xdg-utils
 	source = mimeo-detection.patch
-	source = git+https://gitlab.freedesktop.org/xdg/xdg-utils.git#commit=1a58bc28f6844898532daf9ee1bf6da7764955a9
+	source = git+https://gitlab.freedesktop.org/xdg/xdg-utils.git#commit=8ae02631a9806da11b34cd6b274af02d28aee5da
 	source = egrep_is_obsolete.patch::https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/21.patch
-	sha256sums = e5a69feba0e2ded0071118034d19309adc99321ab880a4ac5be64a1e9a506aa0
+	sha256sums = 5847f891996120270c25c45821b7a6f386b601b67f1ac9e4a2848b04b220a928
 	sha256sums = SKIP
 	sha256sums = 550a8db792bb810168583be02e0c9e665a7a6ce245b48424188be235e35d4799
 
diff --git a/PKGBUILD b/PKGBUILD
index 28c9da2180ab..9d2692ae77ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,14 +7,14 @@
 _pkgname=xdg-utils
 pkgname=$_pkgname-mimeo
 # https://gitlab.freedesktop.org/xdg/xdg-utils/commits/master
-_commit=1a58bc28f6844898532daf9ee1bf6da7764955a9 # master # 2021-08-05
-pkgver=1.1.3+21+g1a58bc2
-pkgrel=2
+_commit=8ae02631a9806da11b34cd6b274af02d28aee5da # master # 2022-11-06
+pkgver=1.1.3+25+g8ae0263
+pkgrel=1
 pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks; patched to use mimeo"
 arch=('any')
 url="https://www.freedesktop.org/wiki/Software/xdg-utils/"
 license=('MIT')
-depends=('sh' 'which' 'file' 'xorg-xset' 'xorg-xprop') # xset + xprop needed inside xdg-screensaver
+depends=('sh' 'file' 'xorg-xset' 'xorg-xprop') # xset + xprop needed inside xdg-screensaver
 makedepends=('docbook-xsl' 'lynx' 'xmlto' 'git')
 optdepends=('kde-cli-tools: for KDE Plasma5 support in xdg-open'
             'exo: for Xfce support in xdg-open'
@@ -29,7 +29,7 @@ source=(#https://portland.freedesktop.org/download/$_pkgname-$pkgver.tar.gz #{,.
         mimeo-detection.patch
         "git+https://gitlab.freedesktop.org/xdg/xdg-utils.git#commit=$_commit"
         egrep_is_obsolete.patch::https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/21.patch)
-sha256sums=('e5a69feba0e2ded0071118034d19309adc99321ab880a4ac5be64a1e9a506aa0'
+sha256sums=('5847f891996120270c25c45821b7a6f386b601b67f1ac9e4a2848b04b220a928'
             'SKIP'
             '550a8db792bb810168583be02e0c9e665a7a6ce245b48424188be235e35d4799')
 #validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pelle@pqz.se>"
diff --git a/mimeo-detection.patch b/mimeo-detection.patch
index 40fbdf3ad619..c919d2f45c66 100644
--- a/mimeo-detection.patch
+++ b/mimeo-detection.patch
@@ -1,14 +1,14 @@
-commit 14a285fc21110e35d55ec96e77562b3a0f5983e3
+commit a4c2cea028a5de15ef32ba9cdc986f0e032b097c
 Author: Narrat <autumn-wind@web.de>
-Date:   Sun Apr 19 23:49:50 2020 +0200
+Date:   Wed Nov 9 23:35:36 2022 +0100
 
     Add support for mimeo
 
 diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in
-index 6db58ad..70b539a 100644
+index dfb4b83..3f04b2a 100644
 --- a/scripts/xdg-email.in
 +++ b/scripts/xdg-email.in
-@@ -234,6 +234,18 @@ open_flatpak()
+@@ -237,6 +237,18 @@ open_flatpak()
      fi
  }
  
@@ -27,7 +27,7 @@ index 6db58ad..70b539a 100644
  open_generic()
  {
      local client
-@@ -484,6 +496,10 @@ case "$DE" in
+@@ -487,6 +499,10 @@ case "$DE" in
      open_flatpak "$url"
      ;;
  
@@ -39,7 +39,7 @@ index 6db58ad..70b539a 100644
      open_generic "${mailto}"
      ;;
 diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
-index 034d0ef..88c0ae3 100644
+index d194b0e..efbc9a8 100644
 --- a/scripts/xdg-mime.in
 +++ b/scripts/xdg-mime.in
 @@ -95,6 +95,16 @@ info_gnome()
@@ -71,7 +71,7 @@ index 034d0ef..88c0ae3 100644
          info_generic "$filename"
          ;;
 diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
-index 202f3e3..804d486 100644
+index 50e31e6..3ee2a96 100644
 --- a/scripts/xdg-open.in
 +++ b/scripts/xdg-open.in
 @@ -262,6 +262,17 @@ open_flatpak()
@@ -92,7 +92,7 @@ index 202f3e3..804d486 100644
  #-----------------------------------------
  # Recursively search .desktop file
  
-@@ -569,6 +580,10 @@ case "$DE" in
+@@ -568,6 +579,10 @@ case "$DE" in
      open_flatpak "$url"
      ;;
  
@@ -104,7 +104,7 @@ index 202f3e3..804d486 100644
      open_generic "$url"
      ;;
 diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in
-index 95f707e..9c2f511 100644
+index c768f91..2a14cbe 100644
 --- a/scripts/xdg-screensaver.in
 +++ b/scripts/xdg-screensaver.in
 @@ -118,7 +118,7 @@ perform_action()
@@ -117,10 +117,10 @@ index 95f707e..9c2f511 100644
        ;;
    esac
 diff --git a/scripts/xdg-settings.in b/scripts/xdg-settings.in
-index 3781de8..39734b1 100644
+index ab18d3a..5c22d5f 100755
 --- a/scripts/xdg-settings.in
 +++ b/scripts/xdg-settings.in
-@@ -471,6 +471,44 @@ set_browser_xfce()
+@@ -483,6 +483,44 @@ set_browser_xfce()
  }
  
  # }}} xfce
@@ -165,7 +165,7 @@ index 3781de8..39734b1 100644
  # {{{ generic
  
  get_browser_generic()
-@@ -713,6 +751,24 @@ set_url_scheme_handler_xfce()
+@@ -725,6 +763,24 @@ set_url_scheme_handler_xfce()
  }
  
  # }}} xfce
@@ -190,7 +190,7 @@ index 3781de8..39734b1 100644
  # {{{ generic
  
  get_url_scheme_handler_generic()
-@@ -867,6 +923,10 @@ case "$DE" in
+@@ -879,6 +935,10 @@ case "$DE" in
      dispatch_specific xfce "$@"
      ;;
  
@@ -202,7 +202,7 @@ index 3781de8..39734b1 100644
      dispatch_specific generic "$@"
      ;;
 diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in
-index b4333e2..10b3ebf 100644
+index 0147527..3d1ddd4 100644
 --- a/scripts/xdg-utils-common.in
 +++ b/scripts/xdg-utils-common.in
 @@ -303,6 +303,9 @@ detectDE()
@@ -219,7 +219,7 @@ index b4333e2..10b3ebf 100644
        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;
++      elif command -v mimeo >/dev/null; then DE=mimeo;
        fi
      fi