summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2021-09-16 23:10:24 +0200
committerMaciej Mrozowski <reavertm@gentoo.org>2021-09-16 23:12:38 +0200
commit8a240d1e4351e16aeaaa779128352198c4ebe503 (patch)
tree38cc5c0665fcebeefc4aa59a79369432a3953184 /games-simulation
parentnet-libs/glib-networking: bump to 2.70.0 (diff)
downloadgentoo-8a240d1e4351e16aeaaa779128352198c4ebe503.tar.gz
gentoo-8a240d1e4351e16aeaaa779128352198c4ebe503.tar.bz2
gentoo-8a240d1e4351e16aeaaa779128352198c4ebe503.zip
games-simulation/flightgear: version bump 2020.3.11, remove old
Signed-off-by: Maciej Mrozowski <reavertm@gentoo.org>
Diffstat (limited to 'games-simulation')
-rw-r--r--games-simulation/flightgear-data/Manifest2
-rw-r--r--games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild (renamed from games-simulation/flightgear-data/flightgear-data-2020.3.8.ebuild)0
-rw-r--r--games-simulation/flightgear/Manifest2
-rw-r--r--games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch12
-rw-r--r--games-simulation/flightgear/flightgear-2020.3.11.ebuild (renamed from games-simulation/flightgear/flightgear-2020.3.8.ebuild)1
5 files changed, 15 insertions, 2 deletions
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 3572a6cdaff1..7466237eb0db 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1 @@
-DIST FlightGear-2020.3.8-data.txz 1826816084 BLAKE2B 23ca8cc89662d120b21ac68f7d41fe47b1d17bfe3d23579e3a4ce44136e170682939002a5fe03223e9c92329ec737f0dd9e9f9d5d44604f4ff3ade8d957e5c17 SHA512 76f71873d9c017ef53cf8145886ae00163f95769dfe5b69a85d7a3f104358c3c96bd1e958762201716359097976a77a35b204eb0c78526bea3c50d85216b19bc
+DIST FlightGear-2020.3.11-data.txz 1736954520 BLAKE2B d5f3fd8facc93fab140171fad04ee0c331c4ab35c893ee762bb0b6250ee632c820e7570de57d2dfd6348fb9aaefdba209e845d00f67737b24eff17b025b30aa4 SHA512 b46193d4e9138ec58da048d9c3a36d47ae7204673fb9524f23b3d52dab02db8ef52fe8d67b7fd648222aac8585dd7e2fa5484317fdd07e07a58f3816f1378702
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.8.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild
index f6a2970e8ba8..f6a2970e8ba8 100644
--- a/games-simulation/flightgear-data/flightgear-data-2020.3.8.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 223daa3527e8..0d9ca261c9e9 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1 @@
-DIST flightgear-2020.3.8.tar.bz2 8922064 BLAKE2B b345e8a5e733d48c1e061feb11ed96f130ab2d4832c478e9251092862668007eb7e39b29720c7274b91d63eff34cb21597fa6384b6837a5949feeceb6db62331 SHA512 b2c5afeae65558bf086ce20b22a2802580b3ac177f049a8df3b70437adbc6fee067673372c19c14a1c10ffac81a4a77fb13c68d342094a84605190fd3f5442e9
+DIST flightgear-2020.3.11.tar.bz2 8926212 BLAKE2B 03b3203fb688fe842247f8ac11957f438f02154cbc992bb98076ab3dd6fcac5f3241509cc1c621f3b647487b772257763d154c756792ce8ff738ff5396fe07ef SHA512 9a7c6f262da8daf3d954df7a2a8a96e555f3212c1d949211d0dbddd08a8f7380fa8f4986d60f48e17db563154d250184ee772b79b10277a2c5819fabec3930ee
diff --git a/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch b/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch
new file mode 100644
index 000000000000..f35cf2c426a4
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch
@@ -0,0 +1,12 @@
+diff -ruN flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx fgfs-my/src/Navaids/PositionedOctree.cxx
+--- flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx 2021-07-29 11:35:40.000000000 +0200
++++ fgfs-my/src/Navaids/PositionedOctree.cxx 2021-09-16 23:01:20.989931176 +0200
+@@ -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/games-simulation/flightgear/flightgear-2020.3.8.ebuild b/games-simulation/flightgear/flightgear-2020.3.11.ebuild
index d985a68664d6..63fa5defb424 100644
--- a/games-simulation/flightgear/flightgear-2020.3.8.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.11.ebuild
@@ -65,6 +65,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-2020.3.8-cmake.patch"
+ "${FILESDIR}/${PN}-2020.3.11-fix-assert.patch"
)
DOCS=(AUTHORS ChangeLog NEWS README Thanks)