diff --git a/x11-misc/xdg-utils/patches/xdg-utils-1.1.3.patchset b/x11-misc/xdg-utils/patches/xdg_utils-1.2.1.patchset similarity index 85% rename from x11-misc/xdg-utils/patches/xdg-utils-1.1.3.patchset rename to x11-misc/xdg-utils/patches/xdg_utils-1.2.1.patchset index f3918848a..901f2d3c3 100644 --- a/x11-misc/xdg-utils/patches/xdg-utils-1.1.3.patchset +++ b/x11-misc/xdg-utils/patches/xdg_utils-1.2.1.patchset @@ -1,21 +1,11 @@ -From 08331dfbe0716f91df47043c5f4749a7c77bede3 Mon Sep 17 00:00:00 2001 +From 67fb1181bfcca7b90a8126e2fc7b534910368414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 19 Nov 2018 21:40:33 +0100 -Subject: [PATCH 1/2] Add Haiku support +Subject: Add Haiku support ---- - scripts/xdg-copy.in | 21 +++++ - scripts/xdg-email.in | 30 ++++++++ - scripts/xdg-file-dialog.in | 148 ++++++++++++++++++++++++++++++++++++ - scripts/xdg-open.in | 15 ++++ - scripts/xdg-screensaver.in | 56 +++++++++++++- - scripts/xdg-settings.in | 54 +++++++++++++ - scripts/xdg-terminal.in | 19 +++++ - scripts/xdg-utils-common.in | 36 +++++++++ - 8 files changed, 377 insertions(+), 2 deletions(-) diff --git a/scripts/xdg-copy.in b/scripts/xdg-copy.in -index 12317b6..dc8b2a1 100644 +index bff5c40..b0248f6 100644 --- a/scripts/xdg-copy.in +++ b/scripts/xdg-copy.in @@ -58,6 +58,23 @@ copy_gnome() @@ -54,10 +44,10 @@ index 12317b6..dc8b2a1 100644 exit_failure_operation_impossible "no method available for copying '$source' to '$dest'" ;; diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in -index 6db58ad..fd5a568 100644 +index 73898a4..a3d6c5c 100644 --- a/scripts/xdg-email.in +++ b/scripts/xdg-email.in -@@ -234,6 +234,32 @@ open_flatpak() +@@ -261,6 +261,32 @@ open_flatpak() fi } @@ -90,22 +80,22 @@ index 6db58ad..fd5a568 100644 open_generic() { local client -@@ -484,6 +510,10 @@ case "$DE" in - open_flatpak "$url" +@@ -483,6 +509,10 @@ case "$DE" in + open_flatpak "${mailto}" ;; + haiku) + open_haiku "${mailto}" + ;; + - generic|lxqt|enlightenment) + generic|enlightenment) open_generic "${mailto}" ;; diff --git a/scripts/xdg-file-dialog.in b/scripts/xdg-file-dialog.in -index 2b17fd5..cd472d6 100644 +index 5b914f9..07698e5 100644 --- a/scripts/xdg-file-dialog.in +++ b/scripts/xdg-file-dialog.in -@@ -85,6 +85,39 @@ open_zenity() +@@ -83,6 +83,39 @@ open_zenity() fi } @@ -144,8 +134,8 @@ index 2b17fd5..cd472d6 100644 + open_multi_kde() { - DIALOG=`which kdialog` -@@ -143,6 +176,39 @@ open_multi_zenity() + if DIALOG=`command -v kdialog`; then +@@ -139,6 +172,39 @@ open_multi_zenity() fi } @@ -184,8 +174,8 @@ index 2b17fd5..cd472d6 100644 + save_kde() { - DIALOG=`which kdialog` -@@ -199,6 +265,39 @@ save_zenity() + if DIALOG=`command -v kdialog`; then +@@ -193,6 +259,39 @@ save_zenity() fi } @@ -224,8 +214,8 @@ index 2b17fd5..cd472d6 100644 + directory_kde() { - DIALOG=`which kdialog` -@@ -243,6 +342,39 @@ directory_zenity() + if DIALOG=`command -v kdialog`; then +@@ -235,6 +334,39 @@ directory_zenity() fi } @@ -265,7 +255,7 @@ index 2b17fd5..cd472d6 100644 [ x"$1" != x"" ] || exit_failure_syntax TITLE= -@@ -316,6 +448,10 @@ if [ "$action" = "openfilename" ]; then +@@ -308,6 +440,10 @@ if [ "$action" = "openfilename" ]; then open_zenity "$filename" ;; @@ -276,7 +266,7 @@ index 2b17fd5..cd472d6 100644 *) exit_failure_operation_impossible "no method available for opening a filename dialog" ;; -@@ -330,6 +466,10 @@ elif [ "$action" = "openfilenamelist" ]; then +@@ -322,6 +458,10 @@ elif [ "$action" = "openfilenamelist" ]; then open_multi_zenity "$filename" ;; @@ -287,7 +277,7 @@ index 2b17fd5..cd472d6 100644 *) exit_failure_operation_impossible "no method available for opening a filename dialog" ;; -@@ -344,6 +484,10 @@ elif [ "$action" = "savefilename" ]; then +@@ -336,6 +476,10 @@ elif [ "$action" = "savefilename" ]; then save_zenity "$filename" ;; @@ -298,7 +288,7 @@ index 2b17fd5..cd472d6 100644 *) exit_failure_operation_impossible "no method available for opening a filename dialog" ;; -@@ -358,6 +502,10 @@ elif [ "$action" = "directory" ]; then +@@ -350,6 +494,10 @@ elif [ "$action" = "directory" ]; then directory_zenity "$filename" ;; @@ -310,10 +300,10 @@ index 2b17fd5..cd472d6 100644 exit_failure_operation_impossible "no method available for opening a directory dialog" ;; diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index 4928538..83c5edf 100644 +index feacc1f..f3b2a3c 100755 --- a/scripts/xdg-open.in +++ b/scripts/xdg-open.in -@@ -119,6 +119,17 @@ open_darwin() +@@ -143,6 +143,17 @@ open_darwin() fi } @@ -331,8 +321,8 @@ index 4928538..83c5edf 100644 open_kde() { if [ -n "${KDE_SESSION_VERSION}" ]; then -@@ -568,6 +579,10 @@ case "$DE" in - open_flatpak "$url" +@@ -661,6 +672,10 @@ case "$DE" in + open_wsl "$url" ;; + haiku) @@ -343,7 +333,7 @@ index 4928538..83c5edf 100644 open_generic "$url" ;; diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in -index 9e68196..9fda213 100644 +index e70942f..ef3a409 100644 --- a/scripts/xdg-screensaver.in +++ b/scripts/xdg-screensaver.in @@ -70,7 +70,7 @@ perform_action() @@ -364,7 +354,7 @@ index 9e68196..9fda213 100644 if xset -q | grep 'DPMS is Enabled' > /dev/null 2> /dev/null; then xset -dpms xset +dpms -@@ -118,6 +118,10 @@ perform_action() +@@ -123,6 +123,10 @@ perform_action() [ -n "$DISPLAY" ] && screensaver_xserver "$1" ;; @@ -375,7 +365,7 @@ index 9e68196..9fda213 100644 ''|generic) [ -n "$DISPLAY" ] && screensaver_xserver "$1" ;; -@@ -827,6 +831,54 @@ xautolock_screensaver() +@@ -821,6 +825,54 @@ xautolock_screensaver() esac } @@ -431,10 +421,10 @@ index 9e68196..9fda213 100644 action= diff --git a/scripts/xdg-settings.in b/scripts/xdg-settings.in -index 3781de8..c0c61d1 100644 +index 93ff352..2796bcc 100755 --- a/scripts/xdg-settings.in +++ b/scripts/xdg-settings.in -@@ -471,6 +471,60 @@ set_browser_xfce() +@@ -569,6 +569,60 @@ set_browser_xfce() } # }}} xfce @@ -496,10 +486,10 @@ index 3781de8..c0c61d1 100644 get_browser_generic() diff --git a/scripts/xdg-terminal.in b/scripts/xdg-terminal.in -index f67897d..02ebbc1 100644 +index aea98de..42fd47f 100644 --- a/scripts/xdg-terminal.in +++ b/scripts/xdg-terminal.in -@@ -127,6 +127,21 @@ terminal_xfce() +@@ -152,6 +152,21 @@ terminal_xfce() fi } @@ -521,7 +511,7 @@ index f67897d..02ebbc1 100644 terminal_generic() { # if $TERM is a known non-command, use hard-coded fallbacks -@@ -266,6 +281,10 @@ case "$DE" in +@@ -291,6 +306,10 @@ case "$DE" in terminal_enlightenment "$command" ;; @@ -533,10 +523,10 @@ index f67897d..02ebbc1 100644 terminal_generic "$command" ;; diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in -index b4333e2..b1fabe4 100644 +index e1e9273..44f578a 100644 --- a/scripts/xdg-utils-common.in +++ b/scripts/xdg-utils-common.in -@@ -87,6 +87,35 @@ desktop_file_to_binary() +@@ -89,6 +89,35 @@ desktop_file_to_binary() done } @@ -572,25 +562,25 @@ index b4333e2..b1fabe4 100644 #------------------------------------------------------------- # Exit script on successfully completing the desired operation -@@ -314,6 +343,7 @@ detectDE() - if [ x"$KDE_FULL_SESSION" != x"" ]; then DE=kde; - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif [ x"$MATE_DESKTOP_SESSION_ID" != x"" ]; then DE=mate; +@@ -323,6 +352,7 @@ detectDE() + if [ -n "$KDE_FULL_SESSION" ]; then DE=kde; + elif [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then DE=gnome; + elif [ -n "$MATE_DESKTOP_SESSION_ID" ]; then DE=mate; + elif [ x"$BE_HOST_CPU" != x"" ]; then DE=haiku; - elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; + elif dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1 ; then DE=gnome; 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 -@@ -349,6 +379,9 @@ detectDE() +@@ -358,6 +388,9 @@ detectDE() Darwin) DE=darwin; ;; + Haiku) + DE=haiku; + ;; - esac - fi - -@@ -382,11 +415,14 @@ kfmclient_fix_exit_code() + Linux) + grep -q microsoft /proc/version > /dev/null 2>&1 && \ + command -v explorer.exe > /dev/null 2>&1 && \ +@@ -396,11 +429,14 @@ kfmclient_fix_exit_code() #---------------------------------------------------------------------------- # Returns true if there is a graphical display attached. @@ -606,24 +596,21 @@ index b4333e2..b1fabe4 100644 return 1 fi -- -2.19.1 +2.45.2 -From 741e1302e8a25c34692f34622b091677b2ef758c Mon Sep 17 00:00:00 2001 +From 287269791b75c60527d08c6e9d35747a61ec6abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 19 Nov 2018 23:43:33 +0100 -Subject: [PATCH 2/2] Fix iconv arg +Subject: Fix iconv arg there's no "utf8" in iconv -l ---- - scripts/xdg-email.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in -index fd5a568..4436a62 100644 +index a3d6c5c..e9ff374 100644 --- a/scripts/xdg-email.in +++ b/scripts/xdg-email.in -@@ -340,7 +340,7 @@ LC_ALL="$ORIG_LC_ALL" +@@ -343,7 +343,7 @@ LC_ALL="$ORIG_LC_ALL" options= mailto= @@ -633,5 +620,5 @@ index fd5a568..4436a62 100644 parm="$1" shift -- -2.19.1 +2.45.2 diff --git a/x11-misc/xdg-utils/xdg_utils-1.1.3.recipe b/x11-misc/xdg-utils/xdg_utils-1.2.1.recipe similarity index 81% rename from x11-misc/xdg-utils/xdg_utils-1.1.3.recipe rename to x11-misc/xdg-utils/xdg_utils-1.2.1.recipe index 1afdfd4cf..241b6813c 100644 --- a/x11-misc/xdg-utils/xdg_utils-1.1.3.recipe +++ b/x11-misc/xdg-utils/xdg_utils-1.2.1.recipe @@ -14,10 +14,11 @@ COPYRIGHT="2006 Benedikt Meurer 2009 Google Inc." LICENSE="MIT" REVISION="1" -SOURCE_URI="https://portland.freedesktop.org/download/xdg-utils-$portVersion.tar.gz" -CHECKSUM_SHA256="d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9" -SOURCE_DIR="xdg-utils-$portVersion" -PATCHES="xdg-utils-$portVersion.patchset" +SOURCE_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v$portVersion/xdg-utils-v$portVersion.tar.bz2" +CHECKSUM_SHA256="93d510dccf328378f012fe195b4574c2fac1cd65a74d0852d6eaa72e5a2065a7" +SOURCE_FILENAME="xdg-utils-v$portVersion" +SOURCE_DIR="xdg-utils-v$portVersion" +PATCHES="xdg_utils-$portVersion.patchset" ARCHITECTURES="any"