eliott/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2026-04-25 17:15:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ports: Update chocolate-doom to 3.1.1

Browse Source 
The old version failed to build with
"error: cannot use keyword 'false' as enumeration constant."

The new version doesn't ship with a pre-built `./configure` script
anymore, so we need to run `autoreconf -i` manually.
This commit is contained in:
Sönke Holz
2026-02-25 18:15:24 +01:00
committed by Sönke Holz
parent 3025f5a4e6
commit 3735bc2fee
4 changed files with 8 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ports/AvailablePorts.md
View File

@@ -38,7 +38,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`ccache`](ccache/) | ccache | 4.11.3 | https://ccache.dev/ |
| [`cfunge`](cfunge/) | cfunge | 2bc4fb2 | https://github.com/VorpalBlade/cfunge/ |
| [`chester`](chester/) | Chester Gameboy Emulator | | https://github.com/veikkos/chester |
| [`chocolate-doom`](chocolate-doom/) | Chocolate Doom | 3.0.1 | https://www.chocolate-doom.org/ |
| [`chocolate-doom`](chocolate-doom/) | Chocolate Doom | 3.1.1 | https://www.chocolate-doom.org/ |
| [`chromaprint`](chromaprint/) | chromaprint | 1.5.1 | https://acoustid.org/ |
| [`citron`](citron/) | Citron Programming Language | 0.0.9.3 | https://github.com/alimpfard/citron |
| [`ClassiCube`](ClassiCube/) | ClassiCube | 1.3.6 | https://github.com/UnknownShadow200/ClassiCube |

11
Ports/chocolate-doom/package.sh
View File

@@ -1,11 +1,10 @@
#!/usr/bin/env -S bash ../.port_include.sh
port='chocolate-doom'
version='3.0.1'
version='3.1.1'
useconfigure='true'
use_fresh_config_sub='true'
config_sub_paths=('autotools/config.sub')
workdir="${port}-${port}-${version}"
files=(
"https://www.chocolate-doom.org/downloads/${version}/chocolate-doom-${version}.tar.gz#d435d6177423491d60be706da9f07d3ab4fabf3e077ec2a3fc216e394fcfc8c7"
"https://github.com/chocolate-doom/chocolate-doom/archive/refs/tags/chocolate-doom-${version}.tar.gz#1edcc41254bdc194beb0d33e267fae306556c4d24110a1d3d3f865717f25da23"
)
depends=(
'libpng'
@@ -19,3 +18,7 @@ launcher_name='Chocolate Doom'
launcher_category='&Games'
launcher_command='/usr/local/bin/chocolate-doom'
icon_file='data/doom.png'
pre_configure() {
run autoreconf -i
}

25
Ports/chocolate-doom/patches/0001-Remove-redundant-demoextend-definition.patch
View File

@@ -1,25 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jordan Christiansen <xordspar0@gmail.com>
Date: Sun, 15 Mar 2020 16:55:33 -0500
Subject: [PATCH] Remove redundant demoextend definition
GCC 10 enables -fno-common by default, which causes the linker to fail when
there are multple definitions of a global variable.
See https://gcc.gnu.org/gcc-10/porting_to.html
---
src/hexen/mn_menu.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c
index a3ff999801b657a6dca4d1e62489d65bafe4e091..b9ad45eea7c915a4066edabff1c12cead2a6ae76 100644
--- a/src/hexen/mn_menu.c
+++ b/src/hexen/mn_menu.c
@@ -131,7 +131,6 @@ boolean MenuActive;
int InfoType;
int messageson = true;
boolean mn_SuicideConsole;
-boolean demoextend; // from h2def.h
// PRIVATE DATA DEFINITIONS ------------------------------------------------

11
Ports/chocolate-doom/patches/ReadMe.md
View File

@@ -1,11 +0,0 @@
# Patches for chocolate-doom on SerenityOS
## `0001-Remove-redundant-demoextend-definition.patch`
Remove redundant demoextend definition
GCC 10 enables -fno-common by default, which causes the linker to fail when
there are multple definitions of a global variable.
See https://gcc.gnu.org/gcc-10/porting_to.html