Accepting request 1273228 from games

OBS-URL: https://build.opensuse.org/request/show/1273228
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/RigelEngine?expand=0&rev=17

RigelEngine-fix-build-with-gcc14.patch

@@ -0,0 +1,41 @@
+From 48efe3e3c5774310e1e44e78b61c6c832e48cb8a Mon Sep 17 00:00:00 2001
+From: Nikolai Wuttke <lethal_guitar128@web.de>
+Date: Sat, 25 May 2024 14:26:38 +0200
+Subject: [PATCH] Add missing includes
+
+---
+ 3rd_party/imgui-filebrowser/imfilebrowser.cpp | 3 +++
+ test/test_high_score_list.cpp                 | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/3rd_party/imgui-filebrowser/imfilebrowser.cpp b/3rd_party/imgui-filebrowser/imfilebrowser.cpp
+index a2113615..1784e2eb 100644
+--- a/3rd_party/imgui-filebrowser/imfilebrowser.cpp
++++ b/3rd_party/imgui-filebrowser/imfilebrowser.cpp
+@@ -25,6 +25,9 @@
+ 
+ #include <imgui.h>
+ 
++#include <algorithm>
++
++
+ ImGui::FileBrowser::FileBrowser(ImGuiFileBrowserFlags flags)
+     : width_(700), height_(450), flags_(flags),
+       openFlag_(false), closeFlag_(false), isOpened_(false), ok_(false),
+diff --git a/test/test_high_score_list.cpp b/test/test_high_score_list.cpp
+index b44b86bd..f2155ca6 100644
+--- a/test/test_high_score_list.cpp
++++ b/test/test_high_score_list.cpp
+@@ -21,6 +21,9 @@ RIGEL_DISABLE_WARNINGS
+ #include <catch.hpp>
+ RIGEL_RESTORE_WARNINGS
+ 
++#include <algorithm>
++
++
+ using namespace rigel;
+ using namespace data;
+ using namespace std;
+-- 
+2.46.0
+

RigelEngine.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Apr 21 14:42:54 UTC 2025 - Carsten Ziepke <kieltux@gmail.com>
+
+- Add BuildRequires pkgconfig(x11), fixes building
+- Rebase enforcement gcc for Leap
+
+-------------------------------------------------------------------
+Sun Aug 25 16:01:43 UTC 2024 - Martin Hauke <mardnh@gmx.de>
+
+- Add patch:
+  * RigelEngine-fix-build-with-gcc14.patch
+
 -------------------------------------------------------------------
 Wed May 15 07:51:09 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

RigelEngine.spec

@@ -1,8 +1,8 @@
 #
 # spec file for package RigelEngine
 #
-# Copyright (c) 2024 SUSE LLC
-# Copyright (c) 2019-2023, Martin Hauke <mardnh@gmx.de>
+# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2019-2025, Martin Hauke <mardnh@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,6 +17,9 @@
 #
 
 
+%if 0%{?sle_version} && 0%{?sle_version} < 160000
+%global force_gcc_version 13
+%endif
 Name:           RigelEngine
 Version:        0.9.1
 Release:        0
@@ -26,16 +29,13 @@ Group:          Amusements/Games/Action/Arcade
 URL:            https://github.com/lethal-guitar/RigelEngine
 Source:         %{name}-%{version}.tar.xz
 Patch0:         RigelEngine-fix-build-with-gcc13.patch
+Patch1:         RigelEngine-fix-build-with-gcc14.patch
 BuildRequires:  cmake >= 3.12
+BuildRequires:  gcc%{?force_gcc_version}-c++
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(SDL2_mixer)
 BuildRequires:  pkgconfig(sdl2)
-%if 0%{?sle_version} >= 150100 && 0%{?sle_version} < 160000 && 0%{?is_opensuse}
-BuildRequires:  gcc9
-BuildRequires:  gcc9-c++
-%else
-BuildRequires:  gcc-c++
-%endif
+BuildRequires:  pkgconfig(x11)
 
 %description
 A modern reimplementation of the game Duke Nukem II, originally released in
@@ -48,9 +48,9 @@ available shareware version.
 %autosetup -p1
 
 %build
-%if 0%{?sle_version} >= 150100 && 0%{?is_opensuse}
-export CC="gcc-9"
-export CXX="g++-9"
+%if 0%{?force_gcc_version}
+export CC="gcc-%{force_gcc_version}"
+export CXX="g++-%{force_gcc_version}"
 %endif
 %cmake -DBUILD_TESTS=ON \
  -DBUILD_MODDING_TOOLS=ON \