From 1d64d93cffea2203be7f40b3c868a85f44325c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 16 Jun 2018 22:58:52 +0200 Subject: [PATCH] flightgear: update to 2018.2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- .../patches/fix-link_with_x11.patch | 22 ------------------- srcpkgs/flightgear/template | 9 ++++---- 2 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 srcpkgs/flightgear/patches/fix-link_with_x11.patch diff --git a/srcpkgs/flightgear/patches/fix-link_with_x11.patch b/srcpkgs/flightgear/patches/fix-link_with_x11.patch deleted file mode 100644 index 2b6c73cc454..00000000000 --- a/srcpkgs/flightgear/patches/fix-link_with_x11.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 04ca64edc46cfb54ecff5bddf12370b2c7a0f192 Mon Sep 17 00:00:00 2001 -From: Fabrice Bellet -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 ---- src/Main/CMakeLists.txt -+++ 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/srcpkgs/flightgear/template b/srcpkgs/flightgear/template index ac86099575c..780f4c2c4a7 100644 --- a/srcpkgs/flightgear/template +++ b/srcpkgs/flightgear/template @@ -1,6 +1,6 @@ # Template file for 'flightgear' pkgname=flightgear -version=2018.1.1 +version=2018.2.2 revision=1 build_style=cmake configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata -DSYSTEM_SQLITE=1" @@ -11,15 +11,14 @@ makedepends="MesaLib-devel boost-devel freealut-devel libfreeglut-devel fltk-dev depends="flightgear-data>=${version}" short_desc="Sophisticated flight simulator" maintainer="Jürgen Buchmüller " -license="GPL-3" +license="GPL-2.0-or-later" homepage="http://www.flightgear.org/" -#_mirror=http://mirror.netcologne.de/gentoo/distfiles distfiles=" $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2 $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/FlightGear-${version}-data.tar.bz2" checksum=" - ed1aa7867e89757622f3faaab996028c4be2f79006dfb89a3059c77b9831aab9 - dfd80e09f6bf04bd25604788c080716007969d127d46d0e10c43c2f709fb8db8" + 61f809ef0a3f6908d156f0c483ed5313d31b5a6ac74761955d0b266751718147 + c89b94e4cf3cb7eda728daf6cca6dd051f7a47863776c99fd2f3fe0054400ac4" nocross=https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/4773/steps/shell_3/logs/stdio