diff --git a/srcpkgs/flightgear/patches/fix-link_with_x11.patch b/srcpkgs/flightgear/patches/fix-link_with_x11.patch index bdd101194d2..2b6c73cc454 100644 --- a/srcpkgs/flightgear/patches/fix-link_with_x11.patch +++ b/srcpkgs/flightgear/patches/fix-link_with_x11.patch @@ -20,17 +20,3 @@ index 12c0961..78c4163 100644 ) if(ENABLE_FLITE) -diff --git a/utils/fgviewer/CMakeLists.txt b/utils/fgviewer/CMakeLists.txt -index 165be74..065b8f1 100644 ---- utils/fgviewer/CMakeLists.txt -+++ utils/fgviewer/CMakeLists.txt -@@ -48,5 +48,6 @@ target_link_libraries(fgviewer - ${OPENGL_LIBRARIES} - ${FGVIEWER_RTI_LIBRARIES} - ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} -+ ${X11_X11_LIB} - ) - install(TARGETS fgviewer RUNTIME DESTINATION bin) --- -2.1.0 - diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template index 1d4973919aa..bce02d4bd12 100644 --- a/srcpkgs/flightgear/template +++ b/srcpkgs/flightgear/template @@ -1,6 +1,6 @@ # Template file for 'flightgear' pkgname=flightgear -version=2016.2.1 +version=2016.4.2 revision=1 build_style=cmake configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata" @@ -17,14 +17,14 @@ distfiles=" $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2 $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/FlightGear-${version}-data.tar.bz2" checksum=" - b554170ca6b5943fd90496759b055fb60f362ea96f6c46dfff89e3d12c940a94 - 225b32f4d813635ece72f09541640e818fba95386ff8715015693978c37eaace" + c42f3b6e3f5f15fa0b9f5b56682d50319c648f45a4671d5b58d82f2468f793b7 + f2303d4c2c9884d4858c86e1d8470af87cc1798cda482c50acff0bd8e70a2f73" build_options="qt" +build_options_default="qt" if [ "$CROSS_BUILD" ]; then configure_args+=" -DSIMGEAR_COMPILE_TEST_EXITCODE=0" -else - build_options_default="qt" + hostmakedepends+=" qt5-host-tools $(vopt_if qt qt5-devel)" fi post_install() {