summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlen Dsouza2015-12-24 17:18:42 +0530
committerGlen Dsouza2015-12-24 17:19:02 +0530
commitd9333ef67d96011283d58d0db19326a1e22c374c (patch)
treec75fad10382f0a7f93e6820d8cb06a4785ec1a32
parent25724c941239f0cc435b812f32f9633da6852782 (diff)
downloadaur-d9333ef67d96011283d58d0db19326a1e22c374c.tar.gz
Add in the patch
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
-rw-r--r--explicitely-link-with-libX11.patch36
3 files changed, 40 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f3a3398807d8..ee98f5fe00b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Thu Dec 24 11:36:34 UTC 2015
+# Thu Dec 24 11:48:51 UTC 2015
pkgbase = flightgear-git
pkgdesc = An open-source, multi-platform flight simulator
pkgver = 20151224
@@ -25,6 +25,7 @@ pkgbase = flightgear-git
provides = flightgear-git
conflicts = flightgear
source = git://git.code.sf.net/p/flightgear/flightgear
+ source = explicitely-link-with-libX11.patch
md5sums = SKIP
pkgname = flightgear-git
diff --git a/PKGBUILD b/PKGBUILD
index 13074d15d93e..fed9aa907b55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,8 @@ optdepends=()
makedepends=('boost' 'cmake' 'mesa' 'sharutils' 'simgear-git')
provides=('flightgear-git')
conflicts=('flightgear')
-source=(git://git.code.sf.net/p/flightgear/flightgear)
+source=(git://git.code.sf.net/p/flightgear/flightgear
+ 'explicitely-link-with-libX11.patch')
md5sums=('SKIP')
pkgver() {
diff --git a/explicitely-link-with-libX11.patch b/explicitely-link-with-libX11.patch
new file mode 100644
index 000000000000..97a16e40a325
--- /dev/null
+++ b/explicitely-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
+