git: ee47ad9a4abf - main - games/widelands: update 1.1 → 1.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 25 Dec 2024 19:12:11 UTC
The branch main has been updated by amdmi3:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ee47ad9a4abf058d78ff11655583d26316e417a6
commit ee47ad9a4abf058d78ff11655583d26316e417a6
Author: Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2024-04-02 17:42:10 +0000
Commit: Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2024-12-25 19:12:04 +0000
games/widelands: update 1.1 → 1.2
Not playtested yet, but the update is required for compatibility
with latest icu.
PR: 283576
Reported by: diizzy
---
games/widelands/Makefile | 6 ++--
games/widelands/distinfo | 6 ++--
games/widelands/files/patch-CMakeLists.txt | 33 +++++++++++++---------
.../widelands/files/patch-cmake_WlFunctions.cmake | 21 --------------
games/widelands/files/patch-src_CMakeLists.txt | 13 ---------
5 files changed, 26 insertions(+), 53 deletions(-)
diff --git a/games/widelands/Makefile b/games/widelands/Makefile
index 04c5e366a834..c14ab889d1fc 100644
--- a/games/widelands/Makefile
+++ b/games/widelands/Makefile
@@ -1,7 +1,6 @@
PORTNAME= widelands
DISTVERSIONPREFIX= v
-DISTVERSION= 1.1
-PORTREVISION= 11
+DISTVERSION= 1.2
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
@@ -44,6 +43,9 @@ LTO_CMAKE_ON= -DUSE_FLTO_IF_AVAILABLE:STRING="yes"
NLS_CMAKE_BOOL= OPTION_BUILD_TRANSLATIONS
TEST_CMAKE_BOOL=OPTION_BUILD_TESTS
+post-extract:
+ @${RM} -r ${WRKSRC}/src/third_party/minizip
+
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
${WRKSRC}/cmake/Modules/*.cmake
diff --git a/games/widelands/distinfo b/games/widelands/distinfo
index 207a16d63c30..18724690f854 100644
--- a/games/widelands/distinfo
+++ b/games/widelands/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666614684
-SHA256 (widelands-widelands-v1.1_GH0.tar.gz) = 6853fcf3daec9b66005691e5bcb00326634baf0985ad89a7e6511502612f6412
-SIZE (widelands-widelands-v1.1_GH0.tar.gz) = 416104611
+TIMESTAMP = 1712068495
+SHA256 (widelands-widelands-v1.2_GH0.tar.gz) = c6bed3717c541276fbed8a33adce230a2637297588c719268fcb963e076210e2
+SIZE (widelands-widelands-v1.2_GH0.tar.gz) = 457713595
diff --git a/games/widelands/files/patch-CMakeLists.txt b/games/widelands/files/patch-CMakeLists.txt
index 1ed439243803..eeda6cbe5c97 100644
--- a/games/widelands/files/patch-CMakeLists.txt
+++ b/games/widelands/files/patch-CMakeLists.txt
@@ -1,15 +1,15 @@
---- CMakeLists.txt.orig 2022-10-22 11:51:16 UTC
+--- CMakeLists.txt.orig 2024-03-28 10:12:05 UTC
+++ CMakeLists.txt
-@@ -372,7 +372,7 @@ else()
+@@ -328,7 +328,7 @@ if(NOT MSVC)
endif()
if(NOT MSVC)
- if(CMAKE_BUILD_TYPE STREQUAL "Release")
-+ if(CMAKE_BUILD_TYPE STREQUAL "Release" OR TRUE)
++ if(TRUE OR CMAKE_BUILD_TYPE STREQUAL "Release")
message(STATUS "Compiler warnings will be ignored.")
- elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND
- (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0)) AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.2))
-@@ -403,12 +403,12 @@ endif()
+ elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (
+ ((NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0)) AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.2))
+@@ -360,12 +360,12 @@ if(USE_FLTO_IF_AVAILABLE STREQUAL "yes")
if(USE_FLTO_IF_AVAILABLE STREQUAL "yes")
# Cross-compile-unit optimization not supported by gcc with debug on!
# Therefore, this may only be done with Release builds.
@@ -25,16 +25,21 @@
#
# The execution jumps between compile units rather often. -flot allows optimization across
# comple units. Binary size reduced by >15% on tested environments. This does not directly
-@@ -499,7 +499,7 @@ endif (OPTION_BUILD_TESTS)
+@@ -479,13 +479,6 @@ endif (OPTION_BUILD_TESTS)
+ )
+ endif (OPTION_BUILD_TESTS)
- install (
- FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
+-install (
+- FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
- DESTINATION ${WL_INSTALL_BASEDIR}
-+ DESTINATION ${WL_INSTALL_DOCDIR}
- CONFIGURATIONS Debug;Release;None
- COMPONENT CoreVersionFile
- )
-@@ -556,10 +556,9 @@ install(
+- CONFIGURATIONS Debug;Release;None
+- COMPONENT CoreVersionFile
+-)
+-
+ # Installation.
+ add_subdirectory(doc)
+ if(OPTION_BUILD_TRANSLATIONS)
+@@ -538,10 +531,9 @@ install(
install(
FILES
diff --git a/games/widelands/files/patch-cmake_WlFunctions.cmake b/games/widelands/files/patch-cmake_WlFunctions.cmake
deleted file mode 100644
index 0a8caa0338ec..000000000000
--- a/games/widelands/files/patch-cmake_WlFunctions.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
---- cmake/WlFunctions.cmake.orig 2022-10-22 11:51:16 UTC
-+++ cmake/WlFunctions.cmake
-@@ -93,8 +93,8 @@ macro(_common_compile_tasks)
-
- if(ARG_USES_MINIZIP)
- if(MINIZIP_STATIC_LIBRARIES)
-- target_link_libraries(${NAME} minizip)
-- message(STATUS "Link ${NAME} with minizip")
-+ target_link_libraries(${NAME} ${MINIZIP_STATIC_LIBRARIES})
-+ message(STATUS "Link ${NAME} with ${MINIZIP_STATIC_LIBRARIES}")
- else()
- target_link_libraries(${NAME} third_party_minizip)
- message(STATUS "Link ${NAME} with third_party_minizip")
-@@ -103,7 +103,6 @@ macro(_common_compile_tasks)
-
- if(ARG_USES_ATOMIC AND NOT APPLE AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
- # clang on linux needs explicit linkage against standard library atomic
-- target_link_libraries(${NAME} atomic)
- endif()
-
- if(ARG_USES_ZLIB)
diff --git a/games/widelands/files/patch-src_CMakeLists.txt b/games/widelands/files/patch-src_CMakeLists.txt
deleted file mode 100644
index fe3463f0b938..000000000000
--- a/games/widelands/files/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/CMakeLists.txt.orig 2022-10-22 11:51:16 UTC
-+++ src/CMakeLists.txt
-@@ -77,7 +77,9 @@ else()
- # If pkg-config is ever needed to find other libraries, move the include outside the if() block
- include(FindPkgConfig)
- if(PKG_CONFIG_FOUND)
-- pkg_check_modules(MINIZIP minizip)
-+ pkg_check_modules(PC_MINIZIP minizip)
-+ find_path(MINIZIP_INCLUDE_DIRS NAMES mztools.h PATH_SUFFIXES minizip HINTS ${PC_MINIZIP_INCLUDE_DIRS})
-+ find_library(MINIZIP_STATIC_LIBRARIES NAMES minizip HINTS ${PC_MINIZIP_LIBRARY_DIRS})
- endif()
- endif()
-