diff options
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | s25rttr-gcc13.patch | 22 |
2 files changed, 33 insertions, 3 deletions
@@ -1,10 +1,11 @@ #Maintainer: Matthias Mailänder <matthias at mailaender dot name> #Contributor NiNjA <heinep at gmail dot com> #Contributor float <flo.at at gmx dot de> +#Contributor adlerweb <aur at adlerweb dot info> pkgname=s25rttr pkgver=0.9.5 -pkgrel=2 +pkgrel=3 pkgdesc="Return to the Roots is a reimplementation of Settlers II (Die Siedler II) by BlueByte Software GmbH. Put the files from the original game in the folder (/usr/share/s25rttr/S2/)" arch=('i686' 'x86_64') url="https://www.siedler25.org/" @@ -12,13 +13,20 @@ license=('GPL3') depends=('sdl2' 'sdl2_mixer' 'libcurl-gnutls' 'bzip2' 'glfw' 'libsamplerate' 'boost-libs' 'miniupnpc' 'lua51') makedepends=('cmake' 'boost') install="s25rttr.install" -source=("$pkgname-$pkgver.tar.gz::https://github.com/Return-To-The-Roots/s25client/releases/download/v$pkgver/s25client_src_v$pkgver.tar.gz") -sha256sums=('c6a9ef5b90943b5f2e81543f1e3290ff773663a45ebbbcc5a786bb5f5495fbec') +source=("$pkgname-$pkgver.tar.gz::https://github.com/Return-To-The-Roots/s25client/releases/download/v$pkgver/s25client_src_v$pkgver.tar.gz" + "s25rttr-gcc13.patch") +sha256sums=('c6a9ef5b90943b5f2e81543f1e3290ff773663a45ebbbcc5a786bb5f5495fbec' + '66364841bf6e119e81117cf5aae75f4f84b7d9b16f7acd8edc63e8ecac9dde1e') provides=("return-to-the-roots=${pkgver}") conflicts=("return-to-the-roots") +prepare() { + patch --forward --strip=1 --input="${srcdir}/s25rttr-gcc13.patch" +} + build() { cmake -B build -S "s25client_v$pkgver" \ + -D CMAKE_CXX_FLAGS="-Wno-error=deprecated-declarations -Wno-dangling-reference" \ -D CMAKE_INSTALL_PREFIX=/usr \ -D RTTR_BUILD_UPDATER=OFF \ -D RTTR_USE_SYSTEM_LIBS=ON \ diff --git a/s25rttr-gcc13.patch b/s25rttr-gcc13.patch new file mode 100644 index 000000000000..3bce54c50077 --- /dev/null +++ b/s25rttr-gcc13.patch @@ -0,0 +1,22 @@ +diff -Naur src.org/s25client_v0.9.5/external/libsiedler2/src/oem.cpp src/s25client_v0.9.5/external/libsiedler2/src/oem.cpp +--- src.org/s25client_v0.9.5/external/libsiedler2/src/oem.cpp 2023-08-28 03:58:21.933231358 +0200 ++++ src/s25client_v0.9.5/external/libsiedler2/src/oem.cpp 2023-08-28 04:00:13.180588074 +0200 +@@ -4,6 +4,7 @@ + + #include "oem.h" + #include <array> ++#include <cstdint> + + namespace libsiedler2 { + +diff -Naur src.org/s25client_v0.9.5/libs/s25main/gameTypes/LanGameInfo.h src/s25client_v0.9.5/libs/s25main/gameTypes/LanGameInfo.h +--- src.org/s25client_v0.9.5/libs/s25main/gameTypes/LanGameInfo.h 2023-08-28 03:58:21.889897756 +0200 ++++ src/s25client_v0.9.5/libs/s25main/gameTypes/LanGameInfo.h 2023-08-28 03:59:23.610280483 +0200 +@@ -4,6 +4,7 @@ + + #pragma once + ++#include <cstdint> + #include <string> + + class Serializer; |