xdg-utils-mimeo: Follow Arch

upstream had some commits

3 files changed, 27 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f8e1dedb9960..928fc9028c1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 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+25+g8ae0263
+	pkgver = 1.1.3+45+g301a1a4
 	pkgrel = 1
 	url = https://www.freedesktop.org/wiki/Software/xdg-utils/
 	arch = any
@@ -23,10 +23,8 @@ 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=8ae02631a9806da11b34cd6b274af02d28aee5da
-	source = egrep_is_obsolete.patch::https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/21.patch
-	sha256sums = 5847f891996120270c25c45821b7a6f386b601b67f1ac9e4a2848b04b220a928
+	source = git+https://gitlab.freedesktop.org/xdg/xdg-utils.git#commit=301a1a4772f1f934a22e106ff032c62ef705462b
+	sha256sums = 5136fb46afe96d994bd8e3183dcafbeb9bebcbedcb1ac1fe8411a76437479cb7
 	sha256sums = SKIP
-	sha256sums = 550a8db792bb810168583be02e0c9e665a7a6ce245b48424188be235e35d4799
 
 pkgname = xdg-utils-mimeo
diff --git a/PKGBUILD b/PKGBUILD
index 9d2692ae77ea..7de7ccdac464 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 _pkgname=xdg-utils
 pkgname=$_pkgname-mimeo
 # https://gitlab.freedesktop.org/xdg/xdg-utils/commits/master
-_commit=8ae02631a9806da11b34cd6b274af02d28aee5da # master # 2022-11-06
-pkgver=1.1.3+25+g8ae0263
+_commit=301a1a4772f1f934a22e106ff032c62ef705462b # master # 2023-08-14
+pkgver=1.1.3+45+g301a1a4
 pkgrel=1
 pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks; patched to use mimeo"
 arch=('any')
@@ -27,11 +27,9 @@ provides=($_pkgname)
 conflicts=($_pkgname)
 source=(#https://portland.freedesktop.org/download/$_pkgname-$pkgver.tar.gz #{,.asc}
         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=('5847f891996120270c25c45821b7a6f386b601b67f1ac9e4a2848b04b220a928'
-            'SKIP'
-            '550a8db792bb810168583be02e0c9e665a7a6ce245b48424188be235e35d4799')
+        "git+https://gitlab.freedesktop.org/xdg/xdg-utils.git#commit=$_commit")
+sha256sums=('5136fb46afe96d994bd8e3183dcafbeb9bebcbedcb1ac1fe8411a76437479cb7'
+            'SKIP')
 #validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pelle@pqz.se>"
 
 pkgver() {
@@ -42,9 +40,6 @@ pkgver() {
 prepare() {
   cd $_pkgname #-$pkgver
 
-  # switch from non-standard "egrep" to POSIX "grep -E"
-  patch -Np1 -i ../egrep_is_obsolete.patch
-
   patch -p1 -i "${srcdir}"/mimeo-detection.patch
 }
 
diff --git a/mimeo-detection.patch b/mimeo-detection.patch
index c919d2f45c66..e5123dc74e11 100644
--- a/mimeo-detection.patch
+++ b/mimeo-detection.patch
@@ -1,14 +1,14 @@
-commit a4c2cea028a5de15ef32ba9cdc986f0e032b097c
+commit c2f7c0257a1fdaba9ffd117b57d71d279243f0ce
 Author: Narrat <autumn-wind@web.de>
 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 dfb4b83..3f04b2a 100644
+index 6135b24..66ba94d 100644
 --- a/scripts/xdg-email.in
 +++ b/scripts/xdg-email.in
-@@ -237,6 +237,18 @@ open_flatpak()
+@@ -235,6 +235,18 @@ open_flatpak()
      fi
  }
  
@@ -27,8 +27,8 @@ index dfb4b83..3f04b2a 100644
  open_generic()
  {
      local client
-@@ -487,6 +499,10 @@ case "$DE" in
-     open_flatpak "$url"
+@@ -460,6 +472,10 @@ case "$DE" in
+     open_flatpak "${mailto}"
      ;;
  
 +    mimeo)
@@ -39,10 +39,10 @@ index dfb4b83..3f04b2a 100644
      open_generic "${mailto}"
      ;;
 diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
-index d194b0e..efbc9a8 100644
+index 97e7368..44721aa 100644
 --- a/scripts/xdg-mime.in
 +++ b/scripts/xdg-mime.in
-@@ -95,6 +95,16 @@ info_gnome()
+@@ -99,6 +99,16 @@ info_gnome()
      fi
  }
  
@@ -59,7 +59,7 @@ index d194b0e..efbc9a8 100644
  info_generic()
  {
      if mimetype --version >/dev/null 2>&1; then
-@@ -600,6 +610,10 @@ if [ "$action" = "info" ]; then
+@@ -609,6 +619,10 @@ if [ "$action" = "info" ]; then
          info_gnome "$filename"
          ;;
  
@@ -71,10 +71,10 @@ index d194b0e..efbc9a8 100644
          info_generic "$filename"
          ;;
 diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
-index 50e31e6..3ee2a96 100644
+index 1f925da..9f302ab 100755
 --- a/scripts/xdg-open.in
 +++ b/scripts/xdg-open.in
-@@ -262,6 +262,17 @@ open_flatpak()
+@@ -297,6 +297,17 @@ open_flatpak()
      fi
  }
  
@@ -92,8 +92,8 @@ index 50e31e6..3ee2a96 100644
  #-----------------------------------------
  # Recursively search .desktop file
  
-@@ -568,6 +579,10 @@ case "$DE" in
-     open_flatpak "$url"
+@@ -619,6 +630,10 @@ case "$DE" in
+     open_wsl "$url"
      ;;
  
 +    mimeo)
@@ -104,10 +104,10 @@ index 50e31e6..3ee2a96 100644
      open_generic "$url"
      ;;
 diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in
-index c768f91..2a14cbe 100644
+index eb1b698..1dd6f07 100644
 --- a/scripts/xdg-screensaver.in
 +++ b/scripts/xdg-screensaver.in
-@@ -118,7 +118,7 @@ perform_action()
+@@ -123,7 +123,7 @@ perform_action()
        [ -n "$DISPLAY" ] && screensaver_xserver "$1"
        ;;
  
@@ -117,10 +117,10 @@ index c768f91..2a14cbe 100644
        ;;
    esac
 diff --git a/scripts/xdg-settings.in b/scripts/xdg-settings.in
-index ab18d3a..5c22d5f 100755
+index 40f739e..5eaca43 100755
 --- a/scripts/xdg-settings.in
 +++ b/scripts/xdg-settings.in
-@@ -483,6 +483,44 @@ set_browser_xfce()
+@@ -487,6 +487,44 @@ set_browser_xfce()
  }
  
  # }}} xfce
@@ -165,7 +165,7 @@ index ab18d3a..5c22d5f 100755
  # {{{ generic
  
  get_browser_generic()
-@@ -725,6 +763,24 @@ set_url_scheme_handler_xfce()
+@@ -730,6 +768,24 @@ set_url_scheme_handler_xfce()
  }
  
  # }}} xfce
@@ -190,7 +190,7 @@ index ab18d3a..5c22d5f 100755
  # {{{ generic
  
  get_url_scheme_handler_generic()
-@@ -879,6 +935,10 @@ case "$DE" in
+@@ -884,6 +940,10 @@ case "$DE" in
      dispatch_specific xfce "$@"
      ;;
  
@@ -202,7 +202,7 @@ index ab18d3a..5c22d5f 100755
      dispatch_specific generic "$@"
      ;;
 diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in
-index 0147527..3d1ddd4 100644
+index 14259c6..13781ea 100644
 --- a/scripts/xdg-utils-common.in
 +++ b/scripts/xdg-utils-common.in
 @@ -303,6 +303,9 @@ detectDE()