Accepting request 1238690 from games

- Add gs.patch to fix FTBFS

OBS-URL: https://build.opensuse.org/request/show/1238690
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/commandergenius?expand=0&rev=37
This commit is contained in:
Dominique Leuenberger 2025-01-19 20:49:01 +00:00 committed by Git OBS Bridge
commit 32f0a7c75e
5 changed files with 39 additions and 4 deletions

View File

@ -1,4 +1,4 @@
mtime: 1720605225
commit: c8103e76d0d3e200f21b75ee6788a0d33b98546b6dbc352cbd720c4381395d87
mtime: 1737206380
commit: 2f1363908b3a59709918cf242b9387361597ab601ce06def27d4704a5923119c
url: https://src.opensuse.org/jengelh/commandergenius
revision: master

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0d192f4aa603e14e6b50f2ca061dcbda926e6ea4ac58cb93922f5bf251dbd4b4
oid sha256:9fe1859470a37b82057d37424441423663fffd11eb9d51c69bc7dbbbaed828c3
size 256

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 17 23:55:59 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Add gs.patch to fix FTBFS
-------------------------------------------------------------------
Wed Jul 10 09:25:39 UTC 2024 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package commandergenius
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -26,6 +26,7 @@ URL: http://clonekeenplus.sf.net/
#Git-Clone: https://gitlab.com/Dringgstein/Commander-Genius
Source: https://gitlab.com/Dringgstein/Commander-Genius/-/archive/v%version/Commander-Genius-v%version.tar.bz2
Patch1: fix-icons.patch
Patch2: gs.patch
BuildRequires: boost-devel
BuildRequires: cmake >= 2.8
BuildRequires: fdupes
@ -47,6 +48,9 @@ It has 4-player cooperative mode and six difficulty modes.
%prep
%autosetup -p1 -n Commander-Genius-v%version
if pkg-config 'SDL2_ttf < 2.24'; then
%patch -P 2 -R -p1
fi
%build
%cmake \

26
gs.patch Normal file
View File

@ -0,0 +1,26 @@
From: Jan Engelhardt <ej@inai.de>
Date: 2025-01-18 00:55:51.888346224 +0100
GS took a shortcut to not include SDL2_ttf headers
and now GS broke due to SDL2_ttf commit:
commit 22347419ee08e49d77411c680f15e314ef870ab7
Renamed "struct _TTF_Font" to "struct TTF_Font"
Fixes https://github.com/libsdl-org/SDL_ttf/issues/372
---
GsKit/graphics/GsTrueTypeFont.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: Commander-Genius-v3.5.1/GsKit/graphics/GsTrueTypeFont.h
===================================================================
--- Commander-Genius-v3.5.1.orig/GsKit/graphics/GsTrueTypeFont.h
+++ Commander-Genius-v3.5.1/GsKit/graphics/GsTrueTypeFont.h
@@ -6,7 +6,7 @@
#include <base/interface/Color.h>
#include <graphics/GsSurface.h>
-typedef struct _TTF_Font TTF_Font;
+typedef struct TTF_Font TTF_Font;
class GsTrueTypeFont
{