Attachment #200934 for bug #234770

Lines 2-8 Link Here

(-)Makefile (-1 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= xdg-utils	4	PORTNAME= xdg-utils
5	PORTVERSION= 1.1.1	5	PORTVERSION= 1.1.3
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= http://portland.freedesktop.org/download/	7	MASTER_SITES= http://portland.freedesktop.org/download/
8		8
Lines 18-23 Link Here
18	xset:x11/xset	18	xset:x11/xset
19		19
20	USES= gmake	20	USES= gmake
		21
21	CONFIGURE_ENV= XMLTO=${LOCALBASE}/bin/minixmlto	22	CONFIGURE_ENV= XMLTO=${LOCALBASE}/bin/minixmlto
22	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
23	NO_ARCH= yes	24	NO_ARCH= yes

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (xdg-utils-1.1.1.tar.gz) = b0dd63a2576e0bb16f1aa78d6ddf7d6784784a098d4df17161cd6a17c7bc4125	1	TIMESTAMP = 1546903676
2	SIZE (xdg-utils-1.1.1.tar.gz) = 295213	2	SHA256 (xdg-utils-1.1.3.tar.gz) = d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
		3	SIZE (xdg-utils-1.1.3.tar.gz) = 297170




--- scripts/xdg-desktop-menu.in.orig	2019-01-08 19:02:17 UTC
+++ scripts/xdg-desktop-menu.in
@@ -67,7 +67,7 @@ make_lazy_default()
 
     for MIME in $mimetypes ; do
         xdg_default_dirs="$XDG_DATA_DIRS"
-        [ -n "$xdg_default_dirs" ] || xdg_default_dirs=/usr/local/share/:/usr/share/
+		[ -n "$xdg_default_dirs" ] || xdg_default_dirs=%%LOCALBASE%%/share/:/usr/share/
         if [ x"$mode" = x"user" ] ; then
             xdg_user_dir="$XDG_DATA_HOME"
             [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
@@ -110,7 +110,7 @@ update_submenu()
     xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
 
     xdg_system_dirs="$XDG_CONFIG_DIRS"
-    [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/etc/xdg
+	[ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/etc/xdg
     xdg_global_dir=
     for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
         if [ -w $x/$xdg_dir_name ] ; then
@@ -475,7 +475,7 @@ xdg_user_dir="$XDG_DATA_HOME"
 xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
 
 xdg_system_dirs="$XDG_DATA_DIRS"

 xdg_global_dir=
 for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
     if [ -w $x/$xdg_dir_name ] ; then
@@ -542,7 +542,7 @@ xdg_user_dir="$XDG_DATA_HOME"
 xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
 
 xdg_system_dirs="$XDG_DATA_DIRS"

 xdg_global_dir=
 for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
     if [ -w $x/$xdg_dir_name ] ; then
@@ -556,7 +556,7 @@ kde_global_dir=`kde${KDE_SESSION_VERSION}-config --pat
 [ -w $kde_global_dir ] || kde_global_dir=
 
 gnome_user_dir="$HOME/.gnome/apps"




--- scripts/xdg-email.in.orig	2019-01-08 19:02:17 UTC
+++ scripts/xdg-email.in
@@ -34,7 +34,7 @@ run_thunderbird()
 {
     local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY ATTACH
     THUNDERBIRD="$1"
-    MAILTO=$(echo "$2" | sed 's/^mailto://')
+	MAILTO=$(echo "$2" | tr '&' '\n')
     echo "$MAILTO" | grep -qs "^?"
     if [ "$?" = "0" ] ; then
         MAILTO=$(echo "$MAILTO" | sed 's/^?//')
@@ -48,7 +48,7 @@ run_thunderbird()
     BCC=$(/bin/echo -e $(echo "$MAILTO" | grep '^bcc=' | sed 's/^bcc=//;s/%\(..\)/\\x\1/g' | awk '{ printf "%s,",$0 }'))
     SUBJECT=$(echo "$MAILTO" | grep '^subject=' | tail -n 1)
     BODY=$(echo "$MAILTO" | grep '^body=' | tail -n 1)
-    ATTACH=$(/bin/echo -e $(echo "$MAILTO" | grep '^attach=' | sed 's/^attach=//;s/%\(..\)/\\x\1/g' | awk '{ printf "%s,",$0 }' | sed 's/,$//'))
+	ATTACH=$(for attachment in $(echo "$MAILTO" | sed -ne 's,^attach=,file://,gp') ; do printf "%s," "$attachment" ; done); ATTACH=${ATTACH%,}
 
     if [ -z "$TO" ] ; then
         NEWMAILTO=
@@ -314,7 +314,7 @@ LC_ALL="$ORIG_LC_ALL"
 
 options=
 mailto=

 while [ $# -gt 0 ] ; do
     parm="$1"
     shift
@@ -455,7 +455,7 @@ fi
 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
+		BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chrome:chromium-browser:google-chrome:$BROWSER
     fi
 fi
 

Lines 1-6 Link Here

(-)files/patch-scripts_xdg-icon-resource.in (-3 / +3 lines)
1	--- scripts/xdg-icon-resource.in.orig 2016-01-27 22:13:25.171381000 +0100	1	--- scripts/xdg-icon-resource.in.orig 2019-01-08 19:02:17 UTC
2	+++ scripts/xdg-icon-resource.in 2016-01-27 22:13:51.264266000 +0100	2	+++ scripts/xdg-icon-resource.in
3	@@ -222,7 +222,7 @@	3	@@ -222,7 +222,7 @@ xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
4	xdg_global_dir=	4	xdg_global_dir=
5	xdg_global_prefix=	5	xdg_global_prefix=
6	xdg_system_dirs="$XDG_DATA_DIRS"	6	xdg_system_dirs="$XDG_DATA_DIRS"




--- scripts/xdg-mime.in.orig	2019-01-08 19:02:17 UTC
+++ scripts/xdg-mime.in
@@ -318,7 +318,7 @@ defapp_fallback()
     [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
 
     xdg_system_dirs="$XDG_DATA_DIRS"
-    [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
+	[ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/share/:/usr/share/
 
     preference=-1
     desktop_file=""
@@ -401,7 +401,7 @@ defapp_generic()
     xdg_user_dir="$XDG_DATA_HOME"
     [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
     xdg_system_dirs="$XDG_DATA_DIRS"
-    [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
+	[ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/share/:/usr/share/
 
     local oldifs="$IFS" dir
 
@@ -500,7 +500,7 @@ case $1 in
             ;;
         esac
         check_input_file "$filename"
-        filename=`readlink -f -- "$filename"`
+	filename=`readlink -f -- "$filename"`
         ;;
 
       default)
@@ -702,7 +702,8 @@ xdg_user_dir="$XDG_DATA_HOME"
 xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
 
 xdg_system_dirs="$XDG_DATA_DIRS"
-[ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
+[ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/share/:/usr/share/
+
 for x in `echo $xdg_system_dirs | sed 's/:/ /g'`; do
     if [ -w $x/$xdg_dir_name ] ; then
         [ x"$mode" = x"system" ] && xdg_base_dir="$x/mime"
@@ -734,7 +735,7 @@ DEBUG 3 "kde_global_dir: $kde_global_dir"
 # TODO: Gnome legacy support
 # See http://forums.fedoraforum.org/showthread.php?t=26875
 gnome_user_dir="$HOME/.gnome/apps"




--- scripts/xdg-open.in.orig	2019-01-08 19:02:17 UTC
+++ scripts/xdg-open.in
@@ -15,6 +15,12 @@
 #
 #---------------------------------------------

+# If we are started from a Linux app with LD_PRELOAD set unset that
+# so native apps (like browers) won't fail to start.
+if [ "x$(uname)" = "xLinux" ]; then
+	unset LD_PRELOAD
+fi
+
 manualpage()
 {
 cat << _MANUALPAGE
@@ -92,7 +98,7 @@ file_url_to_path()
         if [ -x /usr/bin/printf ]; then
             printf=/usr/bin/printf
         fi
-        file=$($printf "$(echo "$file" | sed -e 's@%\([a-f0-9A-F]\{2\}\)@\\x\1@g')")
+		file=$(echo "$file" | unvis -h)
     fi
     echo "$file"
 }
@@ -193,6 +199,17 @@ open_gnome()
     fi
 }
 
+open_lumina()
+{
+	lumina-open "$1"
+
+	if [ $? -eq 0 ]; then
+		exit_success
+	else
+		exit_failure_operation_failed
+	fi
+}
+
 open_mate()
 {
     if gio help open 2>/dev/null 1>&2; then
@@ -342,8 +359,7 @@ open_generic_xdg_mime()
         [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
 
         xdg_system_dirs="$XDG_DATA_DIRS"
-        [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
-
+		[ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/share/:/usr/share/
 DEBUG 3 "$xdg_user_dir:$xdg_system_dirs"
         for x in `echo "$xdg_user_dir:$xdg_system_dirs" | sed 's/:/ /g'`; do
             search_desktop_file "$default" "$x/applications/" "$1"
@@ -438,7 +454,7 @@ open_generic()
     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:chromium-browser:google-chrome:$BROWSER
+			BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chrome:chromium-browser:google-chrome:$BROWSER
         fi
     fi
 
@@ -535,6 +551,10 @@ case "$DE" in
     gnome)
     open_gnome "$url"
     ;;
+
+	lumina)
+	open_lumina "$url"
+	;;
 
     mate)
     open_mate "$url"
+    ;;
+
     xfce)
     open_xfce "$url"
     ;;




--- scripts/xdg-screensaver.in.orig	2019-01-08 19:02:17 UTC
+++ scripts/xdg-screensaver.in
@@ -28,6 +28,9 @@ _USAGE
 #@xdg-utils-common@
 
 # Check if we can use "mv -T"
 if mv -T ... ... 2>&1 | grep '\.\.\.' > /dev/null ; then
+# FreeBSD mv doesn't support this, so supress scary messages in the terminal
+# if mv -T ... ... 2>&1 | grep '\.\.\.' > /dev/null ; then
+if false; then
    # We can securely move files in /tmp with mv -T
    DEBUG 1 "mv -T available"




--- scripts/xdg-utils-common.in.orig	2019-01-08 19:02:17 UTC
+++ scripts/xdg-utils-common.in
@@ -304,12 +304,50 @@ detectDE()
          XFCE)
            DE=xfce
            ;;
-         X-Generic)
-           DE=generic
-           ;;
-      esac
-    fi
+		Lumina)
+			DE=lumina
+			;;
+		X-Generic)
+			DE=generic
+			;;
+		esac
+	fi
 
+# xxx PCDM_SESSION check here?
+	if [ -n "${PCDM_SESSION}" ]; then
+		case "${PCDM_SESSION}" in
+			# only recently added to menu-spec, pre-spec X- still in use
+		CINNAMON)
+			DE=cinnamon;
+			;;
+		ENLIGHTENMENT)
+			DE=enlightenment;
+			;;
+		# GNOME, GNOME-Classic:GNOME, or GNOME-Flashback:GNOME
+		GNOME*)
+			DE=gnome;
+			;;
+		KDE)
+			DE=kde;
+			;;
+		LXDE)
+			DE=lxde;
+			;;
+		MATE)
+			DE=mate;
+			;;
+		XFCE)
+			DE=xfce
+			;;
+		LUMINA)
+			DE=lumina
+			;;
+		X-Generic)
+			DE=generic
+			;;
+		esac
+	fi
+
     if [ x"$DE" = x"" ]; then
       # classic fallbacks
       if [ x"$KDE_FULL_SESSION" != x"" ]; then DE=kde;
@@ -320,6 +358,8 @@ detectDE()
+         CINNAMON)
+           DE=cinnamon;
+           ;;
+         ENLIGHTENMENT)
+           DE=enlightenment;
+           ;;
+         # GNOME, GNOME-Classic:GNOME, or GNOME-Flashback:GNOME
+         GNOME*)
+           DE=gnome;
+           ;;
+         KDE)
+           DE=kde;
+           ;;
+         LXDE)
+           DE=lxde;
+           ;;
+         MATE)
+           DE=mate;
+           ;;
+         XFCE)
+           DE=xfce
+           ;;
+         LUMINA)
+           DE=lumina
+           ;;
          X-Generic)
            DE=generic
            ;;
@@ -294,6 +332,8 @@
       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 [ x"$LXQT_SESSION_CONFIG" != x"" ]; then DE=lxqt;
+      # Simple fallback for non-XDG window managers if Lumina is installed in the normal place (no heavy runtime dependencies)
+      elif [ -x "/usr/local/bin/lumina-open" ]; then DE=lumina;
       fi
     fi

Return to bug 234770

Lines 1-24 Link Here

(-)files/patch-scripts_xdg-desktop-menu.in (-9 / +9 lines)
1	--- scripts/xdg-desktop-menu.in.orig 2016-01-27 22:06:06.661844000 +0100	1	--- scripts/xdg-desktop-menu.in.orig 2019-01-08 19:02:17 UTC
2	+++ scripts/xdg-desktop-menu.in 2016-01-27 22:08:30.057702000 +0100	2	+++ scripts/xdg-desktop-menu.in
3	@@ -67,7 +67,7 @@	3	@@ -67,7 +67,7 @@ make_lazy_default()
4		4
5	for MIME in $mimetypes ; do	5	for MIME in $mimetypes ; do
6	xdg_default_dirs="$XDG_DATA_DIRS"	6	xdg_default_dirs="$XDG_DATA_DIRS"
7	- [ -n "$xdg_default_dirs" ] \|\| xdg_default_dirs=/usr/local/share/:/usr/share/	7	- [ -n "$xdg_default_dirs" ] \|\| xdg_default_dirs=/usr/local/share/:/usr/share/
8	+ [ -n "$xdg_default_dirs" ] \|\| xdg_default_dirs=%%LOCALBASE%%/share/:/usr/share/	8	+ [ -n "$xdg_default_dirs" ] \|\| xdg_default_dirs=%%LOCALBASE%%/share/:/usr/share/
9	if [ x"$mode" = x"user" ] ; then	9	if [ x"$mode" = x"user" ] ; then
10	xdg_user_dir="$XDG_DATA_HOME"	10	xdg_user_dir="$XDG_DATA_HOME"
11	[ -n "$xdg_user_dir" ] \|\| xdg_user_dir="$HOME/.local/share"	11	[ -n "$xdg_user_dir" ] \|\| xdg_user_dir="$HOME/.local/share"
12	@@ -110,7 +110,7 @@	12	@@ -110,7 +110,7 @@ update_submenu()
13	xdg_user_dir="$xdg_user_dir/$xdg_dir_name"	13	xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
14		14
15	xdg_system_dirs="$XDG_CONFIG_DIRS"	15	xdg_system_dirs="$XDG_CONFIG_DIRS"
16	- [ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=/etc/xdg	16	- [ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=/etc/xdg
17	+ [ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=%%LOCALBASE%%/etc/xdg	17	+ [ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=%%LOCALBASE%%/etc/xdg
18	xdg_global_dir=	18	xdg_global_dir=
19	for x in `echo $xdg_system_dirs \| sed 's/:/ /g'` ; do	19	for x in `echo $xdg_system_dirs \| sed 's/:/ /g'` ; do
20	if [ -w $x/$xdg_dir_name ] ; then	20	if [ -w $x/$xdg_dir_name ] ; then
21	@@ -475,7 +475,7 @@	21	@@ -475,7 +475,7 @@ xdg_user_dir="$XDG_DATA_HOME"
22	xdg_user_dir="$xdg_user_dir/$xdg_dir_name"	22	xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
23		23
24	xdg_system_dirs="$XDG_DATA_DIRS"	24	xdg_system_dirs="$XDG_DATA_DIRS"
Lines 27-33 Link Here
27	xdg_global_dir=	27	xdg_global_dir=
28	for x in `echo $xdg_system_dirs \| sed 's/:/ /g'` ; do	28	for x in `echo $xdg_system_dirs \| sed 's/:/ /g'` ; do
29	if [ -w $x/$xdg_dir_name ] ; then	29	if [ -w $x/$xdg_dir_name ] ; then
30	@@ -542,7 +542,7 @@	30	@@ -542,7 +542,7 @@ xdg_user_dir="$XDG_DATA_HOME"
31	xdg_user_dir="$xdg_user_dir/$xdg_dir_name"	31	xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
32		32
33	xdg_system_dirs="$XDG_DATA_DIRS"	33	xdg_system_dirs="$XDG_DATA_DIRS"
Lines 36-42 Link Here
36	xdg_global_dir=	36	xdg_global_dir=
37	for x in `echo $xdg_system_dirs \| sed 's/:/ /g'` ; do	37	for x in `echo $xdg_system_dirs \| sed 's/:/ /g'` ; do
38	if [ -w $x/$xdg_dir_name ] ; then	38	if [ -w $x/$xdg_dir_name ] ; then
39	@@ -556,7 +556,7 @@	39	@@ -556,7 +556,7 @@ kde_global_dir=`kde${KDE_SESSION_VERSION}-config --pat
40	[ -w $kde_global_dir ] \|\| kde_global_dir=	40	[ -w $kde_global_dir ] \|\| kde_global_dir=
41		41
42	gnome_user_dir="$HOME/.gnome/apps"	42	gnome_user_dir="$HOME/.gnome/apps"

Lines 1-24 Link Here

(-)files/patch-scripts_xdg-email.in (-10 / +10 lines)
1	--- scripts/xdg-email.in.orig 2016-01-27 22:09:31.736910000 +0100	1	--- scripts/xdg-email.in.orig 2019-01-08 19:02:17 UTC
2	+++ scripts/xdg-email.in 2016-01-27 22:46:01.701427000 +0100	2	+++ scripts/xdg-email.in
3	@@ -34,7 +34,7 @@	3	@@ -34,7 +34,7 @@ run_thunderbird()
4	{	4	{
5	local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY ATTACH	5	local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY ATTACH
6	THUNDERBIRD="$1"	6	THUNDERBIRD="$1"
7	- MAILTO=$(echo "$2" \| sed 's/^mailto://')	7	- MAILTO=$(echo "$2" \| sed 's/^mailto://')
8	+ MAILTO=$(echo "$2" \| tr '&' '\n')	8	+ MAILTO=$(echo "$2" \| tr '&' '\n')
9	echo "$MAILTO" \| grep -qs "^?"	9	echo "$MAILTO" \| grep -qs "^?"
10	if [ "$?" = "0" ] ; then	10	if [ "$?" = "0" ] ; then
11	MAILTO=$(echo "$MAILTO" \| sed 's/^?//')	11	MAILTO=$(echo "$MAILTO" \| sed 's/^?//')
12	@@ -48,7 +48,7 @@	12	@@ -48,7 +48,7 @@ run_thunderbird()
13	BCC=$(/bin/echo -e $(echo "$MAILTO" \| grep '^bcc=' \| sed 's/^bcc=//;s/%\(..\)/\\x\1/g' \| awk '{ printf "%s,",$0 }'))	13	BCC=$(/bin/echo -e $(echo "$MAILTO" \| grep '^bcc=' \| sed 's/^bcc=//;s/%\(..\)/\\x\1/g' \| awk '{ printf "%s,",$0 }'))
14	SUBJECT=$(echo "$MAILTO" \| grep '^subject=' \| tail -n 1)	14	SUBJECT=$(echo "$MAILTO" \| grep '^subject=' \| tail -n 1)
15	BODY=$(echo "$MAILTO" \| grep '^body=' \| tail -n 1)	15	BODY=$(echo "$MAILTO" \| grep '^body=' \| tail -n 1)
16	- ATTACH=$(/bin/echo -e $(echo "$MAILTO" \| grep '^attach=' \| sed 's/^attach=//;s/%\(..\)/\\x\1/g' \| awk '{ printf "%s,",$0 }' \| sed 's/,$//'))	16	- ATTACH=$(/bin/echo -e $(echo "$MAILTO" \| grep '^attach=' \| sed 's/^attach=//;s/%\(..\)/\\x\1/g' \| awk '{ printf "%s,",$0 }' \| sed 's/,$//'))
17	+ ATTACH=$(for attachment in $(echo "$MAILTO" \| sed -ne 's,^attach=,file://,gp') ; do printf "%s," "$attachment" ; done); ATTACH=${ATTACH%,}	17	+ ATTACH=$(for attachment in $(echo "$MAILTO" \| sed -ne 's,^attach=,file://,gp') ; do printf "%s," "$attachment" ; done); ATTACH=${ATTACH%,}
18		18
19	if [ -z "$TO" ] ; then	19	if [ -z "$TO" ] ; then
20	NEWMAILTO=	20	NEWMAILTO=
21	@@ -293,7 +293,7 @@	21	@@ -314,7 +314,7 @@ LC_ALL="$ORIG_LC_ALL"
22		22
23	options=	23	options=
24	mailto=	24	mailto=
Lines 27-38 Link Here
27	while [ $# -gt 0 ] ; do	27	while [ $# -gt 0 ] ; do
28	parm="$1"	28	parm="$1"
29	shift	29	shift
30	@@ -434,7 +434,7 @@	30	@@ -455,7 +455,7 @@ fi
31	if [ x"$BROWSER" = x"" ]; then	31	if [ x"$BROWSER" = x"" ]; then
32	BROWSER=www-browser:links2:elinks:links:lynx:w3m	32	BROWSER=www-browser:links2:elinks:links:lynx:w3m
33	if [ -n "$DISPLAY" ]; then	33	if has_display; then
34	- BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER	34	- BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER
35	+ BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chrome:chromium-browser:google-chrome:$BROWSER	35	+ BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chrome:chromium-browser:google-chrome:$BROWSER
36	fi	36	fi
37	fi	37	fi
38		38

Lines 1-42 Link Here

(-)files/patch-scripts_xdg-mime.in (-10 / +11 lines)
1	--- scripts/xdg-mime.in.orig 2016-01-27 22:14:36.041781000 +0100	1	--- scripts/xdg-mime.in.orig 2019-01-08 19:02:17 UTC
2	+++ scripts/xdg-mime.in 2016-01-27 22:17:25.276625000 +0100	2	+++ scripts/xdg-mime.in
3	@@ -315,7 +315,7 @@	3	@@ -318,7 +318,7 @@ defapp_fallback()
4	[ -n "$xdg_user_dir" ] \|\| xdg_user_dir="$HOME/.local/share"	4	[ -n "$xdg_user_dir" ] \|\| xdg_user_dir="$HOME/.local/share"
5		5
6	xdg_system_dirs="$XDG_DATA_DIRS"	6	xdg_system_dirs="$XDG_DATA_DIRS"
7	- [ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=/usr/local/share/:/usr/share/	7	- [ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=/usr/local/share/:/usr/share/
8	+ [ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=%%LOCALBASE%%/share/:/usr/share/	8	+ [ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=%%LOCALBASE%%/share/:/usr/share/
9		9
10	preference=-1	10	preference=-1
11	desktop_file=""	11	desktop_file=""
12	@@ -389,7 +389,7 @@	12	@@ -401,7 +401,7 @@ defapp_generic()
13	xdg_user_dir="$XDG_DATA_HOME"	13	xdg_user_dir="$XDG_DATA_HOME"
14	[ -n "$xdg_user_dir" ] \|\| xdg_user_dir="$HOME/.local/share"	14	[ -n "$xdg_user_dir" ] \|\| xdg_user_dir="$HOME/.local/share"
15	xdg_system_dirs="$XDG_DATA_DIRS"	15	xdg_system_dirs="$XDG_DATA_DIRS"
16	- [ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=/usr/local/share/:/usr/share/	16	- [ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=/usr/local/share/:/usr/share/
17	+ [ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=%%LOCALBASE%%/share/:/usr/share/	17	+ [ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=%%LOCALBASE%%/share/:/usr/share/
18		18
19	local oldifs="$IFS" dir	19	local oldifs="$IFS" dir
20		20
21	@@ -492,7 +492,7 @@	21	@@ -500,7 +500,7 @@ case $1 in
22	;;	22	;;
23	esac	23	esac
24	check_input_file "$filename"	24	check_input_file "$filename"
25	- filename=`readlink -f -- "$filename"`	25	- filename=`readlink -f -- "$filename"`
26	+ filename=`stat -f "$filename"`	26	+ filename=`readlink -f -- "$filename"`
27	;;	27	;;
28		28
29	default)	29	default)
30	@@ -694,7 +694,7 @@	30	@@ -702,7 +702,8 @@ xdg_user_dir="$XDG_DATA_HOME"
31	xdg_user_dir="$xdg_user_dir/$xdg_dir_name"	31	xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
32		32
33	xdg_system_dirs="$XDG_DATA_DIRS"	33	xdg_system_dirs="$XDG_DATA_DIRS"
34	-[ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=/usr/local/share/:/usr/share/	34	-[ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=/usr/local/share/:/usr/share/
35	+[ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=%%LOCALBASE%%/share/:/usr/share/	35	+[ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=%%LOCALBASE%%/share/:/usr/share/
		36	+
36	for x in `echo $xdg_system_dirs \| sed 's/:/ /g'`; do	37	for x in `echo $xdg_system_dirs \| sed 's/:/ /g'`; do
37	if [ -w $x/$xdg_dir_name ] ; then	38	if [ -w $x/$xdg_dir_name ] ; then
38	[ x"$mode" = x"system" ] && xdg_base_dir="$x/mime"	39	[ x"$mode" = x"system" ] && xdg_base_dir="$x/mime"
39	@@ -726,7 +726,7 @@	40	@@ -734,7 +735,7 @@ DEBUG 3 "kde_global_dir: $kde_global_dir"
40	# TODO: Gnome legacy support	41	# TODO: Gnome legacy support
41	# See http://forums.fedoraforum.org/showthread.php?t=26875	42	# See http://forums.fedoraforum.org/showthread.php?t=26875
42	gnome_user_dir="$HOME/.gnome/apps"	43	gnome_user_dir="$HOME/.gnome/apps"

Lines 1-5 Link Here

(-)files/patch-scripts_xdg-open.in (-27 / +37 lines)
1	--- scripts/xdg-open.in.orig 2016-01-27 22:52:37.829535000 +0100	1	--- scripts/xdg-open.in.orig 2019-01-08 19:02:17 UTC
2	+++ scripts/xdg-open.in 2016-01-28 11:10:29.639949000 +0100	2	+++ scripts/xdg-open.in
3	@@ -15,6 +15,12 @@	3	@@ -15,6 +15,12 @@
4	#	4	#
5	#---------------------------------------------	5	#---------------------------------------------
Lines 7-62 Link Here
7	+# If we are started from a Linux app with LD_PRELOAD set unset that	7	+# If we are started from a Linux app with LD_PRELOAD set unset that
8	+# so native apps (like browers) won't fail to start.	8	+# so native apps (like browers) won't fail to start.
9	+if [ "x$(uname)" = "xLinux" ]; then	9	+if [ "x$(uname)" = "xLinux" ]; then
10	+ unset LD_PRELOAD	10	+ unset LD_PRELOAD
11	+fi	11	+fi
12	+	12	+
13	manualpage()	13	manualpage()
14	{	14	{
15	cat << _MANUALPAGE	15	cat << _MANUALPAGE
16	@@ -92,7 +98,7 @@	16	@@ -92,7 +98,7 @@ file_url_to_path()
17	if [ -x /usr/bin/printf ]; then	17	if [ -x /usr/bin/printf ]; then
18	printf=/usr/bin/printf	18	printf=/usr/bin/printf
19	fi	19	fi
20	- file=$($printf "$(echo "$file" \| sed -e 's@%\([a-f0-9A-F]\{2\}\)@\\x\1@g')")	20	- file=$($printf "$(echo "$file" \| sed -e 's@%\([a-f0-9A-F]\{2\}\)@\\x\1@g')")
21	+ file=$(echo "$file" \| unvis -h)	21	+ file=$(echo "$file" \| unvis -h)
22	fi	22	fi
23	echo "$file"	23	echo "$file"
24	}	24	}
25	@@ -211,6 +217,17 @@	25	@@ -193,6 +199,17 @@ open_gnome()
26	fi	26	fi
27	}	27	}
28		28
29	+open_lumina()	29	+open_lumina()
30	+{	30	+{
31	+ lumina-open "$1"	31	+ lumina-open "$1"
32	+	32	+
33	+ if [ $? -eq 0 ]; then	33	+ if [ $? -eq 0 ]; then
34	+ exit_success	34	+ exit_success
35	+ else	35	+ else
36	+ exit_failure_operation_failed	36	+ exit_failure_operation_failed
37	+ fi	37	+ fi
38	+}	38	+}
39	+	39	+
40	#-----------------------------------------	40	open_mate()
41	# Recursively search .desktop file	41	{
		42	if gio help open 2>/dev/null 1>&2; then
		43	@@ -342,8 +359,7 @@ open_generic_xdg_mime()
		44	[ -n "$xdg_user_dir" ] \|\| xdg_user_dir="$HOME/.local/share"
42		45
43	@@ -380,7 +397,7 @@	46	xdg_system_dirs="$XDG_DATA_DIRS"
		47	- [ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=/usr/local/share/:/usr/share/
		48	-
		49	+ [ -n "$xdg_system_dirs" ] \|\| xdg_system_dirs=%%LOCALBASE%%/share/:/usr/share/
		50	DEBUG 3 "$xdg_user_dir:$xdg_system_dirs"
		51	for x in `echo "$xdg_user_dir:$xdg_system_dirs" \| sed 's/:/ /g'`; do
		52	search_desktop_file "$default" "$x/applications/" "$1"
		53	@@ -438,7 +454,7 @@ open_generic()
44	if [ x"$BROWSER" = x"" ]; then	54	if [ x"$BROWSER" = x"" ]; then
45	BROWSER=www-browser:links2:elinks:links:lynx:w3m	55	BROWSER=www-browser:links2:elinks:links:lynx:w3m
46	if [ -n "$DISPLAY" ]; then	56	if has_display; then
47	- BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER	57	- BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chromium:chromium-browser:google-chrome:$BROWSER
48	+ BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chrome:chromium-browser:google-chrome:$BROWSER	58	+ BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chrome:chromium-browser:google-chrome:$BROWSER
49	fi	59	fi
50	fi	60	fi
51		61
52	@@ -472,6 +489,10 @@	62	@@ -535,6 +551,10 @@ case "$DE" in
53	open_mate "$url"	63	gnome)
		64	open_gnome "$url"
54	;;	65	;;
		66	+
		67	+ lumina)
		68	+ open_lumina "$url"
		69	+ ;;
55		70
56	+ lumina)	71	mate)
57	+ open_lumina "$url"	72	open_mate "$url"
58	+ ;;
59	+
60	xfce)
61	open_xfce "$url"
62	;;

Lines 1-12 Link Here

(-)files/patch-scripts_xdg-screensaver.in (-6 / +5 lines)
1	--- scripts/xdg-screensaver.in.orig 2016-01-27 22:18:04.068869000 +0100	1	--- scripts/xdg-screensaver.in.orig 2019-01-08 19:02:17 UTC
2	+++ scripts/xdg-screensaver.in 2016-01-27 22:18:32.024901000 +0100	2	+++ scripts/xdg-screensaver.in
3	@@ -27,7 +27,9 @@	3	@@ -28,6 +28,9 @@ _USAGE
4	#@xdg-utils-common@
5		4
6	# Check if we can use "mv -T"	5	# Check if we can use "mv -T"
7	-if mv -T ... ... 2>&1 \| grep '\.\.\.' > /dev/null ; then	6	if mv -T ... ... 2>&1 \| grep '\.\.\.' > /dev/null ; then
8	+# FreeBSD mv doesn't support this, so supress scary messages in the terminal	7	+# FreeBSD mv doesn't support this, so supress scary messages in the terminal
9	+#if mv -T ... ... 2>&1 \| grep '\.\.\.' > /dev/null ; then	8	+# if mv -T ... ... 2>&1 \| grep '\.\.\.' > /dev/null ; then
10	+if false; then	9	+if false; then
11	# We can securely move files in /tmp with mv -T	10	# We can securely move files in /tmp with mv -T
12	DEBUG 1 "mv -T available"	11	DEBUG 1 "mv -T available"

Lines 1-55 Link Here

(-)files/patch-scripts_xdg-utils-common.in (-46 / +57 lines)
1	--- scripts/xdg-utils-common.in.orig 2016-01-27 22:52:37.833381000 +0100	1	--- scripts/xdg-utils-common.in.orig 2019-01-08 19:02:17 UTC
2	+++ scripts/xdg-utils-common.in 2016-01-28 09:44:29.953139000 +0100	2	+++ scripts/xdg-utils-common.in
3	@@ -279,6 +279,44 @@	3	@@ -304,12 +304,50 @@ detectDE()
4	XFCE)	4	XFCE)
5	DE=xfce	5	DE=xfce
6	;;	6	;;
7	+ Lumina)	7	- X-Generic)
8	+ DE=lumina	8	- DE=generic
9	+ ;;	9	- ;;
10	+ X-Generic)	10	- esac
11	+ DE=generic	11	- fi
12	+ ;;	12	+ Lumina)
13	+ esac	13	+ DE=lumina
14	+ fi	14	+ ;;
		15	+ X-Generic)
		16	+ DE=generic
		17	+ ;;
		18	+ esac
		19	+ fi
		20
		21	+# xxx PCDM_SESSION check here?
		22	+ if [ -n "${PCDM_SESSION}" ]; then
		23	+ case "${PCDM_SESSION}" in
		24	+ # only recently added to menu-spec, pre-spec X- still in use
		25	+ CINNAMON)
		26	+ DE=cinnamon;
		27	+ ;;
		28	+ ENLIGHTENMENT)
		29	+ DE=enlightenment;
		30	+ ;;
		31	+ # GNOME, GNOME-Classic:GNOME, or GNOME-Flashback:GNOME
		32	+ GNOME*)
		33	+ DE=gnome;
		34	+ ;;
		35	+ KDE)
		36	+ DE=kde;
		37	+ ;;
		38	+ LXDE)
		39	+ DE=lxde;
		40	+ ;;
		41	+ MATE)
		42	+ DE=mate;
		43	+ ;;
		44	+ XFCE)
		45	+ DE=xfce
		46	+ ;;
		47	+ LUMINA)
		48	+ DE=lumina
		49	+ ;;
		50	+ X-Generic)
		51	+ DE=generic
		52	+ ;;
		53	+ esac
		54	+ fi
15	+	55	+
16	+# xxx PCDM_SESSION check here?	56	if [ x"$DE" = x"" ]; then
17	+ if [ -n "${PCDM_SESSION}" ]; then	57	# classic fallbacks
18	+ case "${PCDM_SESSION}" in	58	if [ x"$KDE_FULL_SESSION" != x"" ]; then DE=kde;
19	+ # only recently added to menu-spec, pre-spec X- still in use	59	@@ -320,6 +358,8 @@ detectDE()
20	+ CINNAMON)
21	+ DE=cinnamon;
22	+ ;;
23	+ ENLIGHTENMENT)
24	+ DE=enlightenment;
25	+ ;;
26	+ # GNOME, GNOME-Classic:GNOME, or GNOME-Flashback:GNOME
27	+ GNOME*)
28	+ DE=gnome;
29	+ ;;
30	+ KDE)
31	+ DE=kde;
32	+ ;;
33	+ LXDE)
34	+ DE=lxde;
35	+ ;;
36	+ MATE)
37	+ DE=mate;
38	+ ;;
39	+ XFCE)
40	+ DE=xfce
41	+ ;;
42	+ LUMINA)
43	+ DE=lumina
44	+ ;;
45	X-Generic)
46	DE=generic
47	;;
48	@@ -294,6 +332,8 @@
49	elif xprop -root _DT_SAVE_MODE 2> /dev/null \| grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
50	elif xprop -root 2> /dev/null \| grep -i '^xfce_desktop_window' >/dev/null 2>&1; then DE=xfce	60	elif xprop -root 2> /dev/null \| grep -i '^xfce_desktop_window' >/dev/null 2>&1; then DE=xfce
51	elif echo $DESKTOP \| grep -q '^Enlightenment'; then DE=enlightenment;	61	elif echo $DESKTOP \| grep -q '^Enlightenment'; then DE=enlightenment;
52	+ #Simple fallback for non-XDG window managers if Lumina is installed in the normal place (no heavy runtime dependencies)	62	elif [ x"$LXQT_SESSION_CONFIG" != x"" ]; then DE=lxqt;
		63	+ # Simple fallback for non-XDG window managers if Lumina is installed in the normal place (no heavy runtime dependencies)
53	+ elif [ -x "/usr/local/bin/lumina-open" ]; then DE=lumina;	64	+ elif [ -x "/usr/local/bin/lumina-open" ]; then DE=lumina;
54	fi	65	fi
55	fi	66	fi