commit: 86d5262dccd8ca0eaa12aa89d2357e352a8c2cc7
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 23:02:22 2021 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Fri May 14 23:03:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86d5262d
games-simulation/flightgear: version bump, remove old
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
dev-games/simgear/Manifest | 2 +-
...mgear-2020.3.6.ebuild => simgear-2020.3.8.ebuild} | 1 +
games-simulation/flightgear-data/Manifest | 2 +-
...20.3.6.ebuild => flightgear-data-2020.3.8.ebuild} | 4 ++--
games-simulation/flightgear/Manifest | 2 +-
...5-cmake.patch => flightgear-2020.3.8-cmake.patch} | 20 ++++++++++----------
...ar-2020.3.6.ebuild => flightgear-2020.3.8.ebuild} | 2 +-
7 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index ef72d263f36..882c88bd0d9 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1 @@
-DIST simgear-2020.3.6.tar.bz2 1408963 BLAKE2B
55583e9a7463bb16bfa2ff6bbcd60b8160adf57246b3820371cd262a7376425fbed75ecc18396782eb9e62ddf540c352ad3417d38cf62c42e2a24b9439da958a
SHA512
eaa8e3663c5fb486ea0fdad26c490fa49472596157d8d19e60426d5a1d340dfda4e5e3d82f68542bb6d9689abb8e867dc33761ea578b9c8f6c07aeb4b942880e
+DIST simgear-2020.3.8.tar.bz2 1410292 BLAKE2B
0a8f046f0215d8d142fc191b8f984eed41fb5f3f7afb409eafeb4041cee79b2d43415b808b1e382fa74b06444fe7e6f6efa9fe26b88a68a10efa5f8e3ac88161
SHA512
24d7084145a30bc10e742e87a886f47e3b495c0a037dbea184e526b0230faadaaa23d3b60d782906bed97636d2a35df25201dae01e11a66fa2f94c19bbc53256
diff --git a/dev-games/simgear/simgear-2020.3.6.ebuild
b/dev-games/simgear/simgear-2020.3.8.ebuild
similarity index 98%
rename from dev-games/simgear/simgear-2020.3.6.ebuild
rename to dev-games/simgear/simgear-2020.3.8.ebuild
index 19f9fa3ffdb..03d49387c0e 100644
--- a/dev-games/simgear/simgear-2020.3.6.ebuild
+++ b/dev-games/simgear/simgear-2020.3.8.ebuild
@@ -17,6 +17,7 @@ RESTRICT="!test? ( test )"
# TODO aeonwave
COMMON_DEPEND="
+ app-arch/xz-utils
dev-libs/expat
dev-games/openscenegraph
media-libs/openal
diff --git a/games-simulation/flightgear-data/Manifest
b/games-simulation/flightgear-data/Manifest
index 7064a400870..3572a6cdaff 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1 @@
-DIST FlightGear-2020.3.6-data.tar.bz2 2009894075 BLAKE2B
5f8ed7c7290ede6c4b0a902d3d3ace515c2713ec237542c7f3537bfb48d99e480958344b8b5897e350ef800258408a2fe9c3058786c522402e4d88b18dfd5a72
SHA512
d29ff4feb72be167b57b9baae461c810aef537085084bfb0c0ffbb2d1575ced38a951478fa1fd395c219919528af7e050a6c5199c337592cf607da5a3c682017
+DIST FlightGear-2020.3.8-data.txz 1826816084 BLAKE2B
23ca8cc89662d120b21ac68f7d41fe47b1d17bfe3d23579e3a4ce44136e170682939002a5fe03223e9c92329ec737f0dd9e9f9d5d44604f4ff3ade8d957e5c17
SHA512
76f71873d9c017ef53cf8145886ae00163f95769dfe5b69a85d7a3f104358c3c96bd1e958762201716359097976a77a35b204eb0c78526bea3c50d85216b19bc
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.6.ebuild
b/games-simulation/flightgear-data/flightgear-data-2020.3.8.ebuild
similarity index 89%
rename from games-simulation/flightgear-data/flightgear-data-2020.3.6.ebuild
rename to games-simulation/flightgear-data/flightgear-data-2020.3.8.ebuild
index d5d9b497664..f6a2970e8ba 100644
--- a/games-simulation/flightgear-data/flightgear-data-2020.3.6.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2020.3.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="FlightGear data files"
HOMEPAGE="https://www.flightgear.org/";
-SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.txz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/games-simulation/flightgear/Manifest
b/games-simulation/flightgear/Manifest
index 78a719620d5..223daa3527e 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1 @@
-DIST flightgear-2020.3.6.tar.bz2 8837251 BLAKE2B
28b8032bd2b6da91f72ae19d4c0c3a6d38122ec2ce7e2e8d1bc3022003551c6c5887711d67868fd9546d79eb6def6c0f0571e62361e73deb6f0edc9c3159c8fa
SHA512
b0bfa6e02cf5c2e64aea85fb7433e583141471e15a7dff69dbc12c227835c6e52dcf5b2947a30847c2b291442878eee6265217311e441abb32c5f95bbf7df990
+DIST flightgear-2020.3.8.tar.bz2 8922064 BLAKE2B
b345e8a5e733d48c1e061feb11ed96f130ab2d4832c478e9251092862668007eb7e39b29720c7274b91d63eff34cb21597fa6384b6837a5949feeceb6db62331
SHA512
b2c5afeae65558bf086ce20b22a2802580b3ac177f049a8df3b70437adbc6fee067673372c19c14a1c10ffac81a4a77fb13c68d342094a84605190fd3f5442e9
diff --git a/games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch
b/games-simulation/flightgear/files/flightgear-2020.3.8-cmake.patch
similarity index 65%
rename from games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch
rename to games-simulation/flightgear/files/flightgear-2020.3.8-cmake.patch
index 0af961beacd..d89a0df947d 100644
--- a/games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch
+++ b/games-simulation/flightgear/files/flightgear-2020.3.8-cmake.patch
@@ -1,18 +1,18 @@
-diff -ruN flightgear-2020.3.5/CMakeLists.txt fgfs-my/CMakeLists.txt
---- flightgear-2020.3.5/CMakeLists.txt 2020-12-18 12:43:09.000000000 +0100
-+++ fgfs-my/CMakeLists.txt 2021-01-24 01:36:57.547695230 +0100
+diff -ruN flightgear-2020.3.8/CMakeLists.txt fgfs-my/CMakeLists.txt
+--- flightgear-2020.3.8/CMakeLists.txt 2021-03-24 15:35:40.000000000 +0100
++++ fgfs-my/CMakeLists.txt 2021-05-15 00:47:36.801503634 +0200
@@ -373,7 +373,7 @@
## Qt5 setup setup
if (ENABLE_QT)
message(STATUS "Qt launcher enabled, checking for Qt >= 5.4 / qmake")
- find_package(Qt5 5.4 COMPONENTS Widgets Gui Network Qml Quick Svg)
+ find_package(Qt5 5.4 COMPONENTS Widgets Gui Network Qml Quick)
- if (Qt5Widgets_FOUND)
+ if (Qt5Widgets_FOUND AND Qt5Quick_FOUND)
message(STATUS "Will enable Qt launcher GUI")
set(HAVE_QT 1)
-diff -ruN flightgear-2020.3.5/CMakeModules/SetupFGFSLibraries.cmake
fgfs-my/CMakeModules/SetupFGFSLibraries.cmake
---- flightgear-2020.3.5/CMakeModules/SetupFGFSLibraries.cmake 2020-12-18
12:43:09.000000000 +0100
-+++ fgfs-my/CMakeModules/SetupFGFSLibraries.cmake 2021-01-24
01:35:31.298263659 +0100
+diff -ruN flightgear-2020.3.8/CMakeModules/SetupFGFSLibraries.cmake
fgfs-my/CMakeModules/SetupFGFSLibraries.cmake
+--- flightgear-2020.3.8/CMakeModules/SetupFGFSLibraries.cmake 2021-03-24
15:35:40.000000000 +0100
++++ fgfs-my/CMakeModules/SetupFGFSLibraries.cmake 2021-05-15
00:47:36.801503634 +0200
@@ -33,15 +33,8 @@
# PkgConfig::DBUS target
@@ -31,9 +31,9 @@ diff -ruN
flightgear-2020.3.5/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMak
endif()
if(FG_HAVE_GPERFTOOLS)
-diff -ruN flightgear-2020.3.5/src/GUI/CMakeLists.txt
fgfs-my/src/GUI/CMakeLists.txt
---- flightgear-2020.3.5/src/GUI/CMakeLists.txt 2020-12-18 12:43:09.000000000
+0100
-+++ fgfs-my/src/GUI/CMakeLists.txt 2021-01-24 01:40:02.008618256 +0100
+diff -ruN flightgear-2020.3.8/src/GUI/CMakeLists.txt
fgfs-my/src/GUI/CMakeLists.txt
+--- flightgear-2020.3.8/src/GUI/CMakeLists.txt 2021-03-24 15:35:40.000000000
+0100
++++ fgfs-my/src/GUI/CMakeLists.txt 2021-05-15 00:47:36.801503634 +0200
@@ -142,7 +142,7 @@
set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
diff --git a/games-simulation/flightgear/flightgear-2020.3.6.ebuild
b/games-simulation/flightgear/flightgear-2020.3.8.ebuild
similarity index 99%
rename from games-simulation/flightgear/flightgear-2020.3.6.ebuild
rename to games-simulation/flightgear/flightgear-2020.3.8.ebuild
index 58c4fd7033e..d985a68664d 100644
--- a/games-simulation/flightgear/flightgear-2020.3.6.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.8.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-2020.3.5-cmake.patch"
+ "${FILESDIR}/${PN}-2020.3.8-cmake.patch"
)
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
