The package rpms/FlightGear.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/FlightGear.git/commit/?id=1fc7f65....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 1fc7f65978e5ece9efe6e95f27ff5db49aa35973
Author: Fabrice Bellet <fabrice(a)bellet.info>
Date: Tue Dec 1 20:28:10 2020 +0100
new upstream release
reenable arch s390x
disable compositor
add BR FlightGear-data for translation strings
diff --git a/.gitignore b/.gitignore
index 50e995a..1381605 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ FlightGear-2.0.0.tar.gz
/flightgear-2020.3.1.tar.bz2
/flightgear-2020.3.2.tar.bz2
/flightgear-2020.3.3.tar.bz2
+/flightgear-2020.3.4.tar.bz2
diff --git a/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
b/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
index 7593d47..a372269 100644
--- a/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
+++ b/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
@@ -1,4 +1,4 @@
-From ee03b1cc30dc4119628224422af2186da5b22ea8 Mon Sep 17 00:00:00 2001
+From 0514ad9913768c20bf7bf59696f9edc7b1376789 Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice(a)bellet.info>
Date: Sun, 22 Sep 2013 12:19:18 +0200
Subject: [PATCH] check to be sure that %n is not being set as format type
diff --git a/0002-Use-system-iaxclient-instead-of-bundled-one.patch
b/0002-use-system-iaxclient-instead-of-bundled-one.patch
similarity index 95%
rename from 0002-Use-system-iaxclient-instead-of-bundled-one.patch
rename to 0002-use-system-iaxclient-instead-of-bundled-one.patch
index 683cda4..f927586 100644
--- a/0002-Use-system-iaxclient-instead-of-bundled-one.patch
+++ b/0002-use-system-iaxclient-instead-of-bundled-one.patch
@@ -1,7 +1,7 @@
-From 41fce692aefde93de25963f855d325e67985d0a5 Mon Sep 17 00:00:00 2001
+From 5a4c9c327a18b52d5d9fc13c36eb3cbc0e80b6c1 Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice(a)bellet.info>
Date: Tue, 17 Feb 2015 20:14:04 +0100
-Subject: [PATCH] Use system iaxclient instead of bundled one
+Subject: [PATCH] use system iaxclient instead of bundled one
---
3rdparty/CMakeLists.txt | 4 ----
diff --git a/0004-desktop-use-fgfs-wrapper.patch b/0003-desktop-use-fgfs-wrapper.patch
similarity index 92%
rename from 0004-desktop-use-fgfs-wrapper.patch
rename to 0003-desktop-use-fgfs-wrapper.patch
index a375e48..d5ce509 100644
--- a/0004-desktop-use-fgfs-wrapper.patch
+++ b/0003-desktop-use-fgfs-wrapper.patch
@@ -1,4 +1,4 @@
-From e75488cf65c141f86d4e60c16ef3033ab35c55eb Mon Sep 17 00:00:00 2001
+From 1e4d597e0492b48ea874845efaf5b88fe325209e Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice(a)bellet.info>
Date: Thu, 14 Dec 2017 16:56:09 +0100
Subject: [PATCH] desktop: use fgfs-wrapper
diff --git a/0003-make-fglauncher-a-static-library.patch
b/0003-make-fglauncher-a-static-library.patch
deleted file mode 100644
index c299f0b..0000000
--- a/0003-make-fglauncher-a-static-library.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d98fba65502a7a612b05153048e4d870f01a97a0 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 17 Feb 2015 23:00:29 +0100
-Subject: [PATCH] make fglauncher a static library
-
----
- src/GUI/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
-index b2a962be3..ca0182bc9 100644
---- a/src/GUI/CMakeLists.txt
-+++ b/src/GUI/CMakeLists.txt
-@@ -76,7 +76,7 @@ if (HAVE_QT)
- qt5_add_resources(qrc_sources ${PROJECT_BINARY_DIR}/translations.qrc)
- endif()
-
-- add_library(fglauncher QtLauncher.cxx
-+ add_library(fglauncher STATIC QtLauncher.cxx
- QtLauncher.hxx
- LauncherMainWindow.hxx
- LauncherMainWindow.cxx
---
-2.26.2
-
diff --git a/0006-fgviewer-fix-crash-on-exit.patch
b/0004-fgviewer-fix-crash-on-exit.patch
similarity index 92%
rename from 0006-fgviewer-fix-crash-on-exit.patch
rename to 0004-fgviewer-fix-crash-on-exit.patch
index 56975e5..0177cf1 100644
--- a/0006-fgviewer-fix-crash-on-exit.patch
+++ b/0004-fgviewer-fix-crash-on-exit.patch
@@ -1,4 +1,4 @@
-From dd50cf31363441589054d2dd1d0ad3dbfc90c849 Mon Sep 17 00:00:00 2001
+From bfb1dfad610e3584904d23d2fd1e54cc065639db Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice(a)bellet.info>
Date: Wed, 7 Jun 2017 09:19:06 +0200
Subject: [PATCH] fgviewer: fix crash on exit
diff --git a/0009-fgviewer-disconnect-the-viewer-from-the-renderer.patch
b/0005-fgviewer-disconnect-the-viewer-from-the-renderer.patch
similarity index 91%
rename from 0009-fgviewer-disconnect-the-viewer-from-the-renderer.patch
rename to 0005-fgviewer-disconnect-the-viewer-from-the-renderer.patch
index 3df273d..207d53b 100644
--- a/0009-fgviewer-disconnect-the-viewer-from-the-renderer.patch
+++ b/0005-fgviewer-disconnect-the-viewer-from-the-renderer.patch
@@ -1,4 +1,4 @@
-From 839d51e8106acf62d677915383ec53cb83d8b99a Mon Sep 17 00:00:00 2001
+From a471169c4cf779456f8e36193cf42097a963289d Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice(a)bellet.info>
Date: Sat, 31 Oct 2020 22:24:44 +0100
Subject: [PATCH] fgviewer: disconnect the viewer from the renderer
diff --git a/0005-make-fgqmlui-a-static-library.patch
b/0005-make-fgqmlui-a-static-library.patch
deleted file mode 100644
index 47cd697..0000000
--- a/0005-make-fgqmlui-a-static-library.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e8f03a0c7a48bc23ef3b0c98b1cabde79569e1ef Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Sun, 8 Apr 2018 18:03:30 +0200
-Subject: [PATCH] make fgqmlui a static library
-
----
- src/GUI/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
-index ca0182bc9..045fb2c80 100644
---- a/src/GUI/CMakeLists.txt
-+++ b/src/GUI/CMakeLists.txt
-@@ -150,7 +150,7 @@ if (HAVE_QT)
- QQuickDrawable.hxx)
- endif()
-
-- add_library(fgqmlui
-+ add_library(fgqmlui STATIC
- QtQuickFGCanvasItem.cxx
- QtQuickFGCanvasItem.hxx
- PropertyItemModel.cxx
---
-2.26.2
-
diff --git a/0006-fix-a-crash-in-runwayprefs.patch
b/0006-fix-a-crash-in-runwayprefs.patch
new file mode 100644
index 0000000..a73c1e9
--- /dev/null
+++ b/0006-fix-a-crash-in-runwayprefs.patch
@@ -0,0 +1,30 @@
+From a84999e37a03fe4561e8314ccadf11cf3e8a5208 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice(a)bellet.info>
+Date: Tue, 1 Dec 2020 10:00:44 +0100
+Subject: [PATCH] fix a crash in runwayprefs
+
+A segmentation fault happens when the runway list in airports files
+XXXX.rawuse.xml have a variable length, and
+rwyList[0].getRwyList()->size() cannot be considered to be a constant
+valid for all next lists.
+---
+ src/Airports/runwayprefs.cxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/Airports/runwayprefs.cxx b/src/Airports/runwayprefs.cxx
+index 80d878850..19d666584 100644
+--- a/src/Airports/runwayprefs.cxx
++++ b/src/Airports/runwayprefs.cxx
+@@ -229,6 +229,9 @@ void RunwayGroup::setActive(const FGAirport * airport,
+ validSelection = true;
+
+ for (int j = 0; j < activeRwys; j++) {
++ if (i >= rwyList[j].getRwyList()->size())
++ continue;
++
+ std::string ident(rwyList[j].getRwyList(i));
+ if (!airport->hasRunwayWithIdent(ident)) {
+ SG_LOG(SG_GENERAL, SG_WARN,
+--
+2.26.2
+
diff --git a/0007-build-fix-for-gcc-10.patch b/0007-build-fix-for-gcc-10.patch
deleted file mode 100644
index 6eccc15..0000000
--- a/0007-build-fix-for-gcc-10.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 06674f192886b9990f6cd3f5db4bbe82c5dba715 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Mon, 30 Sep 2019 09:25:08 +0200
-Subject: [PATCH] build fix for gcc-10
-
----
- src/Aircraft/AircraftPerformance.hxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Aircraft/AircraftPerformance.hxx b/src/Aircraft/AircraftPerformance.hxx
-index fcf6878fa..ff6354dab 100644
---- a/src/Aircraft/AircraftPerformance.hxx
-+++ b/src/Aircraft/AircraftPerformance.hxx
-@@ -21,6 +21,7 @@
- #include <string>
- #include <vector>
- #include <functional>
-+#include <string>
-
- namespace flightgear
- {
---
-2.26.2
-
diff --git a/0007-fgviewer-use-correct-renderer-declaration.patch
b/0007-fgviewer-use-correct-renderer-declaration.patch
new file mode 100644
index 0000000..5c83e76
--- /dev/null
+++ b/0007-fgviewer-use-correct-renderer-declaration.patch
@@ -0,0 +1,25 @@
+From 92cba7eda91cd2ae8038fb13c313c68cf74750b3 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice(a)bellet.info>
+Date: Wed, 2 Dec 2020 11:02:35 +0100
+Subject: [PATCH] fgviewer: use correct renderer declaration
+
+---
+ src/Viewer/fgviewer.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Viewer/fgviewer.cxx b/src/Viewer/fgviewer.cxx
+index f83804495..40a076622 100644
+--- a/src/Viewer/fgviewer.cxx
++++ b/src/Viewer/fgviewer.cxx
+@@ -34,7 +34,7 @@
+ #include <Scenery/scenery.hxx>
+
+ #include <Navaids/NavDataCache.hxx>
+-#include <Viewer/renderer_compositor.hxx>
++#include <Viewer/renderer.hxx>
+
+ #include <Main/fg_props.hxx>
+ #include <Main/globals.hxx>
+--
+2.26.2
+
diff --git a/0008-cmake-revert-automatic-translations-detection.patch
b/0008-cmake-revert-automatic-translations-detection.patch
deleted file mode 100644
index dee3ab5..0000000
--- a/0008-cmake-revert-automatic-translations-detection.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 10a0f198107556e46ea752ff863d502c5b131dc0 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Thu, 29 Oct 2020 21:36:29 +0100
-Subject: [PATCH] cmake: revert automatic translations detection
-
-This reverts commit 31c911873. We don't have to rely on FlightGear-data
-package to be installed when building FlightGear.
----
- CMakeModules/Translations.cmake | 16 ++--------------
- 1 file changed, 2 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeModules/Translations.cmake b/CMakeModules/Translations.cmake
-index 7802ad5cf..8940354db 100644
---- a/CMakeModules/Translations.cmake
-+++ b/CMakeModules/Translations.cmake
-@@ -20,20 +20,8 @@ if (${do_translate} AND NOT TARGET Qt5::lrelease)
- endif()
-
-
--function(translation_dir_list result curdir)
-- file(GLOB children RELATIVE ${curdir} ${curdir}/*)
-- set(dirlist "")
-- foreach(child ${children})
-- if (${child} STREQUAL "default")
-- continue()
-- endif()
--
-- if (IS_DIRECTORY ${curdir}/${child})
-- list(APPEND dirlist ${child})
-- endif()
-- endforeach()
-- set(${result} ${dirlist} PARENT_SCOPE)
--endfunction()
-+# FIXME - determine this based on subdirs of TRANSLATIONS_SRC_DIR
-+set(LANGUAGES en_US de es nl fr it pl pt ru zh_CN ca sk)
-
- if (${do_translate})
- translation_dir_list(LANGUAGES ${TRANSLATIONS_SRC_DIR})
---
-2.26.2
-
diff --git a/0008-fgviewer-prevent-an-assert-on-uninitialized-locale.patch
b/0008-fgviewer-prevent-an-assert-on-uninitialized-locale.patch
new file mode 100644
index 0000000..041dc53
--- /dev/null
+++ b/0008-fgviewer-prevent-an-assert-on-uninitialized-locale.patch
@@ -0,0 +1,34 @@
+From 07ec9ddcc1fabec38e1f9b8202c8bf813e3308e2 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice(a)bellet.info>
+Date: Wed, 2 Dec 2020 11:03:37 +0100
+Subject: [PATCH] fgviewer: prevent an assert on uninitialized locale
+
+---
+ src/Viewer/fgviewer.cxx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/Viewer/fgviewer.cxx b/src/Viewer/fgviewer.cxx
+index 40a076622..43685488f 100644
+--- a/src/Viewer/fgviewer.cxx
++++ b/src/Viewer/fgviewer.cxx
+@@ -38,6 +38,7 @@
+
+ #include <Main/fg_props.hxx>
+ #include <Main/globals.hxx>
++#include <Main/locale.hxx>
+ #include <Main/options.hxx>
+ #include <Main/fg_init.hxx>
+
+@@ -225,6 +226,9 @@ fgviewerMain(int argc, char** argv)
+ options->setPropertyNode(globals->get_props());
+ options->setPluginStringData("SimGear::PREVIEW", "ON");
+
++ // otherwise fgSplashProgress will assert
++ globals->get_locale()->selectLanguage({});
++
+ // Now init the renderer, as we've got all the options, globals etc.
+ fgrenderer->init();
+
+--
+2.26.2
+
diff --git a/FlightGear.spec b/FlightGear.spec
index 638cac1..d34913b 100644
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -3,35 +3,31 @@
Name: FlightGear
Summary: The FlightGear Flight Simulator
-Version: 2020.3.3
+Version: 2020.3.4
Release: 1%{?dist}
License: GPLv2+
Source0:
https://sourceforge.net/projects/flightgear/files/release-2020.3/flightge...
Patch1: 0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
-Patch2: 0002-Use-system-iaxclient-instead-of-bundled-one.patch
-Patch3: 0003-make-fglauncher-a-static-library.patch
-Patch4: 0004-desktop-use-fgfs-wrapper.patch
-Patch5: 0005-make-fgqmlui-a-static-library.patch
-Patch6: 0006-fgviewer-fix-crash-on-exit.patch
-Patch7: 0007-build-fix-for-gcc-10.patch
-Patch8: 0008-cmake-revert-automatic-translations-detection.patch
-Patch9: 0009-fgviewer-disconnect-the-viewer-from-the-renderer.patch
+Patch2: 0002-use-system-iaxclient-instead-of-bundled-one.patch
+Patch3: 0003-desktop-use-fgfs-wrapper.patch
+Patch4: 0004-fgviewer-fix-crash-on-exit.patch
+Patch5: 0005-fgviewer-disconnect-the-viewer-from-the-renderer.patch
+Patch6: 0006-fix-a-crash-in-runwayprefs.patch
+Patch7: 0007-fgviewer-use-correct-renderer-declaration.patch
+Patch8: 0008-fgviewer-prevent-an-assert-on-uninitialized-locale.patch
URL:
http://www.flightgear.org/
BuildRequires: openal-soft-devel, SimGear-devel >= %{version}
BuildRequires: libpng-devel, freeglut-devel, libXi-devel, libXmu-devel
BuildRequires: OpenSceneGraph-devel >= 3.2.0, boost-devel >= 1.44.0
BuildRequires: fltk-fluid, fltk-devel, dbus-devel, sqlite-devel, glew-devel
-BuildRequires: cmake, desktop-file-utils, iaxclient-devel
+BuildRequires: cmake, desktop-file-utils, iaxclient-devel, libevent-devel
BuildRequires: bzip2-devel, systemd-devel, qt5-qtbase-devel, libcurl-devel
-BuildRequires: qt5-qtdeclarative-devel, qt5-qtsvg-devel, qt5-linguist
+BuildRequires: qt5-qtdeclarative-devel, qt5-qtsvg-devel, qt5-linguist
+BuildRequires: FlightGear-data >= %{version}
Requires: FlightGear-data >= %{version}, opengl-games-utils
Requires: hicolor-icon-theme
-# There are build problems on s390x, see
-#
https://koji.fedoraproject.org/koji/taskinfo?taskID=56448760
-ExcludeArch: s390x
-
%description
The Flight Gear project is working to create a sophisticated flight
simulator framework for the development and pursuit of interesting
@@ -61,10 +57,9 @@ done
%build
export CXXFLAGS="-fPIC $RPM_OPT_FLAGS"
%cmake \
+ -DBUILD_SHARED_LIBS:BOOL=OFF \
-DCMAKE_BUILD_TYPE=Release \
- -DSIMGEAR_SHARED=ON \
-DSYSTEM_SQLITE=ON \
- -DENABLE_COMPOSITOR=ON \
-DFG_DATA_DIR:PATH=%{_datadir}/flightgear \
-DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}
@@ -86,6 +81,12 @@ ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/fgfs-wrapper
%{_datadir}/metainfo/*.metainfo.xml
%changelog
+* Wed Dec 02 2020 Fabrice Bellet <fabrice(a)bellet.info> - 2020.3.4-1
+- new upstream release
+- reenable arch s390x
+- disable compositor
+- add BR FlightGear-data for translation strings
+
* Mon Nov 30 2020 Fabrice Bellet <fabrice(a)bellet.info> - 2020.3.3-1
- new upstream release
- temporary exclude arch s390x
@@ -96,6 +97,7 @@ ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/fgfs-wrapper
* Sat Oct 31 2020 Fabrice Bellet <fabrice(a)bellet.info> - 2020.3.1-1
- new upstream release
+- enable compositor
* Sat Oct 31 2020 Fabrice Bellet <fabrice(a)bellet.info> - 2020.1.3-5
- temprorarily disabling LTO build due to errors in libqt5core
diff --git a/sources b/sources
index aae5c59..1bb2f48 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (flightgear-2020.3.3.tar.bz2) =
424f81bae89d76208ceb6f44aa1e12c753f4fcd0ac685f798021fb420857172adf7ff5618c56560322b2e019ca1003a1a9460279f05fa100c6c545d4aeda0aa8
+SHA512 (flightgear-2020.3.4.tar.bz2) =
a7218fb72f0ecf36b50e707713fac67507ecb54196acf3c63c8ea624da3f319f6665cbc77da710e24dff175b0d054be15e2ad7474490841fe847da89cf5bed3f