summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarrat2018-05-14 22:39:08 +0200
committerNarrat2018-05-14 22:39:08 +0200
commited605c295199411e66fa1e5ef114603cb7abc4e7 (patch)
treeb855191d39a36a2edfecc957467db9c3582632cd
parenta00981d4c8382554e35d0e32b54d79c27753f79f (diff)
downloadaur-ed605c295199411e66fa1e5ef114603cb7abc4e7.tar.gz
xdg-utils-mimeo: update to 1.1.3
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD12
-rw-r--r--lxqt.patch54
-rw-r--r--mimeo-detection.patch24
4 files changed, 21 insertions, 81 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6569ad095c7c..55d161f499c7 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.2
- pkgrel = 2
+ pkgver = 1.1.3
+ pkgrel = 1
url = https://www.freedesktop.org/wiki/Software/xdg-utils/
arch = any
license = MIT
@@ -21,12 +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.2.tar.gz
- source = lxqt.patch
+ source = https://portland.freedesktop.org/download/xdg-utils-1.1.3.tar.gz
source = mimeo-detection.patch
- sha1sums = 20cd4cc5cfaa904b12abf6d584deb568367f4d83
- sha1sums = a8b5435d4ee217512a455d099344bdc2dc80da94
- sha1sums = 47f7127d594427006fcee51a5da90f135269859b
+ sha1sums = 98294cf332c341b85e481d98e9ea59357fe1efc7
+ sha1sums = dad883cf3d02787811a8a28852cf7c1b9fea3709
pkgname = xdg-utils-mimeo
diff --git a/PKGBUILD b/PKGBUILD
index 9c511cf8264d..09c6652c0741 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
_pkgname=xdg-utils
pkgname=$_pkgname-mimeo
-pkgver=1.1.2
-pkgrel=2
+pkgver=1.1.3
+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/"
@@ -24,18 +24,14 @@ optdepends=('kde-cli-tools: for KDE Plasma5 support in xdg-open'
provides=($_pkgname)
conflicts=($_pkgname)
source=(https://portland.freedesktop.org/download/$_pkgname-$pkgver.tar.gz #{,.asc}
- lxqt.patch
mimeo-detection.patch)
-sha1sums=('20cd4cc5cfaa904b12abf6d584deb568367f4d83'
- 'a8b5435d4ee217512a455d099344bdc2dc80da94'
- '47f7127d594427006fcee51a5da90f135269859b')
+sha1sums=('98294cf332c341b85e481d98e9ea59357fe1efc7'
+ 'dad883cf3d02787811a8a28852cf7c1b9fea3709')
#validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pelle@pqz.se>"
prepare() {
cd $_pkgname-$pkgver
- # lxde and lxqt are different
- patch -Np1 -i ../lxqt.patch
patch -p1 -i "${srcdir}"/mimeo-detection.patch
}
diff --git a/lxqt.patch b/lxqt.patch
deleted file mode 100644
index 35a97616d468..000000000000
--- a/lxqt.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7d4360c64d94de53d907f13ca99837285e972ec6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= <luis.artur.pereira@gmail.com>
-Date: Wed, 17 May 2017 14:33:30 +0100
-Subject: xdg-open: Fixes LXQt behavior
-
-Commit 6387086e4938d568c2bab185632f60e1619b3f68 introduced LXQt support.
-In xdg-open it assumed that LXQt and LXDE are the same. They aren't. LXQt
-does not have pcmanfm, it has pcmanfm-qt.
-LXQt doesn't want to rely on pcmamfm-qt to handle it: LXQt is very modular
-and can be deployed without pcmanfm-qt.
-
-open_generic() works for LXQt but it depends on mimeopen and mimetype. In
-the future we will want, for sure, to drop those dependencies. That's the
-reason for the existence of open_lxqt().
----
- scripts/xdg-open.in | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
-index 9817c5f..2972257 100644
---- a/scripts/xdg-open.in
-+++ b/scripts/xdg-open.in
-@@ -447,6 +447,11 @@ open_lxde()
- fi
- }
-
-+open_lxqt()
-+{
-+ open_generic "$1"
-+}
-+
- [ x"$1" != x"" ] || exit_failure_syntax
-
- url=
-@@ -511,10 +516,14 @@ case "$DE" in
- open_xfce "$url"
- ;;
-
-- lxde|lxqt)
-+ lxde)
- open_lxde "$url"
- ;;
-
-+ lxqt)
-+ open_lxqt "$url"
-+ ;;
-+
- enlightenment)
- open_enlightenment "$url"
- ;;
---
-cgit v1.1
-
-
diff --git a/mimeo-detection.patch b/mimeo-detection.patch
index b0a16c310143..6e537cf2bf67 100644
--- a/mimeo-detection.patch
+++ b/mimeo-detection.patch
@@ -1,4 +1,4 @@
-commit 9535ad85e547f437e1fc2ff7ee68a859c144e38d
+commit 4938d0bdf23c389b456b2a884d368e679be9951e
Author: Narrat <autumn-wind@web.de>
Date: Mon May 8 21:12:37 2017 +0200
@@ -39,7 +39,7 @@ index 3614776..046bd39 100644
open_generic "${mailto}"
;;
diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
-index b67581c..04aa038 100644
+index 0e567c7..ff74d63 100644
--- a/scripts/xdg-mime.in
+++ b/scripts/xdg-mime.in
@@ -93,6 +93,16 @@ info_gnome()
@@ -71,10 +71,10 @@ index b67581c..04aa038 100644
info_generic "$filename"
;;
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
-index 9817c5f..6c95a11 100644
+index 630e63e..43110cc 100644
--- a/scripts/xdg-open.in
+++ b/scripts/xdg-open.in
-@@ -246,6 +246,17 @@ open_flatpak()
+@@ -261,6 +261,17 @@ open_flatpak()
fi
}
@@ -92,7 +92,7 @@ index 9817c5f..6c95a11 100644
#-----------------------------------------
# Recursively search .desktop file
-@@ -531,6 +542,10 @@ case "$DE" in
+@@ -568,6 +579,10 @@ case "$DE" in
open_flatpak "$url"
;;
@@ -104,7 +104,7 @@ index 9817c5f..6c95a11 100644
open_generic "$url"
;;
diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in
-index aecd8e3..c22909d 100644
+index 9e68196..58ef1ac 100644
--- a/scripts/xdg-screensaver.in
+++ b/scripts/xdg-screensaver.in
@@ -118,7 +118,7 @@ perform_action()
@@ -117,10 +117,10 @@ index aecd8e3..c22909d 100644
;;
esac
diff --git a/scripts/xdg-settings.in b/scripts/xdg-settings.in
-index b65e659..304bd94 100644
+index 3781de8..6ec7c70 100644
--- a/scripts/xdg-settings.in
+++ b/scripts/xdg-settings.in
-@@ -463,6 +463,42 @@ set_browser_xfce()
+@@ -471,6 +471,42 @@ set_browser_xfce()
}
# }}} xfce
@@ -163,7 +163,7 @@ index b65e659..304bd94 100644
# {{{ generic
get_browser_generic()
-@@ -698,6 +734,24 @@ set_url_scheme_handler_xfce()
+@@ -713,6 +749,24 @@ set_url_scheme_handler_xfce()
}
# }}} xfce
@@ -188,7 +188,7 @@ index b65e659..304bd94 100644
# {{{ generic
get_url_scheme_handler_generic()
-@@ -852,6 +906,10 @@ case "$DE" in
+@@ -867,6 +921,10 @@ case "$DE" in
dispatch_specific xfce "$@"
;;
@@ -200,10 +200,10 @@ index b65e659..304bd94 100644
dispatch_specific generic "$@"
;;
diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in
-index 8b85883..817effe 100644
+index a8abed8..79a41fc 100644
--- a/scripts/xdg-utils-common.in
+++ b/scripts/xdg-utils-common.in
-@@ -316,6 +316,7 @@ detectDE()
+@@ -320,6 +320,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;