Update to a more recent git checkout.

This commit is contained in:
ajacoutot 2022-07-02 08:47:23 +00:00
parent 75cbf2ad85
commit d9c48b2306
6 changed files with 16 additions and 25 deletions

View File

@ -4,8 +4,13 @@
COMMENT= utilities to assist desktop integration tasks
DISTNAME= xdg-utils-1.1.3
REVISION= 1
DISTNAME= xdg-utils-1.1.3.20210805
# use a git checkout; releases are not made regularly
COMMIT= 1a58bc28f6844898532daf9ee1bf6da7764955a9
MASTER_SITES= https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${COMMIT}/
WRKDIST= ${WRKDIR}/xdg-utils-${COMMIT}
EXTRACT_SUFX= .tar.gz
CATEGORIES= devel
@ -16,7 +21,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# MIT
PERMIT_PACKAGE= Yes
MASTER_SITES= https://portland.freedesktop.org/download/
#MASTER_SITES= https://portland.freedesktop.org/download/
PKG_ARCH= *
USE_GMAKE= Yes

View File

@ -1,2 +1,2 @@
SHA256 (xdg-utils-1.1.3.tar.gz) = 15iwivio4gY93ebJ+jOYyoFITyfexkLFYn/8qg1AUdk=
SIZE (xdg-utils-1.1.3.tar.gz) = 297170
SHA256 (xdg-utils-1.1.3.20210805.tar.gz) = U6PGsf4jEMR/3gK6vTCQecuZRGkHb6r7iFtauyptqjs=
SIZE (xdg-utils-1.1.3.20210805.tar.gz) = 299806

View File

@ -1,7 +1,7 @@
Index: scripts/xdg-email.in
--- scripts/xdg-email.in.orig
+++ scripts/xdg-email.in
@@ -314,7 +314,7 @@ LC_ALL="$ORIG_LC_ALL"
@@ -317,7 +317,7 @@ LC_ALL="$ORIG_LC_ALL"
options=
mailto=
@ -10,7 +10,7 @@ Index: scripts/xdg-email.in
while [ $# -gt 0 ] ; do
parm="$1"
shift
@@ -456,6 +456,7 @@ if [ x"$BROWSER" = x"" ]; then
@@ -459,6 +459,7 @@ if [ x"$BROWSER" = x"" ]; then
BROWSER=www-browser:links2:elinks:links:lynx:w3m
if has_display; then
BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER

View File

@ -1,7 +1,7 @@
Index: scripts/xdg-mime.in
--- scripts/xdg-mime.in.orig
+++ scripts/xdg-mime.in
@@ -421,6 +421,9 @@ defapp_generic()
@@ -423,6 +423,9 @@ defapp_generic()
for prefix in "$XDG_MENU_PREFIX" ""; do
DEBUG 2 "Checking $x/applications/${prefix}defaults.list and $x/applications/${prefix}mimeinfo.cache"
trader_result=`grep "$MIME=" $x/applications/${prefix}defaults.list $x/applications/${prefix}mimeinfo.cache 2> /dev/null | head -n 1 | cut -d '=' -f 2 | cut -d ';' -f 1`

View File

@ -1,14 +1,9 @@
Fix sed(1) usage (i.e. !GNU sed).
From 31525d3855f876ddf2e29091b2e8d376f923e09e Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Thu, 24 May 2018 14:40:53 -0500
Subject: xdg-open: better pcmanfm check (BR106636,BR106161)
Index: scripts/xdg-open.in
--- scripts/xdg-open.in.orig
+++ scripts/xdg-open.in
@@ -353,7 +353,7 @@ DEBUG 3 "$xdg_user_dir:$xdg_system_dirs"
@@ -354,7 +354,7 @@ DEBUG 3 "$xdg_user_dir:$xdg_system_dirs"
open_generic_xdg_file_mime()
{
@ -17,7 +12,7 @@ Index: scripts/xdg-open.in
open_generic_xdg_mime "$1" "$filetype"
}
@@ -438,7 +438,7 @@ open_generic()
@@ -439,7 +439,7 @@ open_generic()
if [ x"$BROWSER" = x"" ]; then
BROWSER=www-browser:links2:elinks:links:lynx:w3m
if has_display; then
@ -26,12 +21,3 @@ Index: scripts/xdg-open.in
fi
fi
@@ -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

View File

@ -3,7 +3,7 @@ Make xdg-open work with toad(8) under KDE4.
Index: scripts/xdg-utils-common.in
--- scripts/xdg-utils-common.in.orig
+++ scripts/xdg-utils-common.in
@@ -313,6 +313,7 @@ detectDE()
@@ -312,6 +312,7 @@ detectDE()
if [ x"$DE" = x"" ]; then
# classic fallbacks
if [ x"$KDE_FULL_SESSION" != x"" ]; then DE=kde;