diff options
| author | Glen D'souza | 2016-04-16 17:13:59 +0530 |
|---|---|---|
| committer | Glen D'souza | 2016-04-16 17:13:59 +0530 |
| commit | a6214b91858152a39a848c86863ab084fe813499 (patch) | |
| tree | c65973483ec88b2dc63295fb3951d804e9ed9e40 | |
| parent | 33e6a925c4e57265aa6428efa925741f4daff5db (diff) | |
| download | aur-a6214b91858152a39a848c86863ab084fe813499.tar.gz | |
Remove unnecessary patch
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | explicitely-link-with-libX11.patch | 36 |
3 files changed, 3 insertions, 44 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Sat Apr 16 11:34:40 UTC 2016 +# Sat Apr 16 11:43:55 UTC 2016 pkgbase = flightgear-git pkgdesc = An open-source, multi-platform flight simulator pkgver = 20160416 @@ -25,9 +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 - md5sums = f1d10be82891991513aee4c5505ac577 pkgname = flightgear-git @@ -14,10 +14,8 @@ optdepends=() makedepends=('boost' 'cmake' 'mesa' 'sharutils' 'simgear-git') provides=('flightgear-git') conflicts=('flightgear') -source=(git://git.code.sf.net/p/flightgear/flightgear - 'explicitely-link-with-libX11.patch') -md5sums=('SKIP' - 'f1d10be82891991513aee4c5505ac577') +source=(git://git.code.sf.net/p/flightgear/flightgear) +md5sums=('SKIP') pkgver() { echo "$(date +"%Y%m%d")" @@ -26,7 +24,6 @@ pkgver() { build() { cd ${srcdir}/${_gitname} git checkout next - patch -p1 -i ../explicitely-link-with-libX11.patch cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DENABLE_QT=1 \ diff --git a/explicitely-link-with-libX11.patch b/explicitely-link-with-libX11.patch deleted file mode 100644 index ac1c3d9ef2b6..000000000000 --- a/explicitely-link-with-libX11.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 - |