Skip to content

Commit d2df4ad

Browse files
YukariChibaYukariChiba
committed
[warzone2100] 4.6.1-1: new upstream version
1 parent 7d96fc3 commit d2df4ad

File tree

3 files changed

+97
-61
lines changed

3 files changed

+97
-61
lines changed

‎0001-no-cast-function-type-mismatch.patch‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎0002-urlrequest_curl-Remove-references-to-CURLSSLBACKEND.patch‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎PKGBUILD‎

Lines changed: 97 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,116 @@
11
# Maintainer: Yukari Chiba <[email protected]>
22

33
pkgname=warzone2100
4-
pkgver=4.5.5
5-
pkgrel=4
4+
pkgver=4.6.1
5+
pkgrel=1
66
pkgdesc="3D realtime strategy game on a future Earth"
77
url="https://wz2100.net/"
88
arch=(x86_64 aarch64 riscv64 loongarch64)
9-
license=('GPL')
10-
depends=('sdl2' 'openal' 'libvorbis' 'libtheora' 'libsodium' 'physfs' 'sqlite' 'freetype2' 'libopus' 'fmt' 'zip' 'harfbuzz' 'fribidi')
11-
makedepends=('libzip' 'mesa' 'vulkan-headers' 'shaderc' 'cmake' 'ninja' 'linux-headers')
12-
# 0001: Downstream, fix type mismatch warnings for bundled QuickJS
13-
# 0002: Backport, fix deprecated warnings (which are promoted to errors) about
14-
# CURLSSLBACKEND_SECURETRANSPORT with cURL 8.15 or later
15-
# https://github.com/Warzone2100/warzone2100/commit/ee69edc107142e39736c8863e200fc3929d2e47c
9+
license=('GPL-2.0-or-later')
10+
depends=('sdl2' 'openal' 'libvorbis' 'libtheora' 'libsodium' 'physfs' 'sqlite' 'freetype2' 'libopus' 'fmt' 'zip' 'harfbuzz' 'fribidi' 'protobuf')
11+
makedepends=('libzip' 'mesa' 'vulkan-headers' 'shaderc' 'cmake' 'ninja' 'linux-headers' 'git')
1612
source=(
1713
${pkgname}-${pkgver}_src.tar.xz::https://github.com/Warzone2100/warzone2100/releases/download/${pkgver}/${pkgname}_src.tar.xz
18-
0001-no-cast-function-type-mismatch.patch
19-
0002-urlrequest_curl-Remove-references-to-CURLSSLBACKEND.patch
14+
'git+https://github.com/JuliaStrings/utf8proc.git'
15+
'git+https://github.com/g-truc/glm.git'
16+
'git+https://github.com/nemtrif/utfcpp.git'
17+
'git+https://github.com/past-due/launchinfo.git'
18+
'git+https://github.com/google/re2.git'
19+
'git+https://github.com/past-due/EmbeddedJSONSignature.git'
20+
'git+https://github.com/HowardHinnant/date.git'
21+
'git+https://github.com/Warzone2100/data-texpages.git'
22+
'git+https://github.com/Warzone2100/data-music-opus.git'
23+
'git+https://github.com/past-due/discord-rpc.git'
24+
'git+https://github.com/SRombauts/SQLiteCpp.git'
25+
'git+https://github.com/cameron314/readerwriterqueue.git'
26+
'git+https://github.com/fmtlib/fmt.git'
27+
'git+https://github.com/xiph/opusfile.git'
28+
'git+https://github.com/Warzone2100/quickjs-wz.git'
29+
'git+https://github.com/Warzone2100/data-fonts.git'
30+
'git+https://github.com/Warzone2100/maptools-cli.git'
31+
'git+https://github.com/BinomialLLC/basis_universal.git'
32+
'git+https://github.com/Warzone2100/data-terrain-classic.git'
33+
'git+https://github.com/Warzone2100/data-terrain-high.git'
34+
'git+https://github.com/Warzone2100/reclamation.git'
35+
'git+https://github.com/Warzone2100/fractured-kingdom.git'
36+
'git+https://github.com/paullouisageneau/libplum.git'
37+
'git+https://github.com/miniupnp/miniupnp.git'
38+
'git+https://github.com/TartanLlama/expected.git'
39+
'git+https://github.com/Warzone2100/GameNetworkingSockets.git'
40+
'git+https://github.com/past-due/innohelperscripts.git'
41+
'git+https://github.com/Warzone2100/win_installer_resources.git'
42+
'git+https://github.com/Warzone2100/blender-pie-addon.git'
2043
)
21-
sha256sums=('07f61bae721687edeb62da4877e85030a03a053a593d645194fc65778e0480ff'
22-
'a25200df8542dc0c432ef3dd1d74ed89ec0a54475b08b9db6dde0500d7361861'
23-
'df4c19d913a800d29d8379d8352804ec04b433a4f8dd3bfc768210d176ee0927')
44+
sha256sums=('26ac5538460243f8a149d31264da71caa4d33ef6a8010037eff24e77278ca50b'
45+
'SKIP'
46+
'SKIP'
47+
'SKIP'
48+
'SKIP'
49+
'SKIP'
50+
'SKIP'
51+
'SKIP'
52+
'SKIP'
53+
'SKIP'
54+
'SKIP'
55+
'SKIP'
56+
'SKIP'
57+
'SKIP'
58+
'SKIP'
59+
'SKIP'
60+
'SKIP'
61+
'SKIP'
62+
'SKIP'
63+
'SKIP'
64+
'SKIP'
65+
'SKIP'
66+
'SKIP'
67+
'SKIP'
68+
'SKIP'
69+
'SKIP'
70+
'SKIP'
71+
'SKIP'
72+
'SKIP'
73+
'SKIP')
2474

2575
prepare() {
26-
# to drop const qualifier
27-
sed -i 's/IN6_IS_ADDR_V4MAPPED(/IN6_IS_ADDR_V4MAPPED((intptr_t)/' $pkgname/lib/netplay/netsocket.cpp
28-
_patch_ $pkgname
76+
cd $pkgname
77+
78+
git submodule init
79+
git config submodule.3rdparty/utf8proc.url "$srcdir/utf8proc"
80+
git config submodule.3rdparty/glm.url "$srcdir/glm"
81+
git config submodule.3rdparty/utfcpp.url "$srcdir/utfcpp"
82+
git config submodule.3rdparty/launchinfo.url "$srcdir/launchinfo"
83+
git config submodule.3rdparty/re2.url "$srcdir/re2"
84+
git config submodule.3rdparty/EmbeddedJSONSignature.url "$srcdir/EmbeddedJSONSignature"
85+
git config submodule.3rdparty/date.url "$srcdir/date"
86+
git config submodule.data/base/texpages.url "$srcdir/data-texpages"
87+
git config submodule.data/music.url "$srcdir/data-music-opus"
88+
git config submodule.3rdparty/discord-rpc.url "$srcdir/discord-rpc"
89+
git config submodule.3rdparty/SQLiteCpp.url "$srcdir/SQLiteCpp"
90+
git config submodule.3rdparty/readerwriterqueue.url "$srcdir/readerwriterqueue"
91+
git config submodule.3rdparty/fmt.url "$srcdir/fmt"
92+
git config submodule.lib/sound/3rdparty/opusfile.url "$srcdir/opusfile"
93+
git config submodule.3rdparty/quickjs-wz.url "$srcdir/quickjs-wz"
94+
git config submodule.data/fonts.url "$srcdir/data-fonts"
95+
git config submodule.tools/maptools-cli.url "$srcdir/maptools-cli"
96+
git config submodule.3rdparty/basis_universal.url "$srcdir/basis_universal"
97+
git config submodule.3rdparty/data/terrain_overrides/classic.url "$srcdir/data-terrain-classic"
98+
git config submodule.3rdparty/data/terrain_overrides/high.url "$srcdir/data-terrain-high"
99+
git config submodule.3rdparty/data/mods/campaign/reclamation.url "$srcdir/reclamation"
100+
git config submodule.3rdparty/data/mods/campaign/fractured-kingdom.url "$srcdir/fractured-kingdom"
101+
git config submodule.3rdparty/libplum.url "$srcdir/libplum"
102+
git config submodule.lib/netplay/3rdparty/miniupnp.url "$srcdir/miniupnp"
103+
git config submodule.3rdparty/expected.url "$srcdir/expected"
104+
git config submodule.3rdparty/GameNetworkingSockets.url "$srcdir/GameNetworkingSockets"
105+
git config submodule.pkg/win_installer/innohelperscripts.url "$srcdir/innohelperscripts"
106+
git config submodule.pkg/win_installer/resources.url "$srcdir/win_installer_resources"
107+
git config submodule.tools/blender/pie-addon.url "$srcdir/blender-pie-addon"
108+
git -c protocol.file.allow=always submodule update
29109
}
30110

31111
build() {
32112
# 3rdparty/quickjs-wz/quickjs.h:993:34: error: cast-function-type-mismatch
33113
CXXFLAGS+=" -Wno-cast-function-type-mismatch"
34-
# Workaround CMake 4.0 compatibility.
35-
# TODO: this has been already fixed in the master branch and the workaround
36-
# should be removed when upgrading
37-
CMAKE_POLICY_VERSION_MINIMUM=3.5 \
38114
cmake -B build -S ${pkgname} \
39115
-G Ninja \
40116
-DCMAKE_BUILD_TYPE=None \

0 commit comments

Comments
 (0)