FreeBSD Bugzilla – Attachment 200934 Details for
Bug 234770
[PATCH] devel/xdg-utils: Update to 1.1.3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
svn diff to upgrade xdg-utils-1.1.1 to xdg-utils-1.1.3
xdg-utils-1.1.3.diff (text/plain), 15.56 KB, created by
Marcel Kaiser
on 2019-01-08 20:25:44 UTC
(
hide
)
Description:
svn diff to upgrade xdg-utils-1.1.1 to xdg-utils-1.1.3
Filename:
MIME Type:
Creator:
Marcel Kaiser
Created:
2019-01-08 20:25:44 UTC
Size:
15.56 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 488281) >+++ Makefile (working copy) >@@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= xdg-utils >-PORTVERSION= 1.1.1 >+PORTVERSION= 1.1.3 > CATEGORIES= devel > MASTER_SITES= http://portland.freedesktop.org/download/ > >@@ -18,6 +18,7 @@ > xset:x11/xset > > USES= gmake >+ > CONFIGURE_ENV= XMLTO=${LOCALBASE}/bin/minixmlto > GNU_CONFIGURE= yes > NO_ARCH= yes >Index: distinfo >=================================================================== >--- distinfo (revision 488281) >+++ distinfo (working copy) >@@ -1,2 +1,3 @@ >-SHA256 (xdg-utils-1.1.1.tar.gz) = b0dd63a2576e0bb16f1aa78d6ddf7d6784784a098d4df17161cd6a17c7bc4125 >-SIZE (xdg-utils-1.1.1.tar.gz) = 295213 >+TIMESTAMP = 1546903676 >+SHA256 (xdg-utils-1.1.3.tar.gz) = d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9 >+SIZE (xdg-utils-1.1.3.tar.gz) = 297170 >Index: files/patch-scripts_xdg-desktop-menu.in >=================================================================== >--- files/patch-scripts_xdg-desktop-menu.in (revision 488281) >+++ files/patch-scripts_xdg-desktop-menu.in (working copy) >@@ -1,24 +1,24 @@ >---- scripts/xdg-desktop-menu.in.orig 2016-01-27 22:06:06.661844000 +0100 >-+++ scripts/xdg-desktop-menu.in 2016-01-27 22:08:30.057702000 +0100 >-@@ -67,7 +67,7 @@ >+--- 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/ >++ [ -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 @@ >+@@ -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 >++ [ -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 @@ >+@@ -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" >@@ -27,7 +27,7 @@ > 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 @@ >+@@ -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" >@@ -36,7 +36,7 @@ > 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 @@ >+@@ -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" >Index: files/patch-scripts_xdg-email.in >=================================================================== >--- files/patch-scripts_xdg-email.in (revision 488281) >+++ files/patch-scripts_xdg-email.in (working copy) >@@ -1,24 +1,24 @@ >---- scripts/xdg-email.in.orig 2016-01-27 22:09:31.736910000 +0100 >-+++ scripts/xdg-email.in 2016-01-27 22:46:01.701427000 +0100 >-@@ -34,7 +34,7 @@ >+--- 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') >++ MAILTO=$(echo "$2" | tr '&' '\n') > echo "$MAILTO" | grep -qs "^?" > if [ "$?" = "0" ] ; then > MAILTO=$(echo "$MAILTO" | sed 's/^?//') >-@@ -48,7 +48,7 @@ >+@@ -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%,} >++ ATTACH=$(for attachment in $(echo "$MAILTO" | sed -ne 's,^attach=,file://,gp') ; do printf "%s," "$attachment" ; done); ATTACH=${ATTACH%,} > > if [ -z "$TO" ] ; then > NEWMAILTO= >-@@ -293,7 +293,7 @@ >+@@ -314,7 +314,7 @@ LC_ALL="$ORIG_LC_ALL" > > options= > mailto= >@@ -27,12 +27,12 @@ > while [ $# -gt 0 ] ; do > parm="$1" > shift >-@@ -434,7 +434,7 @@ >+@@ -455,7 +455,7 @@ fi > if [ x"$BROWSER" = x"" ]; then > BROWSER=www-browser:links2:elinks:links:lynx:w3m >- if [ -n "$DISPLAY" ]; then >+ 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 >++ BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chrome:chromium-browser:google-chrome:$BROWSER > fi > fi > >Index: files/patch-scripts_xdg-icon-resource.in >=================================================================== >--- files/patch-scripts_xdg-icon-resource.in (revision 488281) >+++ files/patch-scripts_xdg-icon-resource.in (working copy) >@@ -1,6 +1,6 @@ >---- scripts/xdg-icon-resource.in.orig 2016-01-27 22:13:25.171381000 +0100 >-+++ scripts/xdg-icon-resource.in 2016-01-27 22:13:51.264266000 +0100 >-@@ -222,7 +222,7 @@ >+--- scripts/xdg-icon-resource.in.orig 2019-01-08 19:02:17 UTC >++++ scripts/xdg-icon-resource.in >+@@ -222,7 +222,7 @@ xdg_user_dir="$xdg_user_dir/$xdg_dir_name" > xdg_global_dir= > xdg_global_prefix= > xdg_system_dirs="$XDG_DATA_DIRS" >Index: files/patch-scripts_xdg-mime.in >=================================================================== >--- files/patch-scripts_xdg-mime.in (revision 488281) >+++ files/patch-scripts_xdg-mime.in (working copy) >@@ -1,42 +1,43 @@ >---- scripts/xdg-mime.in.orig 2016-01-27 22:14:36.041781000 +0100 >-+++ scripts/xdg-mime.in 2016-01-27 22:17:25.276625000 +0100 >-@@ -315,7 +315,7 @@ >+--- 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/ >++ [ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/share/:/usr/share/ > > preference=-1 > desktop_file="" >-@@ -389,7 +389,7 @@ >+@@ -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/ >++ [ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/share/:/usr/share/ > > local oldifs="$IFS" dir > >-@@ -492,7 +492,7 @@ >+@@ -500,7 +500,7 @@ case $1 in > ;; > esac > check_input_file "$filename" > - filename=`readlink -f -- "$filename"` >-+ filename=`stat -f "$filename"` >++ filename=`readlink -f -- "$filename"` > ;; > > default) >-@@ -694,7 +694,7 @@ >+@@ -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" >-@@ -726,7 +726,7 @@ >+@@ -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" >Index: files/patch-scripts_xdg-open.in >=================================================================== >--- files/patch-scripts_xdg-open.in (revision 488281) >+++ files/patch-scripts_xdg-open.in (working copy) >@@ -1,5 +1,5 @@ >---- scripts/xdg-open.in.orig 2016-01-27 22:52:37.829535000 +0100 >-+++ scripts/xdg-open.in 2016-01-28 11:10:29.639949000 +0100 >+--- scripts/xdg-open.in.orig 2019-01-08 19:02:17 UTC >++++ scripts/xdg-open.in > @@ -15,6 +15,12 @@ > # > #--------------------------------------------- >@@ -7,56 +7,66 @@ > +# 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 >++ unset LD_PRELOAD > +fi > + > manualpage() > { > cat << _MANUALPAGE >-@@ -92,7 +98,7 @@ >+@@ -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) >++ file=$(echo "$file" | unvis -h) > fi > echo "$file" > } >-@@ -211,6 +217,17 @@ >+@@ -193,6 +199,17 @@ open_gnome() > fi > } > > +open_lumina() > +{ >-+ lumina-open "$1" >++ lumina-open "$1" > + >-+ if [ $? -eq 0 ]; then >-+ exit_success >-+ else >-+ exit_failure_operation_failed >-+ fi >++ if [ $? -eq 0 ]; then >++ exit_success >++ else >++ exit_failure_operation_failed >++ fi > +} > + >- #----------------------------------------- >- # Recursively search .desktop file >+ 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" > >-@@ -380,7 +397,7 @@ >+ 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 [ -n "$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 >+ 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 > >-@@ -472,6 +489,10 @@ >- open_mate "$url" >+@@ -535,6 +551,10 @@ case "$DE" in >+ gnome) >+ open_gnome "$url" > ;; >++ >++ lumina) >++ open_lumina "$url" >++ ;; > >-+ lumina) >-+ open_lumina "$url" >-+ ;; >-+ >- xfce) >- open_xfce "$url" >- ;; >+ mate) >+ open_mate "$url" >Index: files/patch-scripts_xdg-screensaver.in >=================================================================== >--- files/patch-scripts_xdg-screensaver.in (revision 488281) >+++ files/patch-scripts_xdg-screensaver.in (working copy) >@@ -1,12 +1,11 @@ >---- scripts/xdg-screensaver.in.orig 2016-01-27 22:18:04.068869000 +0100 >-+++ scripts/xdg-screensaver.in 2016-01-27 22:18:32.024901000 +0100 >-@@ -27,7 +27,9 @@ >- #@xdg-utils-common@ >+--- scripts/xdg-screensaver.in.orig 2019-01-08 19:02:17 UTC >++++ scripts/xdg-screensaver.in >+@@ -28,6 +28,9 @@ _USAGE > > # Check if we can use "mv -T" >--if mv -T ... ... 2>&1 | grep '\.\.\.' > /dev/null ; then >+ 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 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" >Index: files/patch-scripts_xdg-utils-common.in >=================================================================== >--- files/patch-scripts_xdg-utils-common.in (revision 488281) >+++ files/patch-scripts_xdg-utils-common.in (working copy) >@@ -1,55 +1,66 @@ >---- scripts/xdg-utils-common.in.orig 2016-01-27 22:52:37.833381000 +0100 >-+++ scripts/xdg-utils-common.in 2016-01-28 09:44:29.953139000 +0100 >-@@ -279,6 +279,44 @@ >+--- 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 > ;; >-+ Lumina) >-+ DE=lumina >-+ ;; >-+ X-Generic) >-+ DE=generic >-+ ;; >-+ esac >-+ fi >+- 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 > + >-+# 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 >- ;; >-@@ -294,6 +332,8 @@ >- elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; >+ if [ x"$DE" = x"" ]; then >+ # classic fallbacks >+ if [ x"$KDE_FULL_SESSION" != x"" ]; then DE=kde; >+@@ -320,6 +358,8 @@ 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; >-+ #Simple fallback for non-XDG window managers if Lumina is installed in the normal place (no heavy runtime dependencies) >+ 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
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=200934">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 234770
:
200934
|
201043