diff options
| author | Andrew Whatson | 2020-10-13 11:11:38 +1000 |
|---|---|---|
| committer | Andrew Whatson | 2020-10-13 11:11:38 +1000 |
| commit | 534d21fc3e8386e6b2bb6dbab2e034064d564451 (patch) | |
| tree | 0abbffb237fc7f3ad4349fc64989e001b020be88 | |
| parent | 23d3bc89260aa8d16983fd7f0bdb268189a2de6c (diff) | |
| download | aur-534d21fc3e8386e6b2bb6dbab2e034064d564451.tar.gz | |
Remove CMake patch, no longer required
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | fg-cmake-fixes.patch | 21 |
3 files changed, 4 insertions, 30 deletions
@@ -1,6 +1,6 @@ pkgbase = flightgear-git pkgdesc = An open-source, multi-platform flight simulator - pkgver = 2020.3.0r14711.df67cc2bd + pkgver = 2020.3.0r14766.c5e45f2b4 pkgrel = 1 url = https://home.flightgear.org arch = x86_64 @@ -26,9 +26,7 @@ pkgbase = flightgear-git provides = flightgear conflicts = flightgear source = flightgear::git+https://git.code.sf.net/p/flightgear/flightgear#branch=next - source = fg-cmake-fixes.patch sha256sums = SKIP - sha256sums = 94c91b5008506fd8c0fe090f5f6bf96ad5e2228360bc913f49b9008c99adb4a3 pkgname = flightgear-git @@ -4,7 +4,7 @@ # Contributor: Pascal Groschwitz <p.groschwitz@googlemail.com> pkgname=flightgear-git -pkgver=2020.3.0r14711.df67cc2bd +pkgver=2020.3.0r14766.c5e45f2b4 pkgrel=1 pkgdesc="An open-source, multi-platform flight simulator" arch=('x86_64') @@ -17,10 +17,8 @@ optdepends=('qt5-base: fgfs --launcher' 'flightgear-data') provides=('flightgear') conflicts=('flightgear') -source=("flightgear::git+https://git.code.sf.net/p/flightgear/flightgear#branch=next" - 'fg-cmake-fixes.patch') -sha256sums=('SKIP' - '94c91b5008506fd8c0fe090f5f6bf96ad5e2228360bc913f49b9008c99adb4a3') +source=("flightgear::git+https://git.code.sf.net/p/flightgear/flightgear#branch=next") +sha256sums=('SKIP') pkgver() { cd "$srcdir"/flightgear @@ -32,7 +30,6 @@ pkgver() { prepare() { cd "$srcdir"/flightgear - patch -p1 -i ../fg-cmake-fixes.patch sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data|' package/org.flightgear.FlightGear.desktop } diff --git a/fg-cmake-fixes.patch b/fg-cmake-fixes.patch deleted file mode 100644 index 84db4df9cb0c..000000000000 --- a/fg-cmake-fixes.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeModules/FindGsm.cmake b/CMakeModules/FindGsm.cmake -index 1add357c1..a138ebe99 100644 ---- a/CMakeModules/FindGsm.cmake -+++ b/CMakeModules/FindGsm.cmake -@@ -31,7 +31,6 @@ else (GSM_LIBRARIES AND GSM_INCLUDE_DIRS) - - find_path(GSM_INCLUDE_DIR - NAMES -- gsm/gsm.h - gsm.h - PATHS - ${_GsmIncDir} -@@ -39,6 +38,8 @@ else (GSM_LIBRARIES AND GSM_INCLUDE_DIRS) - /usr/local/include - /opt/local/include - /sw/include -+ PATH_SUFFIXES -+ gsm - ) - - find_library(GSM_LIBRARY |