diff --git a/app-misc/mc/mc-4.8.28.recipe b/app-misc/mc/mc-4.8.28.recipe index edf866d2e..f7483b077 100644 --- a/app-misc/mc/mc-4.8.28.recipe +++ b/app-misc/mc/mc-4.8.28.recipe @@ -8,10 +8,10 @@ archives to be manipulated like real files." HOMEPAGE="https://www.midnight-commander.org/" COPYRIGHT="1994-2019, Free Software Foundation" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="http://ftp.midnight-commander.org/mc-$portVersion.tar.xz" CHECKSUM_SHA256="e994d9be9a7172e9ac4a4ad62107921f6aa312e668b056dfe5b8bcebbaf53803" -PATCHES="mc-4.8.26-ncurses-mouse.patch" +PATCHES="mc-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -38,8 +38,9 @@ REQUIRES=" lib:libglib_2.0$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix - lib:libncursesw$secondaryArchSuffix + lib:libslang$secondaryArchSuffix lib:libssh2$secondaryArchSuffix + lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -48,12 +49,14 @@ BUILD_REQUIRES=" devel:libglib_2.0$secondaryArchSuffix >= 0.38 devel:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix - devel:libncursesw$secondaryArchSuffix + devel:libslang$secondaryArchSuffix devel:libssh2$secondaryArchSuffix + devel:libssl$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:awk + cmd:diff cmd:find cmd:gcc$secondaryArchSuffix cmd:make @@ -70,14 +73,11 @@ PATCH() BUILD() { CFLAGS="-D_BSD_SOURCE -D_XOPEN_SOURCE_EXTENDED" \ - LIBS="-lnetwork -lbsd" runConfigure --omit-dirs binDir configure \ - --bindir=$commandBinDir \ + LIBS="-lnetwork -lbsd" \ + runConfigure --omit-dirs binDir ./configure \ + --bindir="$commandBinDir" \ --datarootdir="$dataRootDir" \ - --enable-vfs-smb \ - --with-smb-configdir="$settingsDir/samba" \ - --with-smb-codepagedir="$settingsDir/samba" \ - --with-homedir="$settingsDir/mc" \ - --with-screen=ncurses + --with-screen=slang make $jobArgs } diff --git a/app-misc/mc/patches/mc-4.8.26-ncurses-mouse.patch b/app-misc/mc/patches/mc-4.8.26-ncurses-mouse.patch deleted file mode 100644 index bde04c99b..000000000 --- a/app-misc/mc/patches/mc-4.8.26-ncurses-mouse.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix mouse-key input with ncurses6 in terminals without basic X10 mouse -support, at the cost of breaking it with ncurses5. See discussion in -https://midnight-commander.org/ticket/4144 . - ---- a/lib/tty/key.c -+++ b/lib/tty/key.c -@@ -2124,8 +2124,7 @@ - gboolean extended = c == MCKEY_EXTENDED_MOUSE; - - #ifdef KEY_MOUSE -- extended = extended || (c == KEY_MOUSE && xmouse_seq == NULL -- && xmouse_extended_seq != NULL); -+ extended = extended || (c == KEY_MOUSE && xmouse_extended_seq != NULL); - #endif /* KEY_MOUSE */ - - xmouse_get_event (event, extended); diff --git a/app-misc/mc/patches/mc-4.8.28.patchset b/app-misc/mc/patches/mc-4.8.28.patchset new file mode 100644 index 000000000..f63b5d201 --- /dev/null +++ b/app-misc/mc/patches/mc-4.8.28.patchset @@ -0,0 +1,204 @@ +From 33633f180bfa32573eac1632dd06bf88f594c216 Mon Sep 17 00:00:00 2001 +From: My Name +Date: Sun, 15 May 2022 15:02:00 -0600 +Subject: applying patch mc-4.8.26-ncurses-mouse.patch + + +diff --git a/lib/tty/key.c b/lib/tty/key.c +index dd893e9..230a761 100644 +--- a/lib/tty/key.c ++++ b/lib/tty/key.c +@@ -2114,8 +2114,7 @@ tty_get_event (struct Gpm_Event *event, gboolean redo_event, gboolean block) + gboolean extended = c == MCKEY_EXTENDED_MOUSE; + + #ifdef KEY_MOUSE +- extended = extended || (c == KEY_MOUSE && xmouse_seq == NULL +- && xmouse_extended_seq != NULL); ++ extended = extended || (c == KEY_MOUSE && xmouse_extended_seq != NULL); + #endif /* KEY_MOUSE */ + + xmouse_get_event (event, extended); +-- +2.35.1 + + +From 9bcd48318941dbf55e19900d87f90995775c3ba3 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Sun, 15 May 2022 15:19:24 -0600 +Subject: use the 'open' command on Haiku + + +diff --git a/misc/ext.d/archive.sh b/misc/ext.d/archive.sh +index 840fd47..69f4a2d 100755 +--- a/misc/ext.d/archive.sh ++++ b/misc/ext.d/archive.sh +@@ -8,7 +8,13 @@ action=$1 + filetype=$2 + pager=$3 + +-[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open" ++if [ -z "${MC_XDG_OPEN}" ]; then ++ if [[ "$OSTYPE" = "haiku" ]]; then ++ MC_XDG_OPEN="open" ++ else ++ MC_XDG_OPEN="xdg-open" ++ fi ++fi + + do_view_action() { + filetype=$1 +diff --git a/misc/ext.d/doc.sh.in b/misc/ext.d/doc.sh.in +index c296ca2..3bd3b15 100644 +--- a/misc/ext.d/doc.sh.in ++++ b/misc/ext.d/doc.sh.in +@@ -6,7 +6,13 @@ + action=$1 + filetype=$2 + +-[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open" ++if [ -z "${MC_XDG_OPEN}" ]; then ++ if [[ "$OSTYPE" = "haiku" ]]; then ++ MC_XDG_OPEN="open" ++ else ++ MC_XDG_OPEN="xdg-open" ++ fi ++fi + + STAROFFICE_REGEXP='\.(sxw|sdw|stw|sxc|stc|sxi|sti|sxd|std||sxm||sxg)$' + +diff --git a/misc/ext.d/image.sh b/misc/ext.d/image.sh +index 04307e0..51c6c3a 100755 +--- a/misc/ext.d/image.sh ++++ b/misc/ext.d/image.sh +@@ -6,7 +6,13 @@ + action=$1 + filetype=$2 + +-[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open" ++if [ -z "${MC_XDG_OPEN}" ]; then ++ if [[ "$OSTYPE" = "haiku" ]]; then ++ MC_XDG_OPEN="open" ++ else ++ MC_XDG_OPEN="xdg-open" ++ fi ++fi + + do_view_action() { + filetype=$1 +diff --git a/misc/ext.d/misc.sh.in b/misc/ext.d/misc.sh.in +index c096240..01183ca 100644 +--- a/misc/ext.d/misc.sh.in ++++ b/misc/ext.d/misc.sh.in +@@ -6,7 +6,13 @@ + action=$1 + filetype=$2 + +-[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open" ++if [ -z "${MC_XDG_OPEN}" ]; then ++ if [[ "$OSTYPE" = "haiku" ]]; then ++ MC_XDG_OPEN="open" ++ else ++ MC_XDG_OPEN="xdg-open" ++ fi ++fi + + do_view_action() { + filetype=$1 +diff --git a/misc/ext.d/package.sh b/misc/ext.d/package.sh +index fc1aa1f..78aeaa2 100755 +--- a/misc/ext.d/package.sh ++++ b/misc/ext.d/package.sh +@@ -6,7 +6,13 @@ + action=$1 + filetype=$2 + +-[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open" ++if [ -z "${MC_XDG_OPEN}" ]; then ++ if [[ "$OSTYPE" = "haiku" ]]; then ++ MC_XDG_OPEN="open" ++ else ++ MC_XDG_OPEN="xdg-open" ++ fi ++fi + + do_view_action() { + filetype=$1 +diff --git a/misc/ext.d/sound.sh b/misc/ext.d/sound.sh +index 60a3cdd..04048b7 100755 +--- a/misc/ext.d/sound.sh ++++ b/misc/ext.d/sound.sh +@@ -6,7 +6,13 @@ + action=$1 + filetype=$2 + +-[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open" ++if [ -z "${MC_XDG_OPEN}" ]; then ++ if [[ "$OSTYPE" = "haiku" ]]; then ++ MC_XDG_OPEN="open" ++ else ++ MC_XDG_OPEN="xdg-open" ++ fi ++fi + + do_view_action() { + filetype=$1 +diff --git a/misc/ext.d/text.sh.in b/misc/ext.d/text.sh.in +index 2bd6ca0..5253a68 100644 +--- a/misc/ext.d/text.sh.in ++++ b/misc/ext.d/text.sh.in +@@ -8,7 +8,13 @@ action=$1 + filetype=$2 + pager=$3 + +-[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open" ++if [ -z "${MC_XDG_OPEN}" ]; then ++ if [[ "$OSTYPE" = "haiku" ]]; then ++ MC_XDG_OPEN="open" ++ else ++ MC_XDG_OPEN="xdg-open" ++ fi ++fi + + get_unpacker() { + filetype=$1 +diff --git a/misc/ext.d/video.sh b/misc/ext.d/video.sh +index 9cba210..4e4d399 100755 +--- a/misc/ext.d/video.sh ++++ b/misc/ext.d/video.sh +@@ -6,7 +6,13 @@ + action=$1 + filetype=$2 + +-[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open" ++if [ -z "${MC_XDG_OPEN}" ]; then ++ if [[ "$OSTYPE" = "haiku" ]]; then ++ MC_XDG_OPEN="open" ++ else ++ MC_XDG_OPEN="xdg-open" ++ fi ++fi + + do_view_action() { + filetype=$1 +diff --git a/misc/ext.d/web.sh.in b/misc/ext.d/web.sh.in +index 17d7e63..0de0082 100644 +--- a/misc/ext.d/web.sh.in ++++ b/misc/ext.d/web.sh.in +@@ -6,7 +6,13 @@ + action=$1 + filetype=$2 + +-[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open" ++if [ -z "${MC_XDG_OPEN}" ]; then ++ if [[ "$OSTYPE" = "haiku" ]]; then ++ MC_XDG_OPEN="open" ++ else ++ MC_XDG_OPEN="xdg-open" ++ fi ++fi + + do_view_action() { + filetype=$1 +-- +2.35.1 +