| 1 |
commit: fd9240d1080f5b37dc010df68d7e504e8e1a27ea |
| 2 |
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 20 23:40:24 2019 +0000 |
| 4 |
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 20 23:42:13 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd9240d1 |
| 7 |
|
| 8 |
games-simulation/flightgear: Fix build dependencies, bug 686904. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
| 11 |
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/flightgear-2018.3.2-cmake.patch | 24 ++++++++++++++++++++++ |
| 14 |
.../flightgear/flightgear-2018.3.2.ebuild | 3 +++ |
| 15 |
games-simulation/flightgear/flightgear-9999.ebuild | 3 +++ |
| 16 |
3 files changed, 30 insertions(+) |
| 17 |
|
| 18 |
diff --git a/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch b/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..97747e8b748 |
| 21 |
--- /dev/null |
| 22 |
+++ b/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch |
| 23 |
@@ -0,0 +1,24 @@ |
| 24 |
+diff -ruN flightgear-2018.3.2/CMakeLists.txt my/CMakeLists.txt |
| 25 |
+--- flightgear-2018.3.2/CMakeLists.txt 2019-01-29 14:17:49.000000000 +0100 |
| 26 |
++++ my/CMakeLists.txt 2019-08-18 05:29:04.762138013 +0200 |
| 27 |
+@@ -323,7 +323,7 @@ |
| 28 |
+ ## Qt5 setup setup |
| 29 |
+ if (ENABLE_QT) |
| 30 |
+ message(STATUS "Qt launcher enabled, checking for Qt >= 5.4 / qmake") |
| 31 |
+- find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick Svg) |
| 32 |
++ find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick) |
| 33 |
+ if (Qt5Widgets_FOUND) |
| 34 |
+ message(STATUS "Will enable Qt launcher GUI") |
| 35 |
+ message(STATUS " Qt5Widgets version: ${Qt5Widgets_VERSION_STRING}") |
| 36 |
+diff -ruN flightgear-2018.3.2/src/GUI/CMakeLists.txt my/src/GUI/CMakeLists.txt |
| 37 |
+--- flightgear-2018.3.2/src/GUI/CMakeLists.txt 2019-01-29 14:17:50.000000000 +0100 |
| 38 |
++++ my/src/GUI/CMakeLists.txt 2019-08-18 05:38:19.607822998 +0200 |
| 39 |
+@@ -127,7 +127,7 @@ |
| 40 |
+ ${qml_sources}) |
| 41 |
+ |
| 42 |
+ set_property(TARGET fglauncher PROPERTY AUTOMOC ON) |
| 43 |
+- target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick Qt5::Svg SimGearCore) |
| 44 |
++ target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick SimGearCore) |
| 45 |
+ target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI) |
| 46 |
+ |
| 47 |
+ add_library(fgqmlui QQuickDrawable.cxx |
| 48 |
|
| 49 |
diff --git a/games-simulation/flightgear/flightgear-2018.3.2.ebuild b/games-simulation/flightgear/flightgear-2018.3.2.ebuild |
| 50 |
index 31cb9fe151d..ddec50a3ac8 100644 |
| 51 |
--- a/games-simulation/flightgear/flightgear-2018.3.2.ebuild |
| 52 |
+++ b/games-simulation/flightgear/flightgear-2018.3.2.ebuild |
| 53 |
@@ -53,6 +53,7 @@ COMMON_DEPEND=" |
| 54 |
DEPEND="${COMMON_DEPEND} |
| 55 |
>=dev-libs/boost-1.44 |
| 56 |
>=media-libs/plib-1.8.5 |
| 57 |
+ qt5? ( >=dev-qt/linguist-tools-5.7.1:5 ) |
| 58 |
utils? ( |
| 59 |
x11-libs/libXi |
| 60 |
x11-libs/libXmu |
| 61 |
@@ -62,6 +63,8 @@ RDEPEND="${COMMON_DEPEND} |
| 62 |
~games-simulation/${PN}-data-${PV} |
| 63 |
" |
| 64 |
|
| 65 |
+PATCHES=("${FILESDIR}/${PN}-2018.3.2-cmake.patch") |
| 66 |
+ |
| 67 |
DOCS=(AUTHORS ChangeLog NEWS README Thanks) |
| 68 |
|
| 69 |
pkg_pretend() { |
| 70 |
|
| 71 |
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild |
| 72 |
index e485d9af2d3..0243250482c 100644 |
| 73 |
--- a/games-simulation/flightgear/flightgear-9999.ebuild |
| 74 |
+++ b/games-simulation/flightgear/flightgear-9999.ebuild |
| 75 |
@@ -55,6 +55,7 @@ COMMON_DEPEND=" |
| 76 |
DEPEND="${COMMON_DEPEND} |
| 77 |
>=dev-libs/boost-1.44 |
| 78 |
>=media-libs/plib-1.8.5 |
| 79 |
+ qt5? ( >=dev-qt/linguist-tools-5.7.1:5 ) |
| 80 |
utils? ( |
| 81 |
x11-libs/libXi |
| 82 |
x11-libs/libXmu |
| 83 |
@@ -64,6 +65,8 @@ RDEPEND="${COMMON_DEPEND} |
| 84 |
~games-simulation/${PN}-data-${PV} |
| 85 |
" |
| 86 |
|
| 87 |
+PATCHES=("${FILESDIR}/${PN}-2018.3.2-cmake.patch") |
| 88 |
+ |
| 89 |
DOCS=(AUTHORS ChangeLog NEWS README Thanks) |
| 90 |
|
| 91 |
pkg_pretend() { |
Archives