diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | cstdint.patch | 35 |
3 files changed, 49 insertions, 4 deletions
@@ -14,8 +14,10 @@ pkgbase = freeserf depends = sdl2_image optdepends = libxmp: Amiga audio playback source = freeserf-0.3.tar.xz::https://github.com/freeserf/freeserf/releases/download/v0.3/FreeSerf.tar.xz + source = cstdint.patch md5sums = 956fa204197ec29d688b0fbfbb50bd93 + md5sums = 98a869d79db05db90d22bf69cdba159d sha1sums = 24913d2716eff5d71b08a3de8439750d4db627c3 + sha1sums = a451fc22da6d2d7754ddb7f6437d96e99d03df46 pkgname = freeserf - @@ -11,12 +11,20 @@ depends=('sdl2' 'sdl2_mixer' 'sdl2_image') makedepends=('cmake' 'libxmp') optdepends=('libxmp: Amiga audio playback') install=freeserf.install -source=(${pkgname}-${pkgver}.tar.xz::"https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${_pkgname}.tar.xz") -md5sums=('956fa204197ec29d688b0fbfbb50bd93') -sha1sums=('24913d2716eff5d71b08a3de8439750d4db627c3') +source=(${pkgname}-${pkgver}.tar.xz::"https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${_pkgname}.tar.xz" + "cstdint.patch") +md5sums=('956fa204197ec29d688b0fbfbb50bd93' + '98a869d79db05db90d22bf69cdba159d') +sha1sums=('24913d2716eff5d71b08a3de8439750d4db627c3' + 'a451fc22da6d2d7754ddb7f6437d96e99d03df46') prepare() { mkdir ${_pkgname}/build + + # Fix cstdint bustage, remove once fixed upstream + # https://github.com/freeserf/freeserf/pull/526 + cd ${_pkgname} + patch -p1 -i "${srcdir}/cstdint.patch" } build() { diff --git a/cstdint.patch b/cstdint.patch new file mode 100644 index 000000000000..52a326e96b25 --- /dev/null +++ b/cstdint.patch @@ -0,0 +1,35 @@ +From 74fd5098b1c735cf3e86b876d9f821491a572f37 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mariusz=20Bia=C5=82o=C5=84czyk?= <manio@skyboo.net> +Date: Sat, 30 Dec 2023 17:31:15 +0100 +Subject: [PATCH] Fix compilation: update random.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +error: +``` +In file included from /usr/src/freeserf-git/src/freeserf/src/random.cc:22: +/usr/src/freeserf-git/src/freeserf/src/random.h:29:3: error: ‘uint16_t’ does not name a type + 29 | uint16_t state[3]; + | ^~~~~~~~ +/usr/src/freeserf-git/src/freeserf/src/random.h:26:1: note: ‘uint16_t’ is defined in header ‘<cstdint>’; did you forget to ‘#include <cstdint>’? + 25 | #include <string> + +++ |+#include <cstdint> + 26 | +``` +--- + src/random.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/random.h b/src/random.h +index 9b548d47b..1e6e8ec90 100644 +--- a/src/random.h ++++ b/src/random.h +@@ -23,6 +23,7 @@ + #define SRC_RANDOM_H_ + + #include <string> ++#include <cstdint> + + class Random { + protected: |