[arch-commits] Commit in xdg-utils/trunk (PKGBUILD lxqt.patch)

[Andreas Radke]

    Date: Tuesday, March 13, 2018 @ 17:53:30
  Author: andyrtr
Revision: 318843

upgpkg: xdg-utils 1.1.2-2

apply upstream fix to detect lxqt from lxde

Added:
  xdg-utils/trunk/lxqt.patch
Modified:
  xdg-utils/trunk/PKGBUILD

------------+
 PKGBUILD   |   11 ++++++-----
 lxqt.patch |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-13 17:06:40 UTC (rev 318842)
+++ PKGBUILD	2018-03-13 17:53:30 UTC (rev 318843)
@@ -4,7 +4,7 @@
 
 pkgname=xdg-utils
 pkgver=1.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks"
 arch=('any')
 url="https://www.freedesktop.org/wiki/Software/xdg-utils/"
@@ -18,14 +18,15 @@
             'perl-file-mimeinfo: for generic support in xdg-open'
             'perl-net-dbus: Perl extension to dbus used in xdg-screensaver'
             'perl-x11-protocol: Perl X11 protocol used in xdg-screensaver')
-source=(https://portland.freedesktop.org/download/$pkgname-$pkgver.tar.gz) #{,.asc}
-sha1sums=('20cd4cc5cfaa904b12abf6d584deb568367f4d83')
+source=(https://portland.freedesktop.org/download/$pkgname-$pkgver.tar.gz lxqt.patch) #{,.asc}
+sha1sums=('20cd4cc5cfaa904b12abf6d584deb568367f4d83'
+          'a8b5435d4ee217512a455d099344bdc2dc80da94')
 #validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pelle at pqz.se>"
 
 prepare() {
 	cd $pkgname-$pkgver
-	# fix wrong hardcoded chromium binary name - FS#50184
-#	sed -i "s:chromium-browser:chromium:" scripts/xdg-open.in
+	# lxde and lxqt are different
+	patch -Np1 -i ../lxqt.patch
 }
 
 build() {

Added: lxqt.patch
===================================================================
--- lxqt.patch	                        (rev 0)
+++ lxqt.patch	2018-03-13 17:53:30 UTC (rev 318843)
@@ -0,0 +1,54 @@
+From 7d4360c64d94de53d907f13ca99837285e972ec6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= <luis.artur.pereira at 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
+
+