From fc033dff9d910ec86bd11afed53888e64aa055258194cb13ea963e734c12d21c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 18 Jan 2025 13:19:59 +0000 Subject: [PATCH] [info=2f1363908b3a59709918cf242b9387361597ab601ce06def27d4704a5923119c] OBS-URL: https://build.opensuse.org/package/show/games/commandergenius?expand=0&rev=78 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- commandergenius.changes | 5 +++++ commandergenius.spec | 6 +++++- gs.patch | 26 ++++++++++++++++++++++++++ 5 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 gs.patch diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 1f13dd4..bfd5cb5 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1720605225 -commit: c8103e76d0d3e200f21b75ee6788a0d33b98546b6dbc352cbd720c4381395d87 +mtime: 1737206380 +commit: 2f1363908b3a59709918cf242b9387361597ab601ce06def27d4704a5923119c url: https://src.opensuse.org/jengelh/commandergenius revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 70b2dcb..e1c7692 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d192f4aa603e14e6b50f2ca061dcbda926e6ea4ac58cb93922f5bf251dbd4b4 +oid sha256:9fe1859470a37b82057d37424441423663fffd11eb9d51c69bc7dbbbaed828c3 size 256 diff --git a/commandergenius.changes b/commandergenius.changes index b4c009b..d1d91bd 100644 --- a/commandergenius.changes +++ b/commandergenius.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 17 23:55:59 UTC 2025 - Jan Engelhardt + +- Add gs.patch to fix FTBFS + ------------------------------------------------------------------- Wed Jul 10 09:25:39 UTC 2024 - Jan Engelhardt diff --git a/commandergenius.spec b/commandergenius.spec index 686be5e..8fb86ba 100644 --- a/commandergenius.spec +++ b/commandergenius.spec @@ -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 \ diff --git a/gs.patch b/gs.patch new file mode 100644 index 0000000..0275a95 --- /dev/null +++ b/gs.patch @@ -0,0 +1,26 @@ +From: Jan Engelhardt +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 + #include + +-typedef struct _TTF_Font TTF_Font; ++typedef struct TTF_Font TTF_Font; + + class GsTrueTypeFont + {