Attachment 232483 Details for Bug 262592 – patch

[patch] patch

0001-games-spring-switch-from-p7zip-to-7-Zip.patch (text/plain), 1.65 KB, created by Max Brazhnikov on 2022-03-16 13:45:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max Brazhnikov

Created: 2022-03-16 13:45:12 UTC

Size: 1.65 KB

patch

obsolete

>From ee30a380f77a2e3a2bf8d9abb0368488610b0464 Mon Sep 17 00:00:00 2001
>From: Max Brazhnikov <makc@FreeBSD.org>
>Date: Wed, 16 Mar 2022 16:36:09 +0300
>Subject: games/spring: switch from p7zip to 7-Zip
>
>---
> games/spring/Makefile                                 |  2 +-
> .../files/patch-rts_build_cmake_FindSevenZip.cmake    | 11 +++++++++++
> 2 files changed, 12 insertions(+), 1 deletion(-)
> create mode 100644 games/spring/files/patch-rts_build_cmake_FindSevenZip.cmake
>
>diff --git a/games/spring/Makefile b/games/spring/Makefile
>index bdb8c17f7c19..0e25bcea07d6 100644
>--- a/games/spring/Makefile
>+++ b/games/spring/Makefile
>@@ -18,7 +18,7 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
> 		libcurl.so:ftp/curl \
> 		libunwind.so:devel/libunwind \
> 		libjsoncpp.so:devel/jsoncpp
>-BUILD_DEPENDS=	7z:archivers/p7zip
>+BUILD_DEPENDS=	7zz:archivers/7-zip
> 
> BROKEN_FreeBSD_12=	ld: error: undefined symbol: streflop_libm::__inline_isnanf(float)
> ONLY_FOR_ARCHS=		amd64
>diff --git a/games/spring/files/patch-rts_build_cmake_FindSevenZip.cmake b/games/spring/files/patch-rts_build_cmake_FindSevenZip.cmake
>new file mode 100644
>index 000000000000..1a3cf100aa9a
>--- /dev/null
>+++ b/games/spring/files/patch-rts_build_cmake_FindSevenZip.cmake
>@@ -0,0 +1,11 @@
>+--- rts/build/cmake/FindSevenZip.cmake.orig	2020-12-26 12:45:43 UTC
>++++ rts/build/cmake/FindSevenZip.cmake
>+@@ -23,7 +23,7 @@ ENDIF (SEVENZIP_BIN)
>+ set(progfilesx86 "ProgramFiles(x86)")
>+ 
>+ find_program(SEVENZIP_BIN
>+-	NAMES 7z 7za
>++	NAMES 7zz 7z 7za
>+ 	HINTS "${MINGWDIR}" "${MINGWLIBS}/bin" "$ENV{${progfilesx86}}/7-zip" "$ENV{ProgramFiles}/7-zip" "$ENV{ProgramW6432}/7-zip"
>+ 	PATH_SUFFIXES bin
>+ 	DOC "7zip executable"
>-- 
>2.35.1
>

Actions: View | Diff

Attachments on bug 262592: 232483