Gentoo Archives: gentoo-commits

From: Maciej Mrozowski <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/, dev-games/simgear/, ...
Date: Thu, 16 Sep 2021 21:14:15
Message-Id: 1631826758.8a240d1e4351e16aeaaa779128352198c4ebe503.reavertm@gentoo
1 commit: 8a240d1e4351e16aeaaa779128352198c4ebe503
2 Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 16 21:10:24 2021 +0000
4 Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 16 21:12:38 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a240d1e
7
8 games-simulation/flightgear: version bump 2020.3.11, remove old
9
10 Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
11
12 dev-games/simgear/Manifest | 2 +-
13 .../{simgear-2020.3.8.ebuild => simgear-2020.3.11.ebuild} | 0
14 games-simulation/flightgear-data/Manifest | 2 +-
15 ...data-2020.3.8.ebuild => flightgear-data-2020.3.11.ebuild} | 0
16 games-simulation/flightgear/Manifest | 2 +-
17 .../flightgear/files/flightgear-2020.3.11-fix-assert.patch | 12 ++++++++++++
18 ...lightgear-2020.3.8.ebuild => flightgear-2020.3.11.ebuild} | 1 +
19 7 files changed, 16 insertions(+), 3 deletions(-)
20
21 diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
22 index 882c88bd0d9..e7fd9ec900c 100644
23 --- a/dev-games/simgear/Manifest
24 +++ b/dev-games/simgear/Manifest
25 @@ -1 +1 @@
26 -DIST simgear-2020.3.8.tar.bz2 1410292 BLAKE2B 0a8f046f0215d8d142fc191b8f984eed41fb5f3f7afb409eafeb4041cee79b2d43415b808b1e382fa74b06444fe7e6f6efa9fe26b88a68a10efa5f8e3ac88161 SHA512 24d7084145a30bc10e742e87a886f47e3b495c0a037dbea184e526b0230faadaaa23d3b60d782906bed97636d2a35df25201dae01e11a66fa2f94c19bbc53256
27 +DIST simgear-2020.3.11.tar.bz2 1415047 BLAKE2B f41391d6d018e7c5bc00897fdbd7ce431b02b0e925a62a2ec8f09a217a79efc3d2a20f247b61c8164f0d154b1202620bd68e76847acfba0c41bdb0b56f284d30 SHA512 e7b7c73a574012f9ee33cc751eca9dc968339d0f8f5ec005386ed6863d96af6d17423dd68eb5180f1c6bf3b05a422de10ce03ea5e745029445edac7919fc1c99
28
29 diff --git a/dev-games/simgear/simgear-2020.3.8.ebuild b/dev-games/simgear/simgear-2020.3.11.ebuild
30 similarity index 100%
31 rename from dev-games/simgear/simgear-2020.3.8.ebuild
32 rename to dev-games/simgear/simgear-2020.3.11.ebuild
33
34 diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
35 index 3572a6cdaff..7466237eb0d 100644
36 --- a/games-simulation/flightgear-data/Manifest
37 +++ b/games-simulation/flightgear-data/Manifest
38 @@ -1 +1 @@
39 -DIST FlightGear-2020.3.8-data.txz 1826816084 BLAKE2B 23ca8cc89662d120b21ac68f7d41fe47b1d17bfe3d23579e3a4ce44136e170682939002a5fe03223e9c92329ec737f0dd9e9f9d5d44604f4ff3ade8d957e5c17 SHA512 76f71873d9c017ef53cf8145886ae00163f95769dfe5b69a85d7a3f104358c3c96bd1e958762201716359097976a77a35b204eb0c78526bea3c50d85216b19bc
40 +DIST FlightGear-2020.3.11-data.txz 1736954520 BLAKE2B d5f3fd8facc93fab140171fad04ee0c331c4ab35c893ee762bb0b6250ee632c820e7570de57d2dfd6348fb9aaefdba209e845d00f67737b24eff17b025b30aa4 SHA512 b46193d4e9138ec58da048d9c3a36d47ae7204673fb9524f23b3d52dab02db8ef52fe8d67b7fd648222aac8585dd7e2fa5484317fdd07e07a58f3816f1378702
41
42 diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.8.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild
43 similarity index 100%
44 rename from games-simulation/flightgear-data/flightgear-data-2020.3.8.ebuild
45 rename to games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild
46
47 diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
48 index 223daa3527e..0d9ca261c9e 100644
49 --- a/games-simulation/flightgear/Manifest
50 +++ b/games-simulation/flightgear/Manifest
51 @@ -1 +1 @@
52 -DIST flightgear-2020.3.8.tar.bz2 8922064 BLAKE2B b345e8a5e733d48c1e061feb11ed96f130ab2d4832c478e9251092862668007eb7e39b29720c7274b91d63eff34cb21597fa6384b6837a5949feeceb6db62331 SHA512 b2c5afeae65558bf086ce20b22a2802580b3ac177f049a8df3b70437adbc6fee067673372c19c14a1c10ffac81a4a77fb13c68d342094a84605190fd3f5442e9
53 +DIST flightgear-2020.3.11.tar.bz2 8926212 BLAKE2B 03b3203fb688fe842247f8ac11957f438f02154cbc992bb98076ab3dd6fcac5f3241509cc1c621f3b647487b772257763d154c756792ce8ff738ff5396fe07ef SHA512 9a7c6f262da8daf3d954df7a2a8a96e555f3212c1d949211d0dbddd08a8f7380fa8f4986d60f48e17db563154d250184ee772b79b10277a2c5819fabec3930ee
54
55 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
56 new file mode 100644
57 index 00000000000..f35cf2c426a
58 --- /dev/null
59 +++ b/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch
60 @@ -0,0 +1,12 @@
61 +diff -ruN flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx fgfs-my/src/Navaids/PositionedOctree.cxx
62 +--- flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx 2021-07-29 11:35:40.000000000 +0200
63 ++++ fgfs-my/src/Navaids/PositionedOctree.cxx 2021-09-16 23:01:20.989931176 +0200
64 +@@ -148,7 +148,7 @@
65 +
66 + void Leaf::insertChild(FGPositioned::Type ty, PositionedID id)
67 + {
68 +- assert(childrenLoaded);
69 ++ assert(_childrenLoaded);
70 + children.insert(children.end(), TypedPositioned(ty, id));
71 + }
72 +
73
74 diff --git a/games-simulation/flightgear/flightgear-2020.3.8.ebuild b/games-simulation/flightgear/flightgear-2020.3.11.ebuild
75 similarity index 98%
76 rename from games-simulation/flightgear/flightgear-2020.3.8.ebuild
77 rename to games-simulation/flightgear/flightgear-2020.3.11.ebuild
78 index d985a68664d..63fa5defb42 100644
79 --- a/games-simulation/flightgear/flightgear-2020.3.8.ebuild
80 +++ b/games-simulation/flightgear/flightgear-2020.3.11.ebuild
81 @@ -65,6 +65,7 @@ RDEPEND="${COMMON_DEPEND}
82
83 PATCHES=(
84 "${FILESDIR}/${PN}-2020.3.8-cmake.patch"
85 + "${FILESDIR}/${PN}-2020.3.11-fix-assert.patch"
86 )
87
88 DOCS=(AUTHORS ChangeLog NEWS README Thanks)