- unconditional noarch subpackages

[packages/FlightGear.git] / flightgear-cmake.patch

diff --git a/flightgear-cmake.patch b/flightgear-cmake.patch
index ff296513392bc201d3920f01bd4ad5f3884a7bd2..aa854cf4e3c096f364aa79ad8d7ecc787a26bc8d 100644 (file)
--- a/flightgear-cmake.patch
+++ b/flightgear-cmake.patch
@@ -1,10 +1,20 @@
 --- flightgear-2.10.0/utils/fgadmin/src/CMakeLists.txt-orig    2012-06-26 22:06:15.000000000 +0200
 +++ flightgear-2.10.0/utils/fgadmin/src/CMakeLists.txt 2013-03-22 14:09:25.876770608 +0100
-@@ -1,6 +1,6 @@
- 
+@@ -1,5 +1,5 @@
  fltk_wrap_ui(FGAdminUI fgadmin.fl)
 -add_library(FGAdminUI ${FGAdminUI_FLTK_UI_SRCS})
 +add_library(FGAdminUI STATIC ${FGAdminUI_FLTK_UI_SRCS})
  
  add_executable(fgadmin fgadmin_funcs.cxx main.cxx untarka.c)
  add_dependencies(fgadmin FGAdminUI)
+--- flightgear-2016.2.1/src/GUI/CMakeLists.txt.orig    2016-05-17 10:36:25.000000000 +0200
++++ flightgear-2016.2.1/src/GUI/CMakeLists.txt 2016-07-23 14:46:33.380230285 +0200
+@@ -80,7 +80,7 @@
+     qt5_add_resources(qrc_sources resources.qrc)
+ 
+ 
+-    add_library(fglauncher QtLauncher.cxx
++    add_library(fglauncher STATIC QtLauncher.cxx
+                             QtLauncher.hxx
+                             QtLauncher_private.hxx
+                             BaseDiagram.cxx