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

[Andreas Radke]

    Date: Tuesday, June 12, 2018 @ 17:55:20
  Author: andyrtr
Revision: 326852

upgpkg: xdg-utils 1.1.3-2

fix lxde opening urls; FS#58707

Added:
  xdg-utils/trunk/0001_better_pcmanfm_check.patch
Modified:
  xdg-utils/trunk/PKGBUILD

---------------------------------+
 0001_better_pcmanfm_check.patch |   27 +++++++++++++++++++++++++++
 PKGBUILD                        |   14 +++++++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)

Added: 0001_better_pcmanfm_check.patch
===================================================================
--- 0001_better_pcmanfm_check.patch	                        (rev 0)
+++ 0001_better_pcmanfm_check.patch	2018-06-12 17:55:20 UTC (rev 326852)
@@ -0,0 +1,27 @@
+From 31525d3855f876ddf2e29091b2e8d376f923e09e Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at gmail.com>
+Date: Thu, 24 May 2018 14:40:53 -0500
+Subject: xdg-open: better pcmanfm check (BR106636,BR106161)
+
+---
+ ChangeLog           | 2 ++
+ scripts/xdg-open.in | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
+index 630e63e..bf9da4c 100644
+--- a/scripts/xdg-open.in
++++ b/scripts/xdg-open.in
+@@ -451,7 +451,7 @@ open_lxde()
+ {
+ 
+     # pcmanfm only knows how to handle file:// urls and filepaths, it seems.
+-    if pcmanfm --help >/dev/null 2>&1 -a is_file_url_or_path "$1"; then
++    if pcmanfm --help >/dev/null 2>&1 && is_file_url_or_path "$1"; then
+         local file="$(file_url_to_path "$1")"
+ 
+         # handle relative paths
+-- 
+cgit v1.1
+
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-12 14:43:16 UTC (rev 326851)
+++ PKGBUILD	2018-06-12 17:55:20 UTC (rev 326852)
@@ -4,7 +4,7 @@
 
 pkgname=xdg-utils
 pkgver=1.1.3
-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,10 +18,18 @@
             '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=('98294cf332c341b85e481d98e9ea59357fe1efc7')
+source=(https://portland.freedesktop.org/download/$pkgname-$pkgver.tar.gz
+        0001_better_pcmanfm_check.patch) #{,.asc}
+sha1sums=('98294cf332c341b85e481d98e9ea59357fe1efc7'
+          'f5c09cc10d7b88c2033392efd4179da65a1f47b1')
 #validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pelle at pqz.se>"
 
+prepare() {
+	cd $pkgname-$pkgver
+	# FS#58707
+	patch -Np1 -i ../0001_better_pcmanfm_check.patch
+}
+
 build() {
 	cd $pkgname-$pkgver
 	./configure --prefix=/usr --mandir=/usr/share/man