xdg-utils-mimeo: Update to 1.1.1

The diff got the usual adjusting. The remaining changes came through switching to a personal fork to maintain the diff. Manually adjusting it was cumbersome.
The PKGBUILD itself got rebased on the extra/xdg-utils one.

3 files changed, 115 insertions, 105 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c276104201e..e4b456eeb3f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 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.0.git20150715
+	pkgver = 1.1.1
 	pkgrel = 1
-	url = http://cgit.freedesktop.org/xdg/xdg-utils/
+	url = https://wiki.freedesktop.org/www/Software/xdg-utils/
 	arch = any
 	license = MIT
 	makedepends = docbook-xsl
@@ -21,10 +21,12 @@ pkgbase = xdg-utils-mimeo
 	optdepends = perl-file-mimeinfo: for generic support in xdg-open
 	provides = xdg-utils
 	conflicts = xdg-utils
-	source = git://anongit.freedesktop.org/xdg/xdg-utils#commit=3c499bd6d88c9d2b4f824f1e2f9c9158a5b95aa6
+	source = http://portland.freedesktop.org/download/xdg-utils-1.1.1.tar.gz
+	source = http://portland.freedesktop.org/download/xdg-utils-1.1.1.tar.gz.asc
 	source = mimeo-detection.diff
+	md5sums = 2d0aec6037769a5f138ff404b1bb4b15
 	md5sums = SKIP
-	md5sums = 8693c0986515de30872f0ff054539eaf
+	md5sums = 1cedb9e77167a5f1e2ae12506b214883
 
 pkgname = xdg-utils-mimeo
 
diff --git a/PKGBUILD b/PKGBUILD
index 00df01a7ffd9..446a63f301c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,13 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: cantabile <cantabile dot desu at gmail dot com>
 
-pkgname=xdg-utils-mimeo
-pkgver=1.1.0.git20150715
+_pkgname=xdg-utils
+pkgname=$_pkgname-mimeo
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks; patched to use mimeo"
 arch=('any')
-url="http://cgit.freedesktop.org/xdg/xdg-utils/"
+url="https://wiki.freedesktop.org/www/Software/xdg-utils/"
 license=('MIT')
 depends=('sh' 'xorg-xset') # xset needed inside xdg-screensaver
 makedepends=('docbook-xsl' 'lynx' 'xmlto' 'git')
@@ -20,34 +21,29 @@ optdepends=('kdebase-runtime: for KDE4 support in xdg-open'
             'pcmanfm: for LXDE support in xdg-open'
             'mimeo: for mimeo support in xdg-open'
             'perl-file-mimeinfo: for generic support in xdg-open')
-provides=('xdg-utils')
-conflicts=('xdg-utils')
-source=(git://anongit.freedesktop.org/xdg/xdg-utils#commit=3c499bd6d88c9d2b4f824f1e2f9c9158a5b95aa6
-	mimeo-detection.diff)
-md5sums=('SKIP'
-         '8693c0986515de30872f0ff054539eaf')
+provides=($_pkgname)
+conflicts=($_pkgname)
+source=(http://portland.freedesktop.org/download/$_pkgname-$pkgver.tar.gz{,.asc}
+        mimeo-detection.diff)
+md5sums=('2d0aec6037769a5f138ff404b1bb4b15'
+         'SKIP'
+         '1cedb9e77167a5f1e2ae12506b214883')
+validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pelle@pqz.se>"
 
 
-pkgver() {
-	cd xdg-utils
-	echo "1.1.0.git$(git log -1 --format="%cd" --date=short | sed 's|-||g')"
-}
-
 prepare() {
-	cd xdg-utils
+	cd $_pkgname-$pkgver
 	patch -p1 -i "${srcdir}"/mimeo-detection.diff
 }
 
 build() {
-	cd xdg-utils
+	cd $_pkgname-$pkgver
 	./configure --prefix=/usr --mandir=/usr/share/man
-#	make scripts-clean -C scripts # needed if it's a git snapshot
-#	make man scripts -C scripts # needed if it's a git snapshot
-	make # for release builds
+	make
 }
 
 package() {
-	cd xdg-utils
+	cd $_pkgname-$pkgver
 	make DESTDIR="${pkgdir}" install
 	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
diff --git a/mimeo-detection.diff b/mimeo-detection.diff
index b67e34cf27e9..03530e18f10d 100644
--- a/mimeo-detection.diff
+++ b/mimeo-detection.diff
@@ -1,52 +1,21 @@
---- xdg-utils/scripts/xdg-utils-common.in
-+++ xdg-utils/scripts/xdg-utils-common.in
-@@ -291,6 +291,7 @@
-       elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
-       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 which mimeo > /dev/null; then DE=mimeo;
-       fi
-     fi
- 
+commit 850c7f4ba510b74ac963bde430b4c32d16249f63
+Author: Narrat
+Date:   Thu Oct 8 02:45:32 2015 +0200
 
---- xdg-utils/scripts/xdg-open.in
-+++ xdg-utils/scripts/xdg-open.in
-@@ -158,6 +158,17 @@
- {
-     enlightenment_open "$1"
+    Add support for mimeo
+
+diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in
+index 2819e28..d95e938 100644
+--- a/scripts/xdg-email.in
++++ b/scripts/xdg-email.in
+@@ -213,6 +213,18 @@ open_envvar()
+     exit_failure_operation_failed
+ }
  
-+    if [ $? -eq 0 ]; then
-+        exit_success
-+    else
-+        exit_failure_operation_failed
-+    fi
-+}
-+
 +open_mimeo()
 +{
 +    DEBUG 1 "Running mimeo \"$1\""
 +    mimeo "$1"
-     if [ $? -eq 0 ]; then
-         exit_success
-     else
-@@ -440,6 +451,10 @@
-     open_darwin "$url"
-     ;;
- 
-+    mimeo)
-+    open_mimeo "$url"
-+    ;;
-+
-     generic)
-     open_generic "$url"
-     ;;
-
---- xdg-utils/scripts/xdg-email.in
-+++ xdg-utils/scripts/xdg-email.in
-@@ -180,6 +180,18 @@
- {
-     DEBUG 1 "Running exo-open \"$1\""
-     exo-open "$1"
 +
 +    if [ $? -eq 0 ]; then
 +        exit_success
@@ -55,14 +24,10 @@
 +    fi
 +}
 +
-+open_mimeo()
-+{
-+    DEBUG 1 "Running mimeo \"$1\""
-+    mimeo "$1"
- 
-     if [ $? -eq 0 ]; then
-         exit_success
-@@ -424,6 +436,10 @@
+ open_generic()
+ {
+     local client
+@@ -459,6 +471,10 @@ case "$DE" in
      open_xfce "${mailto}"
      ;;
  
@@ -73,13 +38,17 @@
      generic)
      open_generic "${mailto}"
      ;;
-
---- xdg-utils/scripts/xdg-mime.in
-+++ xdg-utils/scripts/xdg-mime.in
-@@ -88,6 +88,16 @@
-        info_generic "$1"
+diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
+index 074256c..da57bb0 100644
+--- a/scripts/xdg-mime.in
++++ b/scripts/xdg-mime.in
+@@ -90,6 +90,16 @@ info_gnome()
      fi
+ }
  
++info_mimeo()
++{
++    mimeo -m "$1"
 +    if [ $? -eq 0 ]; then
 +        exit_success
 +    else
@@ -87,13 +56,10 @@
 +    fi
 +}
 +
-+info_mimeo()
-+{
-+    mimeo -m "$1"
-     if [ $? -eq 0 ]; then
-         exit_success
-     else
-@@ -570,6 +580,10 @@
+ info_generic()
+ {
+     if mimetype --version >/dev/null 2>&1; then
+@@ -590,6 +600,10 @@ if [ "$action" = "info" ]; then
          info_gnome "$filename"
          ;;
  
@@ -104,10 +70,44 @@
          *)
          info_generic "$filename"
          ;;
-
---- xdg-utils/scripts/xdg-settings.in
-+++ xdg-utils/scripts/xdg-settings.in
-@@ -463,6 +463,42 @@
+diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
+index 0fbd63d..1ed4385 100644
+--- a/scripts/xdg-open.in
++++ b/scripts/xdg-open.in
+@@ -211,6 +211,17 @@ open_enlightenment()
+     fi
+ }
+ 
++open_mimeo()
++{
++    DEBUG 1 "Running mimeo \"$1\""
++    mimeo "$1"
++    if [ $? -eq 0 ]; then
++        exit_success
++    else
++        exit_failure_operation_failed
++    fi
++}
++
+ #-----------------------------------------
+ # Recursively search .desktop file
+ 
+@@ -492,6 +503,10 @@ case "$DE" in
+     open_darwin "$url"
+     ;;
+ 
++    mimeo)
++    open_mimeo "$url"
++    ;;
++
+     generic)
+     open_generic "$url"
+     ;;
+diff --git a/scripts/xdg-settings.in b/scripts/xdg-settings.in
+index 3d03507..784ae6e 100644
+--- a/scripts/xdg-settings.in
++++ b/scripts/xdg-settings.in
+@@ -463,6 +463,42 @@ set_browser_xfce()
  }
  
  # }}} xfce
@@ -147,18 +147,13 @@
 +}
 +
 +# }}} mimeo
- # }}} default browser
+ # {{{ generic
  
- # {{{ default url scheme handler
-@@ -624,6 +660,24 @@
+ get_browser_generic()
+@@ -698,6 +734,24 @@ set_url_scheme_handler_xfce()
  }
  
- set_url_scheme_handler_xfce()
-+{
-+    exit_unimplemented_default_handler "$1"
-+}
-+
-+# }}} xfce
+ # }}} xfce
 +# {{{ mimeo
 +
 +get_url_scheme_handler_mimeo()
@@ -172,10 +167,15 @@
 +}
 +
 +set_url_scheme_handler_mimeo()
- {
-     exit_unimplemented_default_handler "$1"
- }
-@@ -771,6 +825,10 @@
++{
++    exit_unimplemented_default_handler "$1"
++}
++
++# }}} mimeo
+ # {{{ generic
+ 
+ get_url_scheme_handler_generic()
+@@ -852,6 +906,10 @@ case "$DE" in
      dispatch_specific xfce "$@"
      ;;
  
@@ -184,5 +184,17 @@
 +    ;;
 +
      generic)
-     dispatch_generic "$@"
+     dispatch_specific generic "$@"
      ;;
+diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in
+index f920799..1ac95bc 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;
+       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 which mimeo > /dev/null; then DE=mimeo;
+       fi
+     fi
+