Re: [PR PATCH] [Updated] widelands: update to 1.0.

[travankor <travankor@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1596 bytes --]

There is an updated pull request by travankor against master on the void-packages repository

https://github.com/travankor/void-packages widelands
https://github.com/void-linux/void-packages/pull/32621

widelands: update to 1.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

A patch file from https://github.com/void-linux/void-packages/pull/32621.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-widelands-32621.patch --]
[-- Type: text/x-diff, Size: 7753 bytes --]

From 669ff9de419cc52b7f8080d4823791253c63e744 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 21 Aug 2021 20:11:28 -0700
Subject: [PATCH] widelands: update to 1.0.

---
 ...make-add-support-for-None-build-type.patch | 86 +++++++++++++++++++
 .../patches/cmake-build-type-none.patch       | 63 --------------
 srcpkgs/widelands/patches/cmake-cross.patch   | 16 ----
 srcpkgs/widelands/template                    | 16 ++--
 4 files changed, 95 insertions(+), 86 deletions(-)
 create mode 100644 srcpkgs/widelands/patches/0003-cmake-add-support-for-None-build-type.patch
 delete mode 100644 srcpkgs/widelands/patches/cmake-build-type-none.patch
 delete mode 100644 srcpkgs/widelands/patches/cmake-cross.patch

diff --git a/srcpkgs/widelands/patches/0003-cmake-add-support-for-None-build-type.patch b/srcpkgs/widelands/patches/0003-cmake-add-support-for-None-build-type.patch
new file mode 100644
index 000000000000..e048d4027b7f
--- /dev/null
+++ b/srcpkgs/widelands/patches/0003-cmake-add-support-for-None-build-type.patch
@@ -0,0 +1,86 @@
+From 50270f4edc698fbad3de4367349f3790b23a5b4b Mon Sep 17 00:00:00 2001
+From: Clayton Craft <clayton@craftyguy.net>
+Date: Fri, 30 Jul 2021 23:19:34 -0700
+Subject: [PATCH] cmake: add support for None build type
+
+Some distros, e.g. Alpine Linux, like to control setting compiler flags.
+cmake supports a "None" build type which uses CFLAGS, CXXFLAGS, etc from
+the env and CMakeLists.txt should not set anything.
+
+This change adds support for this so distros can set their own compiler
+flags when building and not have them changed by the project build
+configuration.
+---
+ CMakeLists.txt | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7e9305e5bc..626f6c251b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -209,6 +209,8 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+   endif ()
+   set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
+   option(OPTION_ASAN "Build with AddressSanitizer" ON)
++elseif(CMAKE_BUILD_TYPE STREQUAL "None")
++  message(STATUS "Not setting any default flags.")
+ else()
+   message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+ endif()
+@@ -415,7 +417,7 @@ endif (OPTION_BUILD_TESTS)
+ install (
+   FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
+   DESTINATION ${WL_INSTALL_BASEDIR}
+-  CONFIGURATIONS Debug;Release
++  CONFIGURATIONS Debug;Release;None
+   COMPONENT CoreVersionFile
+ )
+ 
+@@ -440,7 +442,7 @@ install(
+     data/txts
+     data/world
+   DESTINATION ${WL_INSTALL_DATADIR}
+-  CONFIGURATIONS Debug;Release
++  CONFIGURATIONS Debug;Release;None
+   COMPONENT CoreDataFiles
+ )
+ 
+@@ -448,7 +450,7 @@ install(
+   DIRECTORY
+     data/maps
+   DESTINATION ${WL_INSTALL_DATADIR}
+-  CONFIGURATIONS Debug;Release
++  CONFIGURATIONS Debug;Release;None
+   COMPONENT MapFiles
+ )
+ 
+@@ -457,7 +459,7 @@ install(
+     data/music
+     data/sound
+   DESTINATION ${WL_INSTALL_DATADIR}
+-  CONFIGURATIONS Debug;Release
++  CONFIGURATIONS Debug;Release;None
+   COMPONENT MusicFiles
+ )
+ 
+@@ -467,7 +469,7 @@ install(
+     CREDITS
+     ChangeLog
+   DESTINATION ${WL_INSTALL_BASEDIR}
+-  CONFIGURATIONS Debug;Release
++  CONFIGURATIONS Debug;Release;None
+   COMPONENT CoreLicenseFiles
+ )
+ 
+@@ -486,7 +488,7 @@ install(
+   DIRECTORY
+     ${CMAKE_CURRENT_BINARY_DIR}/locale/
+   DESTINATION ${WL_INSTALL_DATADIR}/locale
+-  CONFIGURATIONS Debug;Release
++  CONFIGURATIONS Debug;Release;None
+   COMPONENT CoreLanguageFiles
+ )
+ 
+-- 
+2.32.0
+
diff --git a/srcpkgs/widelands/patches/cmake-build-type-none.patch b/srcpkgs/widelands/patches/cmake-build-type-none.patch
deleted file mode 100644
index 67efba43e723..000000000000
--- a/srcpkgs/widelands/patches/cmake-build-type-none.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -202,7 +202,7 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWit
-   set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
-   option(OPTION_ASAN "Build with AddressSanitizer" ON)
- else()
--  message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-+  set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
- endif()
- 
- wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
-@@ -353,7 +353,7 @@ endif (OPTION_BUILD_TESTS)
- install (
-   FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
-   DESTINATION ${WL_INSTALL_BASEDIR}
--  CONFIGURATIONS Debug;Release
-+  CONFIGURATIONS Debug
-   COMPONENT CoreVersionFile
- )
- 
-@@ -378,7 +378,6 @@ install(
-     data/txts
-     data/world
-   DESTINATION ${WL_INSTALL_DATADIR}
--  CONFIGURATIONS Debug;Release
-   COMPONENT CoreDataFiles
- )
- 
-@@ -386,7 +385,6 @@ install(
-   DIRECTORY
-     data/maps
-   DESTINATION ${WL_INSTALL_DATADIR}
--  CONFIGURATIONS Debug;Release
-   COMPONENT MapFiles
- )
- 
-@@ -395,7 +393,6 @@ install(
-     data/music
-     data/sound
-   DESTINATION ${WL_INSTALL_DATADIR}
--  CONFIGURATIONS Debug;Release
-   COMPONENT MusicFiles
- )
- 
-@@ -405,7 +402,7 @@ install(
-     CREDITS
-     ChangeLog
-   DESTINATION ${WL_INSTALL_BASEDIR}
--  CONFIGURATIONS Debug;Release
-+  CONFIGURATIONS Debug
-   COMPONENT CoreLicenseFiles
- )
- 
-@@ -424,7 +421,6 @@ install(
-   DIRECTORY
-     ${CMAKE_CURRENT_BINARY_DIR}/locale/
-   DESTINATION ${WL_INSTALL_DATADIR}/locale
--  CONFIGURATIONS Debug;Release
-   COMPONENT CoreLanguageFiles
- )
- 
diff --git a/srcpkgs/widelands/patches/cmake-cross.patch b/srcpkgs/widelands/patches/cmake-cross.patch
deleted file mode 100644
index 6654c156f884..000000000000
--- a/srcpkgs/widelands/patches/cmake-cross.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-upstream: no
-reason: Our SDL2-devel package has a for cross broken sdl2-config.cmake,
-this patches switched back to a find module cmake script
-
----
---- a/CMakeLists.txt	2020-07-19 19:54:00.744509368 +0200
-+++ b/CMakeLists.txt	2020-07-19 19:54:00.744509368 +0200
-@@ -110,7 +110,7 @@
- find_package(PNG REQUIRED)
- 
- find_package(Threads REQUIRED)
--find_package(SDL2 CONFIG)
-+find_package(SDL2 REQUIRED MODULE)
- if(SDL2_FOUND)
-   message(STATUS "Found SDL2 configuration file")
-   if(TARGET SDL2::SDL2)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 97b2c6254b24..e04c3206a7bc 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,21 +1,23 @@
 # Template file for 'widelands'
 pkgname=widelands
-version=21
-revision=5
-wrksrc="${pkgname}-build${version}"
+# Widelands 1.0 relese supercedes beta builds
+reverts="21"
+version=1.0
+revision=1
+wrksrc="${pkgname}-${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DWL_INSTALL_DATADIR=/usr/share/widelands"
 hostmakedepends="python3 pkg-config gettext"
 makedepends="boost-devel icu-devel minizip-devel gettext-devel
- glu-devel glew-devel SDL2-devel SDL2_gfx-devel SDL2_image-devel
+ glu-devel glew-devel libcurl-devel SDL2-devel SDL2_gfx-devel SDL2_image-devel
  SDL2_net-devel SDL2_mixer-devel SDL2_ttf-devel"
 short_desc="Real-time strategy game"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="travankor <travankor@tuta.io>"
 license="GPL-2.0-or-later"
 homepage="http://www.widelands.org/"
-distfiles="https://github.com/widelands/widelands/archive/build${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=601e0e4c6f91b3fb0ece2cd1b83ecfb02344a1b9194fbb70ef3f70e06994e357
+distfiles="https://github.com/widelands/widelands/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
+checksum=1dab0c4062873cc72c5e0558f9e9620b0ef185f1a78923a77c4ce5b9ed76031a
 replaces="widelands-data>=0"
 
 CXXFLAGS="-DU_USING_ICU_NAMESPACE=1"