From 6419d81f7d0a6cfdace303b9391d0260f86f4267 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 17:43:26 +0100
Subject: [PATCH] update to 2020.3.11 [release 2020.3.11-1mamba;Sun Oct 31
 2021]

---
 ...-2020.3.11-fix_childrenLoaded_assert.patch |  11 +++++++++
 FlightGear.spec                               |  23 ++++++++++++------
 flight.png                                    | Bin 763 -> 0 bytes
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 FlightGear-2020.3.11-fix_childrenLoaded_assert.patch
 delete mode 100644 flight.png

diff --git a/FlightGear-2020.3.11-fix_childrenLoaded_assert.patch b/FlightGear-2020.3.11-fix_childrenLoaded_assert.patch
new file mode 100644
index 0000000..240c750
--- /dev/null
+++ b/FlightGear-2020.3.11-fix_childrenLoaded_assert.patch
@@ -0,0 +1,11 @@
+--- flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx.orig	2021-11-01 09:55:26.210454089 +0000
++++ flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx	2021-11-01 09:46:03.555750391 +0000
+@@ -148,7 +148,7 @@
+ 
+ void Leaf::insertChild(FGPositioned::Type ty, PositionedID id)
+ {
+-  assert(childrenLoaded);
++  assert(_childrenLoaded);
+   children.insert(children.end(), TypedPositioned(ty, id));
+ }
+ 
diff --git a/FlightGear.spec b/FlightGear.spec
index a549ce4..6aca5ba 100644
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -1,7 +1,7 @@
 %define majver %(echo %version | cut -d. -f1-2)
 Name:          FlightGear
-Version:       2020.3.9
-Release:       2mamba
+Version:       2020.3.11
+Release:       1mamba
 Summary:       Flight Simulator
 Group:         Graphical Desktop/Applications/Games
 Vendor:        openmamba
@@ -10,9 +10,10 @@ Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://www.flightgear.org/
 Source0:	   https://downloads.sourceforge.net/project/flightgear/release-%{majver}/flightgear-%{version}.tar.bz2
 Source1:	   https://downloads.sourceforge.net/project/flightgear/release-%{majver}/FlightGear-%{version}-data.txz
-Source2:       flight.png
+#Source2:       flight.png
 Patch0:        FlightGear-3.4.0-fgviewer-find-lX11.patch
 Patch1:        FlightGear-2020.3.9-aarch64-rpi.patch
+Patch2:        FlightGear-2020.3.11-fix_childrenLoaded_assert.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -38,16 +39,17 @@ BuildRequires: libosg-devel
 BuildRequires: libplib-devel
 BuildRequires: libpng-devel
 BuildRequires: libqt5-devel
+BuildRequires: libraspberrypi-devel
 BuildRequires: libspeex-devel
 BuildRequires: libspeexdsp-devel
 BuildRequires: libstdc++6-devel
 BuildRequires: libudev-devel
 BuildRequires: libz-devel
 ## AUTOBUILDREQ-END
-BuildRequires: libSimGear-devel >= %{version}-2mamba
+BuildRequires: libSimGear-devel = %{version}
 BuildRequires: libfltk-devel >= 1.3.3-2mamba
 BuildRequires: libosg-devel >= 3.6.5
-Requires:      %{name}-data
+Requires:      %{name}-data = %{?epoch:%epoch:}%{version}-%{release}
 Requires:      alsa-oss
 
 %description
@@ -61,14 +63,18 @@ Summary:        Maps for %{name}
 The FlightGear flight simulator project is an open-source, multi-platform, cooperative flight simulator development project.
 This package contains maps and scenary for FlightGear.
 
+%debug_package
+
 %prep
 %setup -q -a1 -n flightgear-%{version}
-#% setup -q -n flightgear-%{version} -D -T
+#% setup -q -n flightgear-%{vers#ion} -D -T
 #:<< _EOF
 #%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
+#:<< _EOF
 %cmake -d build \
    -DCMAKE_EXE_LINKER_FLAGS="-lX11"
    
@@ -92,8 +98,6 @@ install -D -m0755 ./build/src/GUI/libfgqmluid.so %{buildroot}%{_libdir}/libfgqml
 %{_bindir}/*
 %{_libdir}/libfglauncherd.so
 %{_libdir}/libfgqmluid.so
-%dir %{_libdir}/FlightGear
-%{_libdir}/FlightGear/*
 %{_datadir}/applications/org.flightgear.FlightGear.desktop
 %{_datadir}/metainfo/org.flightgear.FlightGear.metainfo.xml
 %{_datadir}/bash-completion/completions/fgfs
@@ -112,6 +116,9 @@ install -D -m0755 ./build/src/GUI/libfgqmluid.so %{buildroot}%{_libdir}/libfgqml
 %{_libdir}/%{name}/*
 
 %changelog
+* Sun Oct 31 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2020.3.11-1mamba
+- update to 2020.3.11
+
 * Tue Jun 22 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2020.3.9-2mamba
 - rebuilt with OpenSceneGraph 3.6.5
 
diff --git a/flight.png b/flight.png
deleted file mode 100644
index c9f8034d20c054f95dca4f447c92dc43127b4c26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 763
zcmV<X0tEeuP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-Uh2MIedd|jz|0007-Nkl<ZD9>%uJ8u+M6ae6J?%bJK
zdw0F-<*{sRY#9&=f*?U6kPLDPC=ikO327+ksX(DkL&+aNNNIwCC{lzdX^=o9AY=K#
zdr2^O!7?82duHxE=iWmTrQ-VyAF}QE!7`!}01$!C6A%Ves&qvA;q%_gl~$)(D-JZT
zyRa~nF~Ar=i->sV{Qz|=jNbWR@`{GA9!BMz6$1jR>da5cg-w`n<cKU0*);8sGy~o6
z>z4c3<!=Lx@svOCOUOyr;EjiIl4amK5QOL)I0DW}{T+w5rFwhzSCWV{R7U)+Z8y@|
z)%j9;XtG}0E5$69DWde7UBM40#^xG&reKCkzX5>mSh)3U>-etGq8@E+wWIQm$PV(>
zlLidW&VFfgJHOCcc=Rw0il%W41a;m`)*t=(@xXNSz7xG^X`7xsHJitJeB0i7HM(}~
zdh>O&{>8*b{U{cy0!|B=-r9>hYp*Yy|9-j>RjQRNH;c<p(|&tpX+G)p=T4tHboi^E
z7m3-4Ahvq;-YTuEG%M|wt@RJy%iX^ha#fTdkV37v_oP5z8NfNV>5u2ebusYA$J1XE
z*V)jvUshpUK7FYOfv_>`$XHJXyk%y`9su;)Hvhhq9oo~#rt07A%Mnb{6%liD(Jicz
zBl6@NF%vVB2T^3R+YeqnUdyLSS>W5T@Z=cRN9_5d=HjfI+wC0x#}R=SEdp`AWqK9u
zqbz4)@W@JmkSkI5)QtM)1FdcnIun9L5RD?^emFDQv+p*S|CN4sFc_Lzt<3C<wZ`$+
zBmUU_$a;L-%t1h7h#zYcf`z`X#Zj1*OrfR|5F#IyL1|#ejOaX73#j4%dujH^{rSOg
t@PB0l5I__O0;LoHpm+fU1UNV|`3at-sDx`{w3h$?002ovPDHLkV1mNMXI}sS