diff options
| author | David Spencer <idlemoor@slackbuilds.org> | 2016-01-16 00:44:49 +0000 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2016-01-16 23:36:53 -0600 |
| commit | 860b5f6e9a5c9c96d0c34efa88def9b710836b02 (patch) | |
| tree | 456eb5ad41e54d71d95792ddbc95732eab6b63b1 | |
| parent | 30c1b51ed2661f90eee708c7634f0d0c8b72d195 (diff) | |
| download | slackbuilds-860b5f6e9a5c9c96d0c34efa88def9b710836b02.tar.gz | |
games/FlightGear: Build with extra/fltk.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
| -rw-r--r-- | games/FlightGear/FlightGear.SlackBuild | 3 | ||||
| -rw-r--r-- | games/FlightGear/explicitly-link-with-libX11.patch | 36 |
2 files changed, 39 insertions, 0 deletions
diff --git a/games/FlightGear/FlightGear.SlackBuild b/games/FlightGear/FlightGear.SlackBuild index 0f2e775fb1..f1cb2b218a 100644 --- a/games/FlightGear/FlightGear.SlackBuild +++ b/games/FlightGear/FlightGear.SlackBuild @@ -50,6 +50,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Fix underlinking (patch thanks to Arch Linux) +patch -p1 < $CWD/explicitly-link-with-libX11.patch + mkdir -p build cd build cmake \ diff --git a/games/FlightGear/explicitly-link-with-libX11.patch b/games/FlightGear/explicitly-link-with-libX11.patch new file mode 100644 index 0000000000..97a16e40a3 --- /dev/null +++ b/games/FlightGear/explicitly-link-with-libX11.patch @@ -0,0 +1,36 @@ +From 04ca64edc46cfb54ecff5bddf12370b2c7a0f192 Mon Sep 17 00:00:00 2001 +From: Fabrice Bellet <fabrice@bellet.info> +Date: Tue, 17 Feb 2015 22:49:50 +0100 +Subject: [PATCH] explicitely link with libX11 + +--- + src/Main/CMakeLists.txt | 1 + + utils/fgviewer/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt +index 12c0961..78c4163 100644 +--- a/src/Main/CMakeLists.txt ++++ b/src/Main/CMakeLists.txt +@@ -142,6 +142,7 @@ target_link_libraries(fgfs + ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} + ${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES} + ${PLATFORM_LIBS} ++ ${X11_X11_LIB} + ) + + if(ENABLE_FLITE) +diff --git a/utils/fgviewer/CMakeLists.txt b/utils/fgviewer/CMakeLists.txt +index 165be74..065b8f1 100644 +--- a/utils/fgviewer/CMakeLists.txt ++++ b/utils/fgviewer/CMakeLists.txt +@@ -48,5 +48,6 @@ target_link_libraries(fgviewer + ${OPENGL_LIBRARIES} + ${FGVIEWER_RTI_LIBRARIES} + ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ++ ${X11_X11_LIB} + ) + install(TARGETS fgviewer RUNTIME DESTINATION bin) +-- +2.1.0 + |