summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-simulation/flightgear/files')
-rw-r--r--games-simulation/flightgear/files/flightgear-2020.3.8-cmake.patch (renamed from games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch)20
1 files changed, 10 insertions, 10 deletions
diff --git a/games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch b/games-simulation/flightgear/files/flightgear-2020.3.8-cmake.patch
index 0af961beacdf..d89a0df947d8 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)