Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

widelands: update to 1.3 (#26987)

Browse Source
This commit is contained in:
Konstantin Podsvirov
2025-12-22 20:54:33 +03:00
committed by GitHub
parent fe71d7f0c1
commit 157c09d11f
2 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mingw-w64-widelands/0001-wideland-1.2.1-relative-datadir.patch
View File

@@ -1,11 +1,11 @@
--- widelands-1.2.1.orig/src/wlapplication.cc 2024-11-12 23:03:25.000000000 +0300
+++ widelands-1.2.1/src/wlapplication.cc 2025-09-22 22:39:38.321629000 +0300
@@ -1515,7 +1515,7 @@
--- widelands-1.3.orig/src/wlapplication.cc 2025-12-18 21:19:33.000000000 +0300
+++ widelands-1.3/src/wlapplication.cc 2025-12-22 19:39:35.505925200 +0300
@@ -1721,7 +1721,7 @@
// Finally, try a relative datadir.
if (!found) {
if (!found_datadir) {
- datadir_ = get_executable_directory() + FileSystem::file_separator() + INSTALL_DATADIR;
+ datadir_ = get_executable_directory() + FileSystem::file_separator() + ".." + FileSystem::file_separator() + INSTALL_DATADIR;
const std::string err = checkdatadirversion(datadir_);
if (err.empty()) {
found = true;
found_datadir = true;

24
mingw-w64-widelands/PKGBUILD
View File

@@ -3,8 +3,8 @@
_realname=widelands
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=1.2.1
pkgrel=2
pkgver=1.3
pkgrel=1
pkgdesc="A realtime strategy game with emphasis on economy and transport (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -28,30 +28,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-asio")
source=("${msys2_repository_url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
"${msys2_repository_url}/commit/c0b44ccc04df35a9a23ca9be3e05f5d3a5428f6f.patch"
"${msys2_repository_url}/commit/a66872f35abe45a2eba6c112dd978bd9e2c08d7b.patch"
"${msys2_repository_url}/commit/a20d8d240e68c5ae704bbb754472130ae72ebfa9.patch"
"${msys2_repository_url}/commit/937a1695cf0494bba559b489497ca99afdf95983.patch"
'0001-wideland-1.2.1-relative-datadir.patch')
sha256sums=('799bfd32048ef20118c48e21f3fc843ae0451c42bb8bf2eabcb9b26bf6fe54b4'
'c560c9125fae38fbe89556f82e4df9e40b250060dc5c6b64c0535bb2158e18ea'
'0fb1249b4f3dedcb6efe2fe9210976aac0ba1d15d617eb61e1a5b7de6e679b79'
'b3bbb877a87c9fbb68be62def4c37a1981fed44fddbedb61e950a06242e880a3'
'efde065633f72780a08b6e8a60f26630532079c76eb0a1866fd3e5faf1ac3be1'
'd01990e76cf884a464f491d7c79bd60443e30a752a91a9e20fa12e69f478e73f')
sha256sums=('8468b6bc0ddb70749c09c5603109ceeb79b95f3602d3aa55ecfad84f8ea82571'
'a9a2e909449d3f808f4d3df53d781806bc47f868937810787faf688e3532367f')
prepare() {
cd "${_realname}-${pkgver}"
# Backport of https://github.com/widelands/widelands/pull/6665 (fixes build with asio 1.34)
patch -Np1 -i "${srcdir}/c0b44ccc04df35a9a23ca9be3e05f5d3a5428f6f.patch"
# Backport of https://github.com/widelands/widelands/pull/6522 (fixes build with GCC 15)
patch -Np1 -i "${srcdir}/a66872f35abe45a2eba6c112dd978bd9e2c08d7b.patch"
patch -Np1 -i "${srcdir}/a20d8d240e68c5ae704bbb754472130ae72ebfa9.patch"
# Backport of https://github.com/widelands/widelands/pull/6698 (fixes build with GCC 15)
patch -Np1 -i "${srcdir}/937a1695cf0494bba559b489497ca99afdf95983.patch"
# Search datadir relative to ${MINGW_PREFIX}/bin/..
patch -Np1 -i "${srcdir}/0001-wideland-1.2.1-relative-datadir.patch"
}