[arch-commits] Commit in flightgear/trunk (2 files)

[Evangelos Foutras]

    Date: Wednesday, June 24, 2015 @ 04:05:59
  Author: foutrelis
Revision: 135775

Fix missing DSO linking error

Added:
  flightgear/trunk/explicitely-link-with-libX11.patch
Modified:
  flightgear/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |   11 ++++++++--
 explicitely-link-with-libX11.patch |   36 +++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-24 01:29:59 UTC (rev 135774)
+++ PKGBUILD	2015-06-24 02:05:59 UTC (rev 135775)
@@ -15,9 +15,16 @@
 options=('!makeflags')
 #source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver")
 #source=("ftp://ftp.de.flightgear.org/pub/fgfs/Source/flightgear-$pkgver.tar.bz2")
-source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2")
-md5sums=('0a6f4c27baf64f3e7d58fd44612118df')
+source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2"
+        "explicitely-link-with-libX11.patch")
+md5sums=('0a6f4c27baf64f3e7d58fd44612118df'
+         'fc264184d88afdc12c669f1eabb5bbea')
 
+prepare() {
+  cd $srcdir/flightgear-$pkgver
+  patch -Np1 -i ../explicitely-link-with-libX11.patch
+}
+
 build() {
   cd $srcdir/flightgear-$pkgver
   cmake \

Added: explicitely-link-with-libX11.patch
===================================================================
--- explicitely-link-with-libX11.patch	                        (rev 0)
+++ explicitely-link-with-libX11.patch	2015-06-24 02:05:59 UTC (rev 135775)
@@ -0,0 +1,36 @@
+From 04ca64edc46cfb54ecff5bddf12370b2c7a0f192 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice at 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
+