parent
7088bf9c81
commit
8bbe734d1b
|
@ -1,10 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Type=Application
|
||||
Name=AstroMenace
|
||||
Comment=Hardcore 3D space shooter
|
||||
TryExec=astromenace
|
||||
Exec=astromenace --dir=/usr/share/astromenace
|
||||
Icon=astromenace
|
||||
Categories=Game;ArcadeGame;
|
||||
Terminal=false
|
|
@ -0,0 +1,47 @@
|
|||
From d5e007cf356fc5ecc9c28cf796c55bd4765bc9e2 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Thu, 13 Apr 2023 03:33:27 +0100
|
||||
Subject: [PATCH] Fix build with GCC 13
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
GCC 13 (as usual for new compiler releases) shuffles around some internal includes and so etc is no longer transitively included:
|
||||
```
|
||||
/var/tmp/portage/games-action/astromenace-1.4.2/work/astromenace-1.4.2/src/core/model3d/model3d.cpp: In member function ‘bool viewizard::cModel3DWrapper::LoadVW3D(const std::string&)’:
|
||||
/var/tmp/portage/games-action/astromenace-1.4.2/work/astromenace-1.4.2/src/core/model3d/model3d.cpp:602:10: error: ‘uint32_t’ is not a member of ‘std’; did you mean ‘wint_t’?
|
||||
602 | std::uint32_t ChunkArraySize;
|
||||
| ^~~~~~~~
|
||||
| wint_t
|
||||
/var/tmp/portage/games-action/astromenace-1.4.2/work/astromenace-1.4.2/src/core/model3d/model3d.cpp:603:18: error: ‘ChunkArraySize’ was not declared in this scope
|
||||
603 | File->fread(&ChunkArraySize, sizeof(ChunkArraySize), 1);
|
||||
| ^~~~~~~~~~~~~~
|
||||
/var/tmp/portage/games-action/astromenace-1.4.2/work/astromenace-1.4.2/src/core/model3d/model3d.cpp: In member function ‘bool viewizard::cModel3DWrapper::SaveVW3D(const std::string&)’:
|
||||
/var/tmp/portage/games-action/astromenace-1.4.2/work/astromenace-1.4.2/src/core/model3d/model3d.cpp:681:10: error: ‘uint32_t’ is not a member of ‘std’; did you mean ‘wint_t’?
|
||||
681 | std::uint32_t ChunkArraySize = static_cast<std::uint32_t>(Chunks.size());
|
||||
| ^~~~~~~~
|
||||
| wint_t
|
||||
/var/tmp/portage/games-action/astromenace-1.4.2/work/astromenace-1.4.2/src/core/model3d/model3d.cpp:682:45: error: ‘ChunkArraySize’ was not declared in this scope
|
||||
682 | FileVW3D.write(reinterpret_cast<char*>(&ChunkArraySize), sizeof(ChunkArraySize));
|
||||
| ^~~~~~~~~~~~~~
|
||||
```
|
||||
|
||||
See https://gnu.org/software/gcc/gcc-13/porting_to.html.
|
||||
|
||||
Bug: https://bugs.gentoo.org/895760
|
||||
---
|
||||
src/core/model3d/model3d.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/core/model3d/model3d.cpp b/src/core/model3d/model3d.cpp
|
||||
index 29b302d5..6f81cab2 100644
|
||||
--- a/src/core/model3d/model3d.cpp
|
||||
+++ b/src/core/model3d/model3d.cpp
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "../vfs/vfs.h"
|
||||
#include "model3d.h"
|
||||
#include <cmath>
|
||||
+#include <cstdint>
|
||||
#include <cstring>
|
||||
#include <fstream>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'astromenace'
|
||||
pkgname=astromenace
|
||||
version=1.4.1
|
||||
revision=2
|
||||
version=1.4.2
|
||||
revision=1
|
||||
build_style=cmake
|
||||
configure_args="-DDATADIR=/usr/share/astromenace -DDONTCREATEVFS=TRUE"
|
||||
hostmakedepends="pkg-config"
|
||||
|
@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
|||
license="GPL-3.0-or-later, OFL-1.1, CC-BY-SA-3.0"
|
||||
homepage="http://www.viewizard.com/"
|
||||
distfiles="https://github.com/viewizard/astromenace/archive/v${version}.tar.gz"
|
||||
checksum=0aca5211c9f333acf698807f597e5ad8e9d1455ba8ad202940890bff5b6c9507
|
||||
checksum=616622cc1da07a7d827c0fb94b90b7c9a36a1e7d1e68002ed3aaf2a12b9a99aa
|
||||
replaces="astromenace-data>=0"
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
|
@ -21,13 +21,17 @@ if [ "$CROSS_BUILD" ]; then
|
|||
fi
|
||||
|
||||
do_install() {
|
||||
vbin build/astromenace ${pkgname}
|
||||
vdoc README.md README
|
||||
vlicense LICENSE.md LICENSE
|
||||
vbin build/astromenace
|
||||
|
||||
vmkdir usr/share/astromenace
|
||||
vcopy gamedata usr/share/astromenace
|
||||
|
||||
vdoc README.md
|
||||
vlicense LICENSE.md
|
||||
for size in 64 128; do
|
||||
vinstall share/${pkgname}_${size}.png 644 \
|
||||
usr/share/icons/hicolor/${size}x${size}/apps ${pkgname}.png
|
||||
done
|
||||
vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
|
||||
vinstall share/astromenace.desktop 644 usr/share/applications
|
||||
vinstall share/astromenace.appdata.xml 644 usr/share/appdata
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue