widelands, bump version, switch to icu74 (#10084)

games-strategy/widelands/patches/widelands-1.1.patchset

@@ -1,39 +1,24 @@
-From b075822dac169dcccb7b1450a75883043210077f Mon Sep 17 00:00:00 2001
+From f4918317d25a6431d4ed4d73348c9aa1a11dc46c Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 11 Apr 2021 21:38:33 +1000
 Subject: Fix haiku build
 
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8091a17..b9799c0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -122,11 +122,7 @@ if (OPTION_BUILD_WINSTATIC)
- endif()
- set (Boost_USE_MULTITHREADED ON)
- set (Boost_DETAILED_FAILURE_MSG ON)
--find_package(Boost 1.48
--  COMPONENTS
--    unit_test_framework
--  REQUIRED
--    system)
-+find_package(Boost 1.48 REQUIRED)
- 
- find_package (PythonInterp REQUIRED)
- 
 diff --git a/src/logic/map_objects/backtrace.cc b/src/logic/map_objects/backtrace.cc
-index 71e1f4e..16794e8 100644
+index 07605c2..b7c91cf 100644
 --- a/src/logic/map_objects/backtrace.cc
 +++ b/src/logic/map_objects/backtrace.cc
-@@ -21,15 +21,18 @@
+@@ -20,17 +20,20 @@
  
  #ifndef _WIN32
  #ifndef __APPLE__
 +#ifndef __HAIKU__
+ #if !defined(__linux__) || defined(__GLIBC__)
  
  #include <execinfo.h>
  #endif
  #endif
+ #endif
 +#endif
  
  std::string get_backtrace() {
@@ -41,37 +26,41 @@ index 71e1f4e..16794e8 100644
  #ifndef _WIN32
  #ifndef __APPLE__
 +#ifndef __HAIKU__
+ #if !defined(__linux__) || defined(__GLIBC__)
  #define BACKTRACE_STACKSIZE 24
  
- 	void* stack[BACKTRACE_STACKSIZE];
-@@ -41,6 +44,7 @@ std::string get_backtrace() {
- 	}
+@@ -44,6 +47,7 @@ std::string get_backtrace() {
  	free(list);
  #endif
+ #endif
 +#endif
  #endif
  	return result;
  }
 diff --git a/src/network/network.h b/src/network/network.h
-index 7b61b01..b634a3c 100644
+index 6292ac5..3d540d6 100644
 --- a/src/network/network.h
 +++ b/src/network/network.h
-@@ -22,7 +22,15 @@
+@@ -19,9 +19,19 @@
+ #ifndef WL_NETWORK_NETWORK_H
+ #define WL_NETWORK_NETWORK_H
  
++
++
  #include <functional>
  
 +#ifdef __HAIKU__
 +#undef _BSD_SOURCE
 +#undef _DEFAULT_SOURCE
- #include <boost/asio.hpp>
++#endif
+ #include <asio.hpp>
++#ifdef __HAIKU__
 +#define _DEFAULT_SOURCE
 +#define _BSD_SOURCE
-+#else
-+#include <boost/asio.hpp>
 +#endif
- #include <boost/lexical_cast.hpp>
  
+ #include "base/string.h"
  #include "base/wexception.h"
 -- 
-2.30.2
+2.42.0
 

games-strategy/widelands/widelands-1.1.recipe

@@ -5,11 +5,11 @@ was inspired by Settlers II™ (© Bluebyte) but has significantly \
 more variety and depth to it. Still, it is easy to get started \
 through playable tutorials."
 HOMEPAGE="https://www.widelands.org/"
-COPYRIGHT="2009-2021 By the Widelands Development Team"
+COPYRIGHT="2009-2023 By the Widelands Development Team"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/widelands/widelands/archive/refs/tags/v$portVersion.tar.gz"
-CHECKSUM_SHA256="1dab0c4062873cc72c5e0558f9e9620b0ef185f1a78923a77c4ce5b9ed76031a"
+CHECKSUM_SHA256="6853fcf3daec9b66005691e5bcb00326634baf0985ad89a7e6511502612f6412"
 SOURCE_DIR="widelands-$portVersion"
 PATCHES="widelands-$portVersion.patchset"
 ADDITIONAL_FILES="widelands.rdef.in"
@@ -43,12 +43,13 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libboost_system$secondaryArchSuffix >= 1.69.0
+	devel:libasio$secondaryArchSuffix
+	devel:libboost_system$secondaryArchSuffix >= 1.83.0
 	devel:libcurl$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libglew$secondaryArchSuffix
 	devel:libGLU$secondaryArchSuffix
-	devel:libicuuc$secondaryArchSuffix >= 66
+	devel:libicuuc$secondaryArchSuffix >= 74
 	devel:libintl$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libopenal$secondaryArchSuffix
@@ -71,10 +72,12 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
+	mkdir -p $dataDir/WideLands
+
 	LDFLAGS="-lbsd -lnetwork -lintl" \
 		cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=$appsDir/WideLands \
-		-DWL_INSTALL_DATADIR=$appsDir/WideLands/data \
+		-DWL_INSTALL_DATADIR=$dataDir/WideLands \
 		-DOPTION_BUILD_WEBSITE_TOOLS=OFF \
 		-DOPTION_BUILD_TESTS=OFF \
 		-DOPTION_BUILD_CODECHECK=OFF \
@@ -88,8 +91,12 @@ INSTALL()
 {
 	make -C build install
 
-	mv $appsDir/WideLands/widelands $appsDir/WideLands/WideLands
-	rm -rf $appsDir/share
+	mv $appsDir/WideLands/VERSION $appsDir/WideLands/ChangeLog \
+		$appsDir/WideLands/CREDITS $appsDir/WideLands/COPYING \
+		$dataDir/WideLands
+	mv $appsDir/WideLands/games/widelands $appsDir/widelands
+	rm -rf $appsDir/WideLands
+	mv $appsDir/widelands $appsDir/WideLands
 
 	local APP_SIGNATURE="application/x-vnd.widelands"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
@@ -103,6 +110,6 @@ INSTALL()
 		$portDir/additional-files/widelands.rdef.in > $sourceDir/widelands.rdef
 
 	addResourcesToBinaries  $sourceDir/widelands.rdef \
-		$appsDir/WideLands/WideLands
-	addAppDeskbarSymlink $appsDir/WideLands/WideLands
+		$appsDir/WideLands
+	addAppDeskbarSymlink $appsDir/WideLands
 }