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

[Sergej Pupykin]

    Date: Friday, February 5, 2016 @ 23:18:55
  Author: spupykin
Revision: 160442

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-05 22:18:06 UTC (rev 160441)
+++ PKGBUILD	2016-02-05 22:18:55 UTC (rev 160442)
@@ -13,16 +13,9 @@
 license=("GPL")
 url="https://github.com/FlightGear/flightgear"
 options=('!makeflags')
-source=("git://github.com/FlightGear/flightgear.git#commit=b61904a7a1093d5cfffac9a7262171db7dd16df"
-        "explicitely-link-with-libX11.patch")
-md5sums=('SKIP'
-         'fc264184d88afdc12c669f1eabb5bbea')
+source=("git://github.com/FlightGear/flightgear.git#commit=b61904a7a1093d5cfffac9a7262171db7dd16df")
+md5sums=('SKIP')
 
-prepare() {
-  cd $srcdir/flightgear
-#  patch -Np1 -i ../explicitely-link-with-libX11.patch
-}
-
 build() {
   cd $srcdir/flightgear
   cmake \

Deleted: explicitely-link-with-libX11.patch
===================================================================
--- explicitely-link-with-libX11.patch	2016-02-05 22:18:06 UTC (rev 160441)
+++ explicitely-link-with-libX11.patch	2016-02-05 22:18:55 UTC (rev 160442)
@@ -1,36 +0,0 @@
-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
-