* [PR PATCH] widelands: update to 1.0.
@ 2021-08-22 3:12 travankor
2021-08-22 3:24 ` [PR PATCH] [Updated] " travankor
` (18 more replies)
0 siblings, 19 replies; 20+ messages in thread
From: travankor @ 2021-08-22 3:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1566 bytes --]
There is a new 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?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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: 1537 bytes --]
From b3275f8c969d7be87fa117606012a7822d233cc5 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.
---
srcpkgs/widelands/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 97b2c6254b24..37aa0f66576a 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
# Template file for 'widelands'
pkgname=widelands
-version=21
-revision=5
+version=1.0
+revision=1
wrksrc="${pkgname}-build${version}"
build_style=cmake
configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -11,11 +11,11 @@ makedepends="boost-devel icu-devel minizip-devel gettext-devel
glu-devel glew-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"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
@ 2021-08-22 3:24 ` travankor
2021-08-22 3:48 ` travankor
` (17 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: travankor @ 2021-08-22 3:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1571 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?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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: 1649 bytes --]
From 63a71b821e8810e91e2b605303dca971bf75f592 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.
---
srcpkgs/widelands/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 97b2c6254b24..cbf593839e83 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,8 +1,8 @@
# Template file for 'widelands'
pkgname=widelands
-version=21
-revision=5
-wrksrc="${pkgname}-build${version}"
+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"
@@ -11,11 +11,11 @@ makedepends="boost-devel icu-devel minizip-devel gettext-devel
glu-devel glew-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"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
2021-08-22 3:24 ` [PR PATCH] [Updated] " travankor
@ 2021-08-22 3:48 ` travankor
2021-08-22 3:53 ` travankor
` (16 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: travankor @ 2021-08-22 3:48 UTC (permalink / raw)
To: ml
[-- 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: 7582 bytes --]
From cf6ac080e136ff4033096b3793b4472c50f8461c 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 | 12 +--
4 files changed, 92 insertions(+), 85 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..cbf593839e83 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,8 +1,8 @@
# Template file for 'widelands'
pkgname=widelands
-version=21
-revision=5
-wrksrc="${pkgname}-build${version}"
+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"
@@ -11,11 +11,11 @@ makedepends="boost-devel icu-devel minizip-devel gettext-devel
glu-devel glew-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"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
2021-08-22 3:24 ` [PR PATCH] [Updated] " travankor
2021-08-22 3:48 ` travankor
@ 2021-08-22 3:53 ` travankor
2021-08-22 4:22 ` travankor
` (15 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: travankor @ 2021-08-22 3:53 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
` (2 preceding siblings ...)
2021-08-22 3:53 ` travankor
@ 2021-08-22 4:22 ` travankor
2021-08-23 16:28 ` [PR REVIEW] " paper42
` (14 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: travankor @ 2021-08-22 4:22 UTC (permalink / raw)
To: ml
[-- 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: 6168 bytes --]
From e23d9e60bd25f4c218bd6eaa4e9cba7d3f385069 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.
---
.../patches/cmake-build-type-none.patch | 53 +++++++++++++------
srcpkgs/widelands/patches/cmake-cross.patch | 16 ------
srcpkgs/widelands/template | 16 +++---
3 files changed, 47 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/widelands/patches/cmake-cross.patch
diff --git a/srcpkgs/widelands/patches/cmake-build-type-none.patch b/srcpkgs/widelands/patches/cmake-build-type-none.patch
index 67efba43e723..e048d4027b7f 100644
--- a/srcpkgs/widelands/patches/cmake-build-type-none.patch
+++ b/srcpkgs/widelands/patches/cmake-build-type-none.patch
@@ -1,63 +1,86 @@
-Index: CMakeLists.txt
-===================================================================
+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
-@@ -202,7 +202,7 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWit
+@@ -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}")
-+ set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
+ message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
endif()
-
- wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
-@@ -353,7 +353,7 @@ endif (OPTION_BUILD_TESTS)
+@@ -415,7 +417,7 @@ endif (OPTION_BUILD_TESTS)
install (
FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
DESTINATION ${WL_INSTALL_BASEDIR}
- CONFIGURATIONS Debug;Release
-+ CONFIGURATIONS Debug
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreVersionFile
)
-@@ -378,7 +378,6 @@ install(
+@@ -440,7 +442,7 @@ install(
data/txts
data/world
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreDataFiles
)
-@@ -386,7 +385,6 @@ install(
+@@ -448,7 +450,7 @@ install(
DIRECTORY
data/maps
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT MapFiles
)
-@@ -395,7 +393,6 @@ install(
+@@ -457,7 +459,7 @@ install(
data/music
data/sound
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT MusicFiles
)
-@@ -405,7 +402,7 @@ install(
+@@ -467,7 +469,7 @@ install(
CREDITS
ChangeLog
DESTINATION ${WL_INSTALL_BASEDIR}
- CONFIGURATIONS Debug;Release
-+ CONFIGURATIONS Debug
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreLicenseFiles
)
-@@ -424,7 +421,6 @@ install(
+@@ -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-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..9e9af0295304 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 release supercedes beta builds
+reverts="21_5"
+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"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
` (3 preceding siblings ...)
2021-08-22 4:22 ` travankor
@ 2021-08-23 16:28 ` paper42
2021-08-23 16:28 ` paper42
` (13 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2021-08-23 16:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32621#discussion_r694124823
Comment:
this is the default value of $wrksrc, so you don't need to overwrite it
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
` (4 preceding siblings ...)
2021-08-23 16:28 ` [PR REVIEW] " paper42
@ 2021-08-23 16:28 ` paper42
2021-08-23 16:28 ` paper42
` (12 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2021-08-23 16:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32621#discussion_r694125666
Comment:
do we still need `>${pkgname}-${version}`?
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
` (5 preceding siblings ...)
2021-08-23 16:28 ` paper42
@ 2021-08-23 16:28 ` paper42
2021-08-24 22:52 ` travankor
` (11 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2021-08-23 16:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32621#discussion_r694124514
Comment:
this is missing many versions (and revisions) that were packaged
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
` (6 preceding siblings ...)
2021-08-23 16:28 ` paper42
@ 2021-08-24 22:52 ` travankor
2021-08-24 22:55 ` travankor
` (10 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: travankor @ 2021-08-24 22:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New review comment by travankor on void-packages repository
https://github.com/void-linux/void-packages/pull/32621#discussion_r695269762
Comment:
Should it revert every packaged version?
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
` (7 preceding siblings ...)
2021-08-24 22:52 ` travankor
@ 2021-08-24 22:55 ` travankor
2021-08-24 22:55 ` [PR PATCH] [Updated] " travankor
` (9 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: travankor @ 2021-08-24 22:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New review comment by travankor on void-packages repository
https://github.com/void-linux/void-packages/pull/32621#discussion_r695270808
Comment:
`$wkrsrc` would be `v${version}` otherwise
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
` (8 preceding siblings ...)
2021-08-24 22:55 ` travankor
@ 2021-08-24 22:55 ` travankor
2021-08-24 23:04 ` travankor
` (8 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: travankor @ 2021-08-24 22:55 UTC (permalink / raw)
To: ml
[-- 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: 6136 bytes --]
From 537f5fb1ba445c150c298fb59fa80e62ad390910 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.
---
.../patches/cmake-build-type-none.patch | 53 +++++++++++++------
srcpkgs/widelands/patches/cmake-cross.patch | 16 ------
srcpkgs/widelands/template | 15 +++---
3 files changed, 46 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/widelands/patches/cmake-cross.patch
diff --git a/srcpkgs/widelands/patches/cmake-build-type-none.patch b/srcpkgs/widelands/patches/cmake-build-type-none.patch
index 67efba43e723..e048d4027b7f 100644
--- a/srcpkgs/widelands/patches/cmake-build-type-none.patch
+++ b/srcpkgs/widelands/patches/cmake-build-type-none.patch
@@ -1,63 +1,86 @@
-Index: CMakeLists.txt
-===================================================================
+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
-@@ -202,7 +202,7 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWit
+@@ -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}")
-+ set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
+ message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
endif()
-
- wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
-@@ -353,7 +353,7 @@ endif (OPTION_BUILD_TESTS)
+@@ -415,7 +417,7 @@ endif (OPTION_BUILD_TESTS)
install (
FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
DESTINATION ${WL_INSTALL_BASEDIR}
- CONFIGURATIONS Debug;Release
-+ CONFIGURATIONS Debug
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreVersionFile
)
-@@ -378,7 +378,6 @@ install(
+@@ -440,7 +442,7 @@ install(
data/txts
data/world
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreDataFiles
)
-@@ -386,7 +385,6 @@ install(
+@@ -448,7 +450,7 @@ install(
DIRECTORY
data/maps
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT MapFiles
)
-@@ -395,7 +393,6 @@ install(
+@@ -457,7 +459,7 @@ install(
data/music
data/sound
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT MusicFiles
)
-@@ -405,7 +402,7 @@ install(
+@@ -467,7 +469,7 @@ install(
CREDITS
ChangeLog
DESTINATION ${WL_INSTALL_BASEDIR}
- CONFIGURATIONS Debug;Release
-+ CONFIGURATIONS Debug
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreLicenseFiles
)
-@@ -424,7 +421,6 @@ install(
+@@ -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-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..b87f066b007c 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,21 +1,22 @@
# Template file for 'widelands'
pkgname=widelands
-version=21
-revision=5
-wrksrc="${pkgname}-build${version}"
+# Widelands 1.0 release supercedes beta builds
+reverts="21_5"
+version=1.0
+revision=1
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"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
` (9 preceding siblings ...)
2021-08-24 22:55 ` [PR PATCH] [Updated] " travankor
@ 2021-08-24 23:04 ` travankor
2021-08-24 23:04 ` [PR REVIEW] " travankor
` (7 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: travankor @ 2021-08-24 23:04 UTC (permalink / raw)
To: ml
[-- 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: 6254 bytes --]
From 7557849d8a4f4165d6f84448df1b57113ebd9b03 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.
---
.../patches/cmake-build-type-none.patch | 53 +++++++++++++------
srcpkgs/widelands/patches/cmake-cross.patch | 16 ------
srcpkgs/widelands/template | 16 +++---
3 files changed, 47 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/widelands/patches/cmake-cross.patch
diff --git a/srcpkgs/widelands/patches/cmake-build-type-none.patch b/srcpkgs/widelands/patches/cmake-build-type-none.patch
index 67efba43e723..e048d4027b7f 100644
--- a/srcpkgs/widelands/patches/cmake-build-type-none.patch
+++ b/srcpkgs/widelands/patches/cmake-build-type-none.patch
@@ -1,63 +1,86 @@
-Index: CMakeLists.txt
-===================================================================
+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
-@@ -202,7 +202,7 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWit
+@@ -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}")
-+ set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
+ message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
endif()
-
- wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
-@@ -353,7 +353,7 @@ endif (OPTION_BUILD_TESTS)
+@@ -415,7 +417,7 @@ endif (OPTION_BUILD_TESTS)
install (
FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
DESTINATION ${WL_INSTALL_BASEDIR}
- CONFIGURATIONS Debug;Release
-+ CONFIGURATIONS Debug
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreVersionFile
)
-@@ -378,7 +378,6 @@ install(
+@@ -440,7 +442,7 @@ install(
data/txts
data/world
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreDataFiles
)
-@@ -386,7 +385,6 @@ install(
+@@ -448,7 +450,7 @@ install(
DIRECTORY
data/maps
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT MapFiles
)
-@@ -395,7 +393,6 @@ install(
+@@ -457,7 +459,7 @@ install(
data/music
data/sound
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT MusicFiles
)
-@@ -405,7 +402,7 @@ install(
+@@ -467,7 +469,7 @@ install(
CREDITS
ChangeLog
DESTINATION ${WL_INSTALL_BASEDIR}
- CONFIGURATIONS Debug;Release
-+ CONFIGURATIONS Debug
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreLicenseFiles
)
-@@ -424,7 +421,6 @@ install(
+@@ -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-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..144ad03b8496 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 release supercedes beta builds
+reverts="21_5 21_4 21_3 21_2 21_1 20_4 20_3 20_2 20_1 19_10 19_9 19_8 19_7 19_6
+ 19_5 19_4 19_3 19_2 19_1 18_5 18_4 18_3 18_2 18_1"
+version=1.0
+revision=1
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"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
` (10 preceding siblings ...)
2021-08-24 23:04 ` travankor
@ 2021-08-24 23:04 ` travankor
2021-08-24 23:06 ` travankor
` (6 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: travankor @ 2021-08-24 23:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New review comment by travankor on void-packages repository
https://github.com/void-linux/void-packages/pull/32621#discussion_r695274475
Comment:
Think I got them all.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
` (11 preceding siblings ...)
2021-08-24 23:04 ` [PR REVIEW] " travankor
@ 2021-08-24 23:06 ` travankor
2021-08-25 21:37 ` paper42
` (5 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: travankor @ 2021-08-24 23:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New review comment by travankor on void-packages repository
https://github.com/void-linux/void-packages/pull/32621#discussion_r695269762
Comment:
Should it revert every packaged version?
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
` (12 preceding siblings ...)
2021-08-24 23:06 ` travankor
@ 2021-08-25 21:37 ` paper42
2021-08-27 17:42 ` ericonr
` (4 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2021-08-25 21:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32621#discussion_r696131530
Comment:
would it? > only changes the archive name, wrksrc shouldn't be changed, because the archive content stays the same and $wrksrc is $pkgname-$version or $wrksrc when set.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
` (13 preceding siblings ...)
2021-08-25 21:37 ` paper42
@ 2021-08-27 17:42 ` ericonr
2021-08-30 2:55 ` [PR PATCH] [Updated] " travankor
` (3 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: ericonr @ 2021-08-27 17:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32621#discussion_r697615365
Comment:
Yeah should be able to remove `>...`
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
` (14 preceding siblings ...)
2021-08-27 17:42 ` ericonr
@ 2021-08-30 2:55 ` travankor
2021-08-30 3:14 ` travankor
` (2 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: travankor @ 2021-08-30 2:55 UTC (permalink / raw)
To: ml
[-- 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: 5465 bytes --]
From 3c00b0b432b0335ddfad47bc1adef4a0e4c71aaf 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.
---
.../patches/cmake-build-type-none.patch | 30 +++++++++++--------
srcpkgs/widelands/patches/cmake-cross.patch | 16 ----------
srcpkgs/widelands/template | 16 +++++-----
3 files changed, 26 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/widelands/patches/cmake-cross.patch
diff --git a/srcpkgs/widelands/patches/cmake-build-type-none.patch b/srcpkgs/widelands/patches/cmake-build-type-none.patch
index 67efba43e723..0f9b0cc921ad 100644
--- a/srcpkgs/widelands/patches/cmake-build-type-none.patch
+++ b/srcpkgs/widelands/patches/cmake-build-type-none.patch
@@ -2,62 +2,66 @@ Index: CMakeLists.txt
===================================================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -202,7 +202,7 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWit
+@@ -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}")
-+ set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
+ message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
endif()
-
- wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
-@@ -353,7 +353,7 @@ endif (OPTION_BUILD_TESTS)
+@@ -415,7 +417,7 @@ endif (OPTION_BUILD_TESTS)
install (
FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
DESTINATION ${WL_INSTALL_BASEDIR}
- CONFIGURATIONS Debug;Release
-+ CONFIGURATIONS Debug
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreVersionFile
)
-@@ -378,7 +378,6 @@ install(
+@@ -440,7 +442,7 @@ install(
data/txts
data/world
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreDataFiles
)
-@@ -386,7 +385,6 @@ install(
+@@ -448,7 +450,7 @@ install(
DIRECTORY
data/maps
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT MapFiles
)
-@@ -395,7 +393,6 @@ install(
+@@ -457,7 +459,7 @@ install(
data/music
data/sound
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT MusicFiles
)
-@@ -405,7 +402,7 @@ install(
+@@ -467,7 +469,7 @@ install(
CREDITS
ChangeLog
DESTINATION ${WL_INSTALL_BASEDIR}
- CONFIGURATIONS Debug;Release
-+ CONFIGURATIONS Debug
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreLicenseFiles
)
-@@ -424,7 +421,6 @@ install(
+@@ -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
)
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..c9894df514c0 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 release supercedes beta builds
+reverts="21_5 21_4 21_3 21_2 21_1 20_4 20_3 20_2 20_1 19_10 19_9 19_8 19_7 19_6
+ 19_5 19_4 19_3 19_2 19_1 18_5 18_4 18_3 18_2 18_1"
+version=1.0
+revision=1
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"
+checksum=1dab0c4062873cc72c5e0558f9e9620b0ef185f1a78923a77c4ce5b9ed76031a
replaces="widelands-data>=0"
CXXFLAGS="-DU_USING_ICU_NAMESPACE=1"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
` (15 preceding siblings ...)
2021-08-30 2:55 ` [PR PATCH] [Updated] " travankor
@ 2021-08-30 3:14 ` travankor
2021-08-31 19:09 ` paper42
2021-08-31 19:09 ` [PR PATCH] [Merged]: " paper42
18 siblings, 0 replies; 20+ messages in thread
From: travankor @ 2021-08-30 3:14 UTC (permalink / raw)
To: ml
[-- 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: 5465 bytes --]
From d5285761ca869059e019a80c510e0eb2df3d4b33 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.
---
.../patches/cmake-build-type-none.patch | 30 +++++++++++--------
srcpkgs/widelands/patches/cmake-cross.patch | 16 ----------
srcpkgs/widelands/template | 16 +++++-----
3 files changed, 26 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/widelands/patches/cmake-cross.patch
diff --git a/srcpkgs/widelands/patches/cmake-build-type-none.patch b/srcpkgs/widelands/patches/cmake-build-type-none.patch
index 67efba43e723..0f9b0cc921ad 100644
--- a/srcpkgs/widelands/patches/cmake-build-type-none.patch
+++ b/srcpkgs/widelands/patches/cmake-build-type-none.patch
@@ -2,62 +2,66 @@ Index: CMakeLists.txt
===================================================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -202,7 +202,7 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWit
+@@ -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}")
-+ set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
+ message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
endif()
-
- wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
-@@ -353,7 +353,7 @@ endif (OPTION_BUILD_TESTS)
+@@ -415,7 +417,7 @@ endif (OPTION_BUILD_TESTS)
install (
FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
DESTINATION ${WL_INSTALL_BASEDIR}
- CONFIGURATIONS Debug;Release
-+ CONFIGURATIONS Debug
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreVersionFile
)
-@@ -378,7 +378,6 @@ install(
+@@ -440,7 +442,7 @@ install(
data/txts
data/world
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreDataFiles
)
-@@ -386,7 +385,6 @@ install(
+@@ -448,7 +450,7 @@ install(
DIRECTORY
data/maps
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT MapFiles
)
-@@ -395,7 +393,6 @@ install(
+@@ -457,7 +459,7 @@ install(
data/music
data/sound
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT MusicFiles
)
-@@ -405,7 +402,7 @@ install(
+@@ -467,7 +469,7 @@ install(
CREDITS
ChangeLog
DESTINATION ${WL_INSTALL_BASEDIR}
- CONFIGURATIONS Debug;Release
-+ CONFIGURATIONS Debug
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreLicenseFiles
)
-@@ -424,7 +421,6 @@ install(
+@@ -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
)
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..c9894df514c0 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 release supercedes beta builds
+reverts="21_5 21_4 21_3 21_2 21_1 20_4 20_3 20_2 20_1 19_10 19_9 19_8 19_7 19_6
+ 19_5 19_4 19_3 19_2 19_1 18_5 18_4 18_3 18_2 18_1"
+version=1.0
+revision=1
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"
+checksum=1dab0c4062873cc72c5e0558f9e9620b0ef185f1a78923a77c4ce5b9ed76031a
replaces="widelands-data>=0"
CXXFLAGS="-DU_USING_ICU_NAMESPACE=1"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
` (16 preceding siblings ...)
2021-08-30 3:14 ` travankor
@ 2021-08-31 19:09 ` paper42
2021-08-31 19:09 ` [PR PATCH] [Merged]: " paper42
18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2021-08-31 19:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]
There is an updated pull request by paper42 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: 5505 bytes --]
From 6da2768aa87af8efe79922447f655019f23d79d9 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.
---
.../patches/cmake-build-type-none.patch | 30 +++++++++++--------
srcpkgs/widelands/patches/cmake-cross.patch | 16 ----------
srcpkgs/widelands/template | 18 ++++++-----
3 files changed, 27 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/widelands/patches/cmake-cross.patch
diff --git a/srcpkgs/widelands/patches/cmake-build-type-none.patch b/srcpkgs/widelands/patches/cmake-build-type-none.patch
index 67efba43e723..0f9b0cc921ad 100644
--- a/srcpkgs/widelands/patches/cmake-build-type-none.patch
+++ b/srcpkgs/widelands/patches/cmake-build-type-none.patch
@@ -2,62 +2,66 @@ Index: CMakeLists.txt
===================================================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -202,7 +202,7 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWit
+@@ -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}")
-+ set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
+ message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
endif()
-
- wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
-@@ -353,7 +353,7 @@ endif (OPTION_BUILD_TESTS)
+@@ -415,7 +417,7 @@ endif (OPTION_BUILD_TESTS)
install (
FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
DESTINATION ${WL_INSTALL_BASEDIR}
- CONFIGURATIONS Debug;Release
-+ CONFIGURATIONS Debug
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreVersionFile
)
-@@ -378,7 +378,6 @@ install(
+@@ -440,7 +442,7 @@ install(
data/txts
data/world
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreDataFiles
)
-@@ -386,7 +385,6 @@ install(
+@@ -448,7 +450,7 @@ install(
DIRECTORY
data/maps
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT MapFiles
)
-@@ -395,7 +393,6 @@ install(
+@@ -457,7 +459,7 @@ install(
data/music
data/sound
DESTINATION ${WL_INSTALL_DATADIR}
- CONFIGURATIONS Debug;Release
++ CONFIGURATIONS Debug;Release;None
COMPONENT MusicFiles
)
-@@ -405,7 +402,7 @@ install(
+@@ -467,7 +469,7 @@ install(
CREDITS
ChangeLog
DESTINATION ${WL_INSTALL_BASEDIR}
- CONFIGURATIONS Debug;Release
-+ CONFIGURATIONS Debug
++ CONFIGURATIONS Debug;Release;None
COMPONENT CoreLicenseFiles
)
-@@ -424,7 +421,6 @@ install(
+@@ -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
)
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..97cb44097295 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 release supercedes beta builds
+reverts="21_5 21_4 21_3 21_2 21_1 20_4 20_3 20_2 20_1 19_10 19_9 19_8 19_7 19_6
+ 19_5 19_4 19_3 19_2 19_1 18_5 18_4 18_3 18_2 18_1"
+version=1.0
+revision=1
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
+homepage="https://www.widelands.org/"
+distfiles="https://github.com/widelands/widelands/archive/v${version}.tar.gz"
+checksum=1dab0c4062873cc72c5e0558f9e9620b0ef185f1a78923a77c4ce5b9ed76031a
replaces="widelands-data>=0"
CXXFLAGS="-DU_USING_ICU_NAMESPACE=1"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Merged]: widelands: update to 1.0.
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
` (17 preceding siblings ...)
2021-08-31 19:09 ` paper42
@ 2021-08-31 19:09 ` paper42
18 siblings, 0 replies; 20+ messages in thread
From: paper42 @ 2021-08-31 19:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1434 bytes --]
There's a merged pull request on the void-packages repository
widelands: update to 1.0.
https://github.com/void-linux/void-packages/pull/32621
Description:
<!-- 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
-->
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2021-08-31 19:09 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-22 3:12 [PR PATCH] widelands: update to 1.0 travankor
2021-08-22 3:24 ` [PR PATCH] [Updated] " travankor
2021-08-22 3:48 ` travankor
2021-08-22 3:53 ` travankor
2021-08-22 4:22 ` travankor
2021-08-23 16:28 ` [PR REVIEW] " paper42
2021-08-23 16:28 ` paper42
2021-08-23 16:28 ` paper42
2021-08-24 22:52 ` travankor
2021-08-24 22:55 ` travankor
2021-08-24 22:55 ` [PR PATCH] [Updated] " travankor
2021-08-24 23:04 ` travankor
2021-08-24 23:04 ` [PR REVIEW] " travankor
2021-08-24 23:06 ` travankor
2021-08-25 21:37 ` paper42
2021-08-27 17:42 ` ericonr
2021-08-30 2:55 ` [PR PATCH] [Updated] " travankor
2021-08-30 3:14 ` travankor
2021-08-31 19:09 ` paper42
2021-08-31 19:09 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).