gentoo resync : 29.01.2021

2 files changed, 16 insertions, 27 deletions

diff --git a/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch b/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch
deleted file mode 100644
index 43e2a7d0cb13..000000000000
--- a/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -515,7 +515,7 @@
-     set(NOMINMAX 1)
- endif(WIN32)
-
--set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION")
-+set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION -DBOOST_NO_STDLIB_CONFIG")
-
- # append the SIMD flags if requested
- if (ENABLE_SIMD)
diff --git a/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch b/games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch
index f463c458b5a0..0af961beacdf 100644
--- a/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch
+++ b/games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch
@@ -1,18 +1,18 @@
-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 @@
+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
+@@ -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 Network Qml Quick Svg)
-+    find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick)
+-    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)
          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
+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
 @@ -33,15 +33,8 @@
  
      # PkgConfig::DBUS target
@@ -31,15 +31,15 @@ diff -ruN flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMak
      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})
+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
+@@ -142,7 +142,7 @@
  
      set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
+     target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI)
 -    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
+     if (ENABLE_QQ_UI)
+       set(QQUI_SOURCES