diff --git a/app-misc/mc/mc-4.8.31.recipe b/app-misc/mc/mc-4.8.32.recipe similarity index 88% rename from app-misc/mc/mc-4.8.31.recipe rename to app-misc/mc/mc-4.8.32.recipe index a585efeba..060cacd95 100644 --- a/app-misc/mc/mc-4.8.31.recipe +++ b/app-misc/mc/mc-4.8.32.recipe @@ -10,7 +10,7 @@ COPYRIGHT="1994-2019, Free Software Foundation" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="http://ftp.midnight-commander.org/mc-$portVersion.tar.xz" -CHECKSUM_SHA256="24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a" +CHECKSUM_SHA256="4ddc83d1ede9af2363b3eab987f54b87cf6619324110ce2d3a0e70944d1359fe" PATCHES="mc-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -51,7 +51,7 @@ BUILD_REQUIRES=" devel:libintl$secondaryArchSuffix devel:libslang$secondaryArchSuffix devel:libssh2$secondaryArchSuffix - devel:libssl$secondaryArchSuffix + devel:libssl$secondaryArchSuffix >= 3 devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -72,11 +72,14 @@ PATCH() BUILD() { - CFLAGS="-D_BSD_SOURCE -D_XOPEN_SOURCE_EXTENDED" \ + # -Wno-cpp is to avoid major()/minor()/makedev() warnings. + CFLAGS="-D_BSD_SOURCE -D_XOPEN_SOURCE_EXTENDED -Wno-cpp" \ LIBS="-lnetwork -lbsd" \ runConfigure --omit-dirs binDir ./configure \ --bindir="$commandBinDir" \ --datarootdir="$dataRootDir" \ + --disable-dependency-tracking \ + --enable-static=no \ --with-screen=slang make $jobArgs } diff --git a/app-misc/mc/patches/mc-4.8.31.patchset b/app-misc/mc/patches/mc-4.8.32.patchset similarity index 92% rename from app-misc/mc/patches/mc-4.8.31.patchset rename to app-misc/mc/patches/mc-4.8.32.patchset index f63b5d201..1c678517c 100644 --- a/app-misc/mc/patches/mc-4.8.31.patchset +++ b/app-misc/mc/patches/mc-4.8.32.patchset @@ -1,14 +1,14 @@ -From 33633f180bfa32573eac1632dd06bf88f594c216 Mon Sep 17 00:00:00 2001 +From a3dd5603c633d9e341beca8b573eb0b6855f208b 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 +index c64c0e7..28f0141 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) +@@ -2107,8 +2107,7 @@ tty_get_event (struct Gpm_Event *event, gboolean redo_event, gboolean block) gboolean extended = c == MCKEY_EXTENDED_MOUSE; #ifdef KEY_MOUSE @@ -19,17 +19,17 @@ index dd893e9..230a761 100644 xmouse_get_event (event, extended); -- -2.35.1 +2.45.2 -From 9bcd48318941dbf55e19900d87f90995775c3ba3 Mon Sep 17 00:00:00 2001 +From 7d607e4a27aad0495d87fb60f77ef54796c55944 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 +index 12beb01..026481c 100755 --- a/misc/ext.d/archive.sh +++ b/misc/ext.d/archive.sh @@ -8,7 +8,13 @@ action=$1 @@ -67,7 +67,7 @@ index c296ca2..3bd3b15 100644 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 +index c191225..0ed194a 100755 --- a/misc/ext.d/image.sh +++ b/misc/ext.d/image.sh @@ -6,7 +6,13 @@ @@ -86,7 +86,7 @@ index 04307e0..51c6c3a 100755 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 +index 822cf2b..077dc7b 100644 --- a/misc/ext.d/misc.sh.in +++ b/misc/ext.d/misc.sh.in @@ -6,7 +6,13 @@ @@ -143,7 +143,7 @@ index 60a3cdd..04048b7 100755 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 +index 357f9e1..8ff3c66 100644 --- a/misc/ext.d/text.sh.in +++ b/misc/ext.d/text.sh.in @@ -8,7 +8,13 @@ action=$1 @@ -200,5 +200,5 @@ index 17d7e63..0de0082 100644 do_view_action() { filetype=$1 -- -2.35.1 +2.45.2