Mageia Bugzilla – Attachment 14443 Details for
Bug 32949
xdg-open fails completely in cauldron.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
rediff xdg-utils patches
xdg-utils-rediff-patches.patch (text/plain), 3.64 KB, created by
Aurelian R
on 2024-03-08 00:10:22 CET
(
hide
)
Description:
rediff xdg-utils patches
Filename:
MIME Type:
Creator:
Aurelian R
Created:
2024-03-08 00:10:22 CET
Size:
3.64 KB
patch
obsolete
>diff -Nurp SOURCES/0001-xdg-email-remove-attachment-handling-from-mailto.patch SOURCES/0001-xdg-email-remove-attachment-handling-from-mailto.patch >--- SOURCES/0001-xdg-email-remove-attachment-handling-from-mailto.patch 2024-03-07 23:23:38.859338634 +0200 >+++ SOURCES/0001-xdg-email-remove-attachment-handling-from-mailto.patch 2024-03-07 23:01:18.371870489 +0200 >@@ -29,27 +29,16 @@ index 6db58ad..5d2f4f3 100644 > - local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY ATTACH > + local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY > THUNDERBIRD="$1" >- MAILTO=$(echo "$2" | sed 's/^mailto://') >+ MAILTO="$(echo "$2" | sed 's/^mailto://')" > echo "$MAILTO" | grep -qs "^?" > @@ -48,7 +48,6 @@ 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/,$//')) >+ 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/,$//')")" > > if [ -z "$TO" ] ; then > NEWMAILTO= >-@@ -68,10 +67,6 @@ run_thunderbird() >- NEWMAILTO="${NEWMAILTO},$BODY" >- fi >- >-- if [ -n "$ATTACH" ] ; then >-- NEWMAILTO="${NEWMAILTO},attachment='${ATTACH}'" >-- fi >-- >- NEWMAILTO=$(echo "$NEWMAILTO" | sed 's/^,//') >- DEBUG 1 "Running $THUNDERBIRD -compose \"$NEWMAILTO\"" >- "$THUNDERBIRD" -compose "$NEWMAILTO" > -- > 2.29.2 > >diff -Nurp SOURCES/xdg-utils-1.1.0-rc3-email_silent_errors.patch SOURCES/xdg-utils-1.1.0-rc3-email_silent_errors.patch >--- SOURCES/xdg-utils-1.1.0-rc3-email_silent_errors.patch 2024-03-07 23:23:38.861338662 +0200 >+++ SOURCES/xdg-utils-1.1.0-rc3-email_silent_errors.patch 2024-03-07 22:50:27.756929636 +0200 >@@ -24,13 +24,13 @@ diff -up ./scripts/xdg-utils-common.in.o > exit_failure_operation_failed() > { > if [ $# -gt 0 ]; then >-- echo "@NAME@: $@" >&2 >+- echo "@NAME@: $*" >&2 > + if which zenity > /dev/null 2> /dev/null; then >-+ zenity --error --text="@NAME@: $@" >++ zenity --error --text="@NAME@: $*" > + elif which kdialog > /dev/null 2> /dev/null; then >-+ kdialog --error "@NAME@: $@" >++ kdialog --error "@NAME@: $*" > + else >-+ echo "@NAME@: $@" >&2 >++ echo "@NAME@: $*" >&2 > + fi > fi > >diff -Nurp SOURCES/xdg-utils-1.1.1-email_loop.patch SOURCES/xdg-utils-1.1.1-email_loop.patch >--- SOURCES/xdg-utils-1.1.1-email_loop.patch 2024-03-07 23:23:38.861338662 +0200 >+++ SOURCES/xdg-utils-1.1.1-email_loop.patch 2024-03-07 22:48:35.504392156 +0200 >@@ -5,13 +5,13 @@ diff -up ./scripts/xdg-utils-common.in.o > exit_failure_operation_impossible() > { > if [ $# -gt 0 ]; then >-- echo "@NAME@: $@" >&2 >+- echo "@NAME@: $*" >&2 > + if which zenity > /dev/null 2> /dev/null; then >-+ zenity --error --text="@NAME@: $@" >++ zenity --error --text="@NAME@: $*" > + elif which kdialog > /dev/null 2> /dev/null; then >-+ kdialog --error "@NAME@: $@" >++ kdialog --error "@NAME@: $*" > + else >-+ echo "@NAME@: $@" >&2 >++ echo "@NAME@: $*" >&2 > + fi > fi >
diff -Nurp SOURCES/0001-xdg-email-remove-attachment-handling-from-mailto.patch SOURCES/0001-xdg-email-remove-attachment-handling-from-mailto.patch --- SOURCES/0001-xdg-email-remove-attachment-handling-from-mailto.patch 2024-03-07 23:23:38.859338634 +0200 +++ SOURCES/0001-xdg-email-remove-attachment-handling-from-mailto.patch 2024-03-07 23:01:18.371870489 +0200 @@ -29,27 +29,16 @@ index 6db58ad..5d2f4f3 100644 - local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY ATTACH + local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY THUNDERBIRD="$1" - MAILTO=$(echo "$2" | sed 's/^mailto://') + MAILTO="$(echo "$2" | sed 's/^mailto://')" echo "$MAILTO" | grep -qs "^?" @@ -48,7 +48,6 @@ 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/,$//')) + 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/,$//')")" if [ -z "$TO" ] ; then NEWMAILTO= -@@ -68,10 +67,6 @@ run_thunderbird() - NEWMAILTO="${NEWMAILTO},$BODY" - fi - -- if [ -n "$ATTACH" ] ; then -- NEWMAILTO="${NEWMAILTO},attachment='${ATTACH}'" -- fi -- - NEWMAILTO=$(echo "$NEWMAILTO" | sed 's/^,//') - DEBUG 1 "Running $THUNDERBIRD -compose \"$NEWMAILTO\"" - "$THUNDERBIRD" -compose "$NEWMAILTO" -- 2.29.2 diff -Nurp SOURCES/xdg-utils-1.1.0-rc3-email_silent_errors.patch SOURCES/xdg-utils-1.1.0-rc3-email_silent_errors.patch --- SOURCES/xdg-utils-1.1.0-rc3-email_silent_errors.patch 2024-03-07 23:23:38.861338662 +0200 +++ SOURCES/xdg-utils-1.1.0-rc3-email_silent_errors.patch 2024-03-07 22:50:27.756929636 +0200 @@ -24,13 +24,13 @@ diff -up ./scripts/xdg-utils-common.in.o exit_failure_operation_failed() { if [ $# -gt 0 ]; then -- echo "@NAME@: $@" >&2 +- echo "@NAME@: $*" >&2 + if which zenity > /dev/null 2> /dev/null; then -+ zenity --error --text="@NAME@: $@" ++ zenity --error --text="@NAME@: $*" + elif which kdialog > /dev/null 2> /dev/null; then -+ kdialog --error "@NAME@: $@" ++ kdialog --error "@NAME@: $*" + else -+ echo "@NAME@: $@" >&2 ++ echo "@NAME@: $*" >&2 + fi fi diff -Nurp SOURCES/xdg-utils-1.1.1-email_loop.patch SOURCES/xdg-utils-1.1.1-email_loop.patch --- SOURCES/xdg-utils-1.1.1-email_loop.patch 2024-03-07 23:23:38.861338662 +0200 +++ SOURCES/xdg-utils-1.1.1-email_loop.patch 2024-03-07 22:48:35.504392156 +0200 @@ -5,13 +5,13 @@ diff -up ./scripts/xdg-utils-common.in.o exit_failure_operation_impossible() { if [ $# -gt 0 ]; then -- echo "@NAME@: $@" >&2 +- echo "@NAME@: $*" >&2 + if which zenity > /dev/null 2> /dev/null; then -+ zenity --error --text="@NAME@: $@" ++ zenity --error --text="@NAME@: $*" + elif which kdialog > /dev/null 2> /dev/null; then -+ kdialog --error "@NAME@: $@" ++ kdialog --error "@NAME@: $*" + else -+ echo "@NAME@: $@" >&2 ++ echo "@NAME@: $*" >&2 + fi fi
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 32949
:
14442
| 14443