mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
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>
This commit is contained in:
@@ -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
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user