diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2019-08-21 01:40:24 +0200 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2019-08-21 01:42:13 +0200 |
| commit | fd9240d1080f5b37dc010df68d7e504e8e1a27ea (patch) | |
| tree | 0478b317a5c9d533b882a233ce41f7031889b823 /games-simulation/flightgear | |
| parent | media-fonts/noto-cjk: arm64 stable (bug #691514) (diff) | |
| download | gentoo-fd9240d1080f5b37dc010df68d7e504e8e1a27ea.tar.gz gentoo-fd9240d1080f5b37dc010df68d7e504e8e1a27ea.tar.bz2 gentoo-fd9240d1080f5b37dc010df68d7e504e8e1a27ea.zip | |
games-simulation/flightgear: Fix build dependencies, bug 686904.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Maciej Mrozowski <reavertm@gentoo.org>
Diffstat (limited to 'games-simulation/flightgear')
3 files changed, 30 insertions, 0 deletions
diff --git a/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch b/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch new file mode 100644 index 000000000000..97747e8b7487 --- /dev/null +++ b/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch @@ -0,0 +1,24 @@ +diff -ruN flightgear-2018.3.2/CMakeLists.txt my/CMakeLists.txt +--- flightgear-2018.3.2/CMakeLists.txt 2019-01-29 14:17:49.000000000 +0100 ++++ my/CMakeLists.txt 2019-08-18 05:29:04.762138013 +0200 +@@ -323,7 +323,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 Network Qml Quick Svg) ++ find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick) + if (Qt5Widgets_FOUND) + message(STATUS "Will enable Qt launcher GUI") + message(STATUS " Qt5Widgets version: ${Qt5Widgets_VERSION_STRING}") +diff -ruN flightgear-2018.3.2/src/GUI/CMakeLists.txt my/src/GUI/CMakeLists.txt +--- flightgear-2018.3.2/src/GUI/CMakeLists.txt 2019-01-29 14:17:50.000000000 +0100 ++++ my/src/GUI/CMakeLists.txt 2019-08-18 05:38:19.607822998 +0200 +@@ -127,7 +127,7 @@ + ${qml_sources}) + + set_property(TARGET fglauncher PROPERTY AUTOMOC ON) +- target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick Qt5::Svg SimGearCore) ++ target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick SimGearCore) + target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI) + + add_library(fgqmlui QQuickDrawable.cxx diff --git a/games-simulation/flightgear/flightgear-2018.3.2.ebuild b/games-simulation/flightgear/flightgear-2018.3.2.ebuild index 31cb9fe151d2..ddec50a3ac88 100644 --- a/games-simulation/flightgear/flightgear-2018.3.2.ebuild +++ b/games-simulation/flightgear/flightgear-2018.3.2.ebuild @@ -53,6 +53,7 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 + qt5? ( >=dev-qt/linguist-tools-5.7.1:5 ) utils? ( x11-libs/libXi x11-libs/libXmu @@ -62,6 +63,8 @@ RDEPEND="${COMMON_DEPEND} ~games-simulation/${PN}-data-${PV} " +PATCHES=("${FILESDIR}/${PN}-2018.3.2-cmake.patch") + DOCS=(AUTHORS ChangeLog NEWS README Thanks) pkg_pretend() { diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild index e485d9af2d35..0243250482c9 100644 --- a/games-simulation/flightgear/flightgear-9999.ebuild +++ b/games-simulation/flightgear/flightgear-9999.ebuild @@ -55,6 +55,7 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 + qt5? ( >=dev-qt/linguist-tools-5.7.1:5 ) utils? ( x11-libs/libXi x11-libs/libXmu @@ -64,6 +65,8 @@ RDEPEND="${COMMON_DEPEND} ~games-simulation/${PN}-data-${PV} " +PATCHES=("${FILESDIR}/${PN}-2018.3.2-cmake.patch") + DOCS=(AUTHORS ChangeLog NEWS README Thanks) pkg_pretend() { |