summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2017-01-14 02:29:44 +0100
committerLars Wendler <polynomial-c@gentoo.org>2017-01-14 02:33:17 +0100
commit8170f20931e723b17be2916cefbcccf71691706d (patch)
treeb57586b2788de397faf84503b887e67c7b4afd18 /games-simulation/flightgear/files
parentdev-python/crumbs: clean up old. (diff)
downloadgentoo-8170f20931e723b17be2916cefbcccf71691706d.tar.gz
gentoo-8170f20931e723b17be2916cefbcccf71691706d.tar.bz2
gentoo-8170f20931e723b17be2916cefbcccf71691706d.zip
games-simulation/flightgear: Security cleanup (bug #602658).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'games-simulation/flightgear/files')
-rw-r--r--games-simulation/flightgear/files/0001-flightgear-3.4.0-cmake.patch30
-rw-r--r--games-simulation/flightgear/files/0002-flightgear-3.4.0-cmake.patch54
2 files changed, 0 insertions, 84 deletions
diff --git a/games-simulation/flightgear/files/0001-flightgear-3.4.0-cmake.patch b/games-simulation/flightgear/files/0001-flightgear-3.4.0-cmake.patch
deleted file mode 100644
index e14920b246c..00000000000
--- a/games-simulation/flightgear/files/0001-flightgear-3.4.0-cmake.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 06a260822c0eb10f47533a2cbf5cbbc968878c17 Mon Sep 17 00:00:00 2001
-From: James Turner <zakalawe@mac.com>
-Date: Tue, 17 Mar 2015 23:33:57 +0000
-Subject: [PATCH] Make 3.2.1 fix: make thread check platform specific.
-
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8847614..c881c32 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -109,6 +109,8 @@ IF(APPLE)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7")
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
- ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+ find_package(Threads REQUIRED)
-+
- set(USE_DBUS_DEFAULT 1)
-
- find_package(UDev)
-@@ -230,7 +232,6 @@ endif(EVENT_INPUT)
- # check required dependencies
- find_package(Boost REQUIRED)
- find_package(ZLIB REQUIRED)
--find_package(Threads REQUIRED)
- find_package(OpenGL REQUIRED)
- find_package(OpenAL REQUIRED)
- find_package(OpenSceneGraph 3.2.0 REQUIRED
diff --git a/games-simulation/flightgear/files/0002-flightgear-3.4.0-cmake.patch b/games-simulation/flightgear/files/0002-flightgear-3.4.0-cmake.patch
deleted file mode 100644
index 2151acdbbcf..00000000000
--- a/games-simulation/flightgear/files/0002-flightgear-3.4.0-cmake.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 14405fe2e397b9a6ab9b004cb8c7459eeb41ec59 Mon Sep 17 00:00:00 2001
-From: "Rebecca N. Palmer" <rebecca_palmer@zoho.com>
-Date: Fri, 3 Apr 2015 19:15:52 +0100
-Subject: [PATCH] Fix compile with CMake 3.2.1, by Kevin Seroux
-
-Explicitly link X11, as this no longer comes with OpenGL
----
- CMakeLists.txt | 1 +
- src/Main/CMakeLists.txt | 4 +++-
- utils/fgviewer/CMakeLists.txt | 4 ++++
- 3 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c881c32..c443f58 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -110,6 +110,7 @@ IF(APPLE)
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
- ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
- find_package(Threads REQUIRED)
-+ find_package(X11 REQUIRED)
-
- set(USE_DBUS_DEFAULT 1)
-
-diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
-index 949b379..4b6926e 100644
---- a/src/Main/CMakeLists.txt
-+++ b/src/Main/CMakeLists.txt
-@@ -130,7 +130,9 @@ endif()
- if (CRASHRPT_FOUND)
- target_link_libraries(fgfs ${CRASHRPT_LIBRARY})
- endif()
--
-+if(X11_FOUND)
-+ target_link_libraries(fgfs ${X11_LIBRARIES})
-+endif()
- target_link_libraries(fgfs
- ${SQLITE3_LIBRARY}
- ${SIMGEAR_LIBRARIES}
-diff --git a/utils/fgviewer/CMakeLists.txt b/utils/fgviewer/CMakeLists.txt
-index 165be74..bfc52ad 100644
---- a/utils/fgviewer/CMakeLists.txt
-+++ b/utils/fgviewer/CMakeLists.txt
-@@ -42,6 +42,10 @@ else()
- endif()
-
- add_executable(fgviewer ${FGVIEWER_SOURCES} ${FGVIEWER_RTI_SOURCES})
-+if(X11_FOUND)
-+ target_link_libraries(fgviewer ${X11_LIBRARIES})
-+endif()
-+
- target_link_libraries(fgviewer
- ${SIMGEAR_LIBRARIES}
- ${OPENSCENEGRAPH_LIBRARIES}