gentoo resync : 25.08.2020

2 files changed, 45 insertions, 24 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
deleted file mode 100644
index 97747e8b7487..000000000000
--- a/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/files/flightgear-2020.1.2-cmake.patch b/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch
new file mode 100644
index 000000000000..f463c458b5a0
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch
@@ -0,0 +1,45 @@
+diff -ruN flightgear-2020.1.2/CMakeLists.txt fgfs-my/CMakeLists.txt
+--- flightgear-2020.1.2/CMakeLists.txt	2020-05-24 17:14:48.000000000 +0200
++++ fgfs-my/CMakeLists.txt	2020-05-31 13:56:41.745941586 +0200
+@@ -367,7 +367,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")
+         set(HAVE_QT 1)
+diff -ruN flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMakeModules/SetupFGFSLibraries.cmake
+--- flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake	2020-05-24 17:14:48.000000000 +0200
++++ fgfs-my/CMakeModules/SetupFGFSLibraries.cmake	2020-05-31 13:55:33.484421108 +0200
+@@ -33,15 +33,8 @@
+ 
+     # PkgConfig::DBUS target
+ 
+-    if(CMAKE_VERSION VERSION_LESS 3.6)
+-        if(DBUS_FOUND)
+-            target_link_libraries(${target} ${DBUS_LDFLAGS})
+-        endif()
+-    else()
+-        # PkgConfig::DBUS target
+-        if(TARGET PkgConfig::DBUS)
+-            target_link_libraries(${target} PkgConfig::DBUS)
+-        endif()
++    if(DBUS_FOUND)
++        target_link_libraries(${target} ${DBUS_LDFLAGS})
+     endif()
+ 
+     if(FG_HAVE_GPERFTOOLS)
+diff -ruN flightgear-2020.1.2/src/GUI/CMakeLists.txt fgfs-my/src/GUI/CMakeLists.txt
+--- flightgear-2020.1.2/src/GUI/CMakeLists.txt	2020-05-24 17:14:48.000000000 +0200
++++ fgfs-my/src/GUI/CMakeLists.txt	2020-05-31 13:56:41.745941586 +0200
+@@ -137,7 +137,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