$ git diff --patch-with-stat --summary 62fa0a0d2ac1e4f1e75e9a58028f3a0cb3d3c7e6..01b95c2cce61cab79a315899e780447d2da7d6ed
.abf.yml | 2 +-
flightgear-2020.3.18-clang16.patch | 20 ++++++++++++++++++++
flightgear.spec | 13 +++++++------
3 files changed, 28 insertions(+), 7 deletions(-)
create mode 100644 flightgear-2020.3.18-clang16.patch
diff --git a/.abf.yml b/.abf.yml
index ba37c99..8141b1f 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -4,4 +4,4 @@ sources:
flightgear.32.png: 655597c8087b916f6f50eca66c622827ea92f1a3
flightgear.48.png: 71b39cf4c17e1fc8e71a35eaf47dee0e258df28e
flightgear.64.png: 05e337b34797fa2e18a173aebf8bba4d381998fa
- flightgear-2020.3.15.tar.bz2: 9124aee5c68a5536940ade813df1761fd2f8d490
+ flightgear-2020.3.19.tar.bz2: 9699403476b7ace380250fe8539afaff683ce907
diff --git a/flightgear-2020.3.18-clang16.patch b/flightgear-2020.3.18-clang16.patch
new file mode 100644
index 0000000..c5130c7
--- /dev/null
+++ b/flightgear-2020.3.18-clang16.patch
@@ -0,0 +1,20 @@
+diff -up flightgear-2020.3.18/CMakeLists.txt.omv~ flightgear-2020.3.18/CMakeLists.txt
+--- flightgear-2020.3.18/CMakeLists.txt.omv~ 2023-06-20 04:49:16.021173330 +0200
++++ flightgear-2020.3.18/CMakeLists.txt 2023-06-20 04:49:23.079229803 +0200
+@@ -56,7 +56,7 @@ endif()
+
+ # let's use & require C++11 - note these are only functional with CMake 3.1
+ # we do manual fallbacks for CMake 3.0 in the compilers section
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 20)
+ set(CMAKE_CXX_STANDARD_REQUIRED YES)
+
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")
+diff -up flightgear-2020.3.18/package/org.flightgear.FlightGear.metainfo.in.omv~ flightgear-2020.3.18/package/org.flightgear.FlightGear.metainfo.in
+--- flightgear-2020.3.18/package/org.flightgear.FlightGear.metainfo.in.omv~ 2023-06-20 03:33:55.455242456 +0200
++++ flightgear-2020.3.18/package/org.flightgear.FlightGear.metainfo.in 2023-06-20 03:33:57.625257718 +0200
+@@ -1,4 +1,3 @@
+-
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
+ <!-- HOUSEKEEPING, REMOVE THIS COMMENT WHEN THIS GOES UPSTREAM
diff --git a/flightgear.spec b/flightgear.spec
index a78ecf8..588206f 100644
--- a/flightgear.spec
+++ b/flightgear.spec
@@ -1,7 +1,7 @@
Summary: The FlightGear Flight Simulator
Name: flightgear
-Version: 2020.3.15
-Release: 2
+Version: 2020.3.19
+Release: 1
License: GPLv2+
Group: Games/Other
Url: http://www.flightgear.org/
@@ -14,6 +14,7 @@ Source15: %{name}.128.png
Patch0: flightgear-2020.3.5-fix-build-openmandriva.patch
Patch1: flightgear-2020.3.6-non-x86.patch
+Patch2: flightgear-2020.3.18-clang16.patch
BuildRequires: cmake
BuildRequires: ninja
@@ -59,7 +60,7 @@ framework for the development and pursuit of interesting flight simulator
ideas. We are developing a solid basic sim that can be expanded and improved
upon by anyone interested in contributing.
-%files
+%files -f %{name}.lang
%doc README AUTHORS docs-mini/
%{_bindir}/*
%{_datadir}/applications/%{name}.desktop
@@ -74,8 +75,6 @@ upon by anyone interested in contributing.
%{_iconsdir}/hicolor/scalable/apps/%{name}.svg
%{_mandir}/man1/*
%{_mandir}/man5/*
-%{_mandir}/it/man1/*
-%{_mandir}/it/man5/*
%{_datadir}/bash-completion/completions/fgfs
%{_datadir}/zsh/site-functions/_fgfs
%{_datadir}/metainfo/org.flightgear.FlightGear.metainfo.xml
@@ -98,6 +97,7 @@ for ext in Cygwin IRIX Joystick Linux MSVC MSVC8 MacOS SimGear Unix Win32-X auto
rm -f docs-mini/README.${ext}
done
+export CXXFLAGS="%{optflags} -fPIC"
%cmake \
-G Ninja \
-DFG_DATA_DIR=%{_datadir}/%{name} \
@@ -115,6 +115,8 @@ done
%install
%ninja_install -C build
+%find_lang %{name} --with-man --all-name
+
mkdir -p %{buildroot}%{_datadir}/applications
mkdir -p %{buildroot}%{_iconsdir}/hicolor/16x16/apps
mkdir -p %{buildroot}%{_iconsdir}/hicolor/32x32/apps
@@ -147,4 +149,3 @@ rm -rf %{buildroot}%{_docdir}/FlightGear
# remove obsolete utilities (taken from OBS)
cd %{buildroot}%{_bindir} && rm GPSsmooth MIDGsmooth UGsmooth metar
-