commit:     b851f9ff0e05369d2ae65e51e5878c19d8839d01
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 20:05:56 2022 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 21:33:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b851f9ff

games-simulation/flightgear: version bump 2020.3.12, remove old

Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>

 dev-games/simgear/Manifest                                   |  2 +-
 .../{simgear-2020.3.11.ebuild => simgear-2020.3.12.ebuild}   |  0
 games-simulation/flightgear-data/Manifest                    |  2 +-
 ...ata-2020.3.11.ebuild => flightgear-data-2020.3.12.ebuild} |  0
 games-simulation/flightgear/Manifest                         |  2 +-
 .../flightgear/files/flightgear-2020.3.11-fix-assert.patch   | 12 ------------
 ...ightgear-2020.3.11.ebuild => flightgear-2020.3.12.ebuild} |  1 -
 7 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index e7fd9ec900ce..f1368969e3dd 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1 @@
-DIST simgear-2020.3.11.tar.bz2 1415047 BLAKE2B 
f41391d6d018e7c5bc00897fdbd7ce431b02b0e925a62a2ec8f09a217a79efc3d2a20f247b61c8164f0d154b1202620bd68e76847acfba0c41bdb0b56f284d30
 SHA512 
e7b7c73a574012f9ee33cc751eca9dc968339d0f8f5ec005386ed6863d96af6d17423dd68eb5180f1c6bf3b05a422de10ce03ea5e745029445edac7919fc1c99
+DIST simgear-2020.3.12.tar.bz2 1415062 BLAKE2B 
bed00dabb8d2ac937cb2fa7a8782c32568dc106d857dd2e9a7f3d2c99ad1372ffcd3c571b899920122e711ce1e561a9895762fb199f1cac947bb68769066b555
 SHA512 
2292c5c43b485fdf4b814b25eae8caa2ed16e043a159328aa5e35a27f9a4fd250219e8b506da1361916bd1d314bb857d3bd1343b1b6b34890bf06c63705c8dbc

diff --git a/dev-games/simgear/simgear-2020.3.11.ebuild 
b/dev-games/simgear/simgear-2020.3.12.ebuild
similarity index 100%
rename from dev-games/simgear/simgear-2020.3.11.ebuild
rename to dev-games/simgear/simgear-2020.3.12.ebuild

diff --git a/games-simulation/flightgear-data/Manifest 
b/games-simulation/flightgear-data/Manifest
index 7466237eb0db..dc86542310ac 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1 @@
-DIST FlightGear-2020.3.11-data.txz 1736954520 BLAKE2B 
d5f3fd8facc93fab140171fad04ee0c331c4ab35c893ee762bb0b6250ee632c820e7570de57d2dfd6348fb9aaefdba209e845d00f67737b24eff17b025b30aa4
 SHA512 
b46193d4e9138ec58da048d9c3a36d47ae7204673fb9524f23b3d52dab02db8ef52fe8d67b7fd648222aac8585dd7e2fa5484317fdd07e07a58f3816f1378702
+DIST FlightGear-2020.3.12-data.txz 1787955196 BLAKE2B 
648994bb8a70416d9fbf9fbb71c91d6652db4f915ce39938ad870f6de4a745c7f6df36025726fe29d67a598f1ce64718d12b7be5b81ebb83318246cd991fac1a
 SHA512 
7bb97c0b2ee59b300a95f331bfd12e39aaaa7d3320e33cc4e72ea3c5fae196af52e97d9ed7f6af274162ecdd00642e729d96165df5dcbcb95e2853cf7c1df463

diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild 
b/games-simulation/flightgear-data/flightgear-data-2020.3.12.ebuild
similarity index 100%
rename from games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild
rename to games-simulation/flightgear-data/flightgear-data-2020.3.12.ebuild

diff --git a/games-simulation/flightgear/Manifest 
b/games-simulation/flightgear/Manifest
index 0d9ca261c9e9..50074be20454 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1 @@
-DIST flightgear-2020.3.11.tar.bz2 8926212 BLAKE2B 
03b3203fb688fe842247f8ac11957f438f02154cbc992bb98076ab3dd6fcac5f3241509cc1c621f3b647487b772257763d154c756792ce8ff738ff5396fe07ef
 SHA512 
9a7c6f262da8daf3d954df7a2a8a96e555f3212c1d949211d0dbddd08a8f7380fa8f4986d60f48e17db563154d250184ee772b79b10277a2c5819fabec3930ee
+DIST flightgear-2020.3.12.tar.bz2 8929319 BLAKE2B 
e84b0519d69f46d5951372deed59f9b1219739710b3374d0bc0041127f8e4b7869c43b20169a9ac3a89d4e121f9da27d01c6db98e683bc3f80da6b1930e1a7c0
 SHA512 
91e04ae6dc5d12e799bab10b3c4321e77f8d995469453453fdff26a9858f40056dbe8c095423397fcbef307994042c377eb37532af2732674f39e5624c950e9c

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
deleted file mode 100644
index f35cf2c426a4..000000000000
--- a/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.11.ebuild 
b/games-simulation/flightgear/flightgear-2020.3.12.ebuild
similarity index 98%
rename from games-simulation/flightgear/flightgear-2020.3.11.ebuild
rename to games-simulation/flightgear/flightgear-2020.3.12.ebuild
index 5467dd59b859..baafbbda8846 100644
--- a/games-simulation/flightgear/flightgear-2020.3.11.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.12.ebuild
@@ -65,7 +65,6 @@ 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)

Reply via email to