6 Commits

6 changed files with 57 additions and 21 deletions

View File

@@ -1,3 +1,24 @@
-------------------------------------------------------------------
Sat May 3 18:36:28 UTC 2025 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Fix build with Boost 1.88, add upstream fix:
simgear-boost_1_88.patch
-------------------------------------------------------------------
Fri Mar 28 14:38:09 UTC 2025 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Update to 2024.1.1
* https://www.flightgear.org/download/releases/2024-1/
- Drop upstream patches:
* add_NasalIORulesChecker.patch
* simgear-boost-1.81.patch
-------------------------------------------------------------------
Thu Jan 23 16:37:27 UTC 2025 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Add support for file permissions check (CVE pending), add
add_NasalIORulesChecker.patch
-------------------------------------------------------------------
Mon Nov 13 22:26:04 UTC 2023 - Florian "spirit" <packaging@sp1rit.anonaddy.me>

View File

@@ -1,7 +1,7 @@
#
# spec file for package SimGear
#
# Copyright (c) 2023 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
@@ -20,20 +20,20 @@
# in our requirements, i.e. the same version we have built against
%define openscenegraph_version %(rpm -qa --nosignature --nodigest libOpenSceneGraph\*-devel | sed 's/.*-devel-\\(.*\\)-.*/\\1/')
%define libname libSimGearCore-2020_3_19
%define main_version 2020.3
%define libname libSimGearCore-2024_1_1
%define main_version 2024.1
Name: SimGear
Version: %{main_version}.19
Version: %{main_version}.1
Release: 0
Summary: Simulator Construction Gear
# https://sourceforge.net/p/flightgear/codetickets/1940/
License: GPL-2.0-or-later AND LGPL-2.0-or-later AND MIT
Group: Amusements/Games/3D/Simulation
URL: https://www.flightgear.org/
Source0: https://sourceforge.net/projects/flightgear/files/release-%{main_version}/simgear-%{version}.tar.bz2
Source0: https://gitlab.com/flightgear/fgmeta/-/jobs/9343758788/artifacts/raw/sgbuild/simgear-%{version}.tar.bz2
Source99: SimGear-rpmlintrc
# PATCH-FIX-UPSTREAM simgear-boost-1.81.patch - fix building with boost >= 1.81
Patch0: simgear-boost-1.81.patch
# PATCH-FIX-UPSTREAM -- rebased https://gitlab.com/flightgear/simgear/-/commit/a630ad75a62d63563b37df6e4642bee2f7081907.patch
Patch0: simgear-boost_1_88.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libOpenSceneGraph-devel

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3b937c5b94422478e5d79114bdcd6c78e43a0a6ffba97544a86d441c3f9e8c3a
size 1427799

3
simgear-2024.1.1.tar.bz2 Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d3fd24f747a260acf8e25ddda184ad59fe90c974758fcd5347b68045ee0bb08
size 1814010

View File

@@ -1,11 +0,0 @@
diff -Nur simgear-2020.3.17-orig/simgear/scene/viewer/Compositor.hxx simgear-2020.3.17/simgear/scene/viewer/Compositor.hxx
--- simgear-2020.3.17-orig/simgear/scene/viewer/Compositor.hxx 2022-11-20 19:01:30.000000000 +0100
+++ simgear-2020.3.17/simgear/scene/viewer/Compositor.hxx 2023-03-04 06:07:23.402179191 +0100
@@ -17,6 +17,7 @@
#ifndef SG_COMPOSITOR_HXX
#define SG_COMPOSITOR_HXX
+#include <array>
#include <unordered_map>
#include <vector>

26
simgear-boost_1_88.patch Normal file
View File

@@ -0,0 +1,26 @@
From a630ad75a62d63563b37df6e4642bee2f7081907 Mon Sep 17 00:00:00 2001
From: James Turner <james@flightgear.org>
Date: Thu, 17 Apr 2025 11:13:55 +0100
Subject: [PATCH] Hotfix/boost 1 88
---
simgear/canvas/layout/BoxLayout.cxx | 2 +-
simgear/nasal/cppbind/NasalHash.hxx | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/simgear/nasal/cppbind/NasalHash.hxx b/simgear/nasal/cppbind/NasalHash.hxx
index 54efc2c51..1734adf68 100644
--- a/simgear/nasal/cppbind/NasalHash.hxx
+++ b/simgear/nasal/cppbind/NasalHash.hxx
@@ -5,6 +5,8 @@
#ifndef SG_NASAL_HASH_HXX_
#define SG_NASAL_HASH_HXX_
+#include <boost/mpl/if.hpp>
+
#include "from_nasal.hxx"
#include "to_nasal.hxx"
--
GitLab