From 98398718ac986ab947eb757089cefcf8c008cfbf Mon Sep 17 00:00:00 2001 From: Lenard Spencer Date: Thu, 9 May 2019 16:54:46 +0700 Subject: games/FlightGear: Updated for version 2018.3.2. Signed-off-by: Willy Sudiarto Raharjo --- games/FlightGear/FlightGear.SlackBuild | 5 +- games/FlightGear/FlightGear.info | 10 +-- games/FlightGear/flightgear-fix-broken-links.patch | 76 ++++++++++++++++++++++ 3 files changed, 85 insertions(+), 6 deletions(-) create mode 100644 games/FlightGear/flightgear-fix-broken-links.patch (limited to 'games/FlightGear') diff --git a/games/FlightGear/FlightGear.SlackBuild b/games/FlightGear/FlightGear.SlackBuild index 8dd9392e76..ac846100e3 100644 --- a/games/FlightGear/FlightGear.SlackBuild +++ b/games/FlightGear/FlightGear.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=FlightGear SRCNAM=flightgear -VERSION=${VERSION:-2018.2.2} +VERSION=${VERSION:-2018.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -77,6 +77,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# patch for broken links: +patch -p1 < $CWD/flightgear-fix-broken-links.patch + mkdir -p build cd build cmake \ diff --git a/games/FlightGear/FlightGear.info b/games/FlightGear/FlightGear.info index 1207787893..0c292b388f 100644 --- a/games/FlightGear/FlightGear.info +++ b/games/FlightGear/FlightGear.info @@ -1,10 +1,10 @@ PRGNAM="FlightGear" -VERSION="2018.2.2" +VERSION="2018.3.2" HOMEPAGE="http://www.flightgear.org/" -DOWNLOAD="https://sourceforge.net/projects/flightgear/files/release-2018.2/flightgear-2018.2.2.tar.bz2" -MD5SUM="fb4925b31cf3f2ba70d83ec13710c420" +DOWNLOAD="https://sourceforge.net/projects/flightgear/files/release-2018.3/flightgear-2018.3.2.tar.bz2" +MD5SUM="3aeecf335ea699d28eead45e4ecabad3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="FlightGear-data SimGear" -MAINTAINER="Panagiotis Nikolaou" -EMAIL="hostmaster@slackonly.com" +MAINTAINER="Lenard Spencer" +EMAIL="lenardrspencer@gmail.com" diff --git a/games/FlightGear/flightgear-fix-broken-links.patch b/games/FlightGear/flightgear-fix-broken-links.patch new file mode 100644 index 0000000000..7d807a9cb5 --- /dev/null +++ b/games/FlightGear/flightgear-fix-broken-links.patch @@ -0,0 +1,76 @@ +diff -Naur flightgear-2018.3.2/src/Environment/realwx_ctrl.cxx flightgear-2018.3.2.new/src/Environment/realwx_ctrl.cxx +--- flightgear-2018.3.2/src/Environment/realwx_ctrl.cxx 2019-01-29 08:17:50.000000000 -0500 ++++ flightgear-2018.3.2.new/src/Environment/realwx_ctrl.cxx 2019-02-05 07:11:40.532121269 -0500 +@@ -426,7 +426,7 @@ + ) + { + static const std::string NOAA_BASE_URL = +- "http://tgftp.nws.noaa.gov/data/observations/metar/stations/"; ++ "https://tgftp.nws.noaa.gov/data/observations/metar/stations/"; + class NoaaMetarGetRequest: + public simgear::HTTP::MemoryRequest + { +diff -Naur flightgear-2018.3.2/src/Main/metar_main.cxx flightgear-2018.3.2.new/src/Main/metar_main.cxx +--- flightgear-2018.3.2/src/Main/metar_main.cxx 2019-01-29 08:17:50.000000000 -0500 ++++ flightgear-2018.3.2.new/src/Main/metar_main.cxx 2019-02-05 07:11:40.533121277 -0500 +@@ -539,7 +539,7 @@ + try + { + static const std::string NOAA_BASE_URL = +- "http://tgftp.nws.noaa.gov/data/observations/metar/stations/"; ++ "https://tgftp.nws.noaa.gov/data/observations/metar/stations/"; + HTTP::MemoryRequest* mr = new HTTP::MemoryRequest + ( + NOAA_BASE_URL +diff -Naur flightgear-2018.3.2/utils/fgcom/utils/build_fgcom_server.sh flightgear-2018.3.2.new/utils/fgcom/utils/build_fgcom_server.sh +--- flightgear-2018.3.2/utils/fgcom/utils/build_fgcom_server.sh 2019-01-29 08:17:50.000000000 -0500 ++++ flightgear-2018.3.2.new/utils/fgcom/utils/build_fgcom_server.sh 2019-02-05 07:11:40.533121277 -0500 +@@ -6,7 +6,7 @@ + DAHDI_SRC="http://downloads.asterisk.org/pub/telephony/dahdi-linux-complete/dahdi-linux-complete-current.tar.gz" + LOGSEP="###########################################" + GETMETAR_SCRIPT="#!/bin/bash +-#curl http://tgftp.nws.noaa.gov/data/observations/metar/stations/$1.TXT ++#curl https://tgftp.nws.noaa.gov/data/observations/metar/stations/$1.TXT + echo \"Hello World !\"" + + ROOT=$PWD +diff -Naur flightgear-2018.3.2/utils/metarproxy/README flightgear-2018.3.2.new/utils/metarproxy/README +--- flightgear-2018.3.2/utils/metarproxy/README 2019-01-29 08:17:50.000000000 -0500 ++++ flightgear-2018.3.2.new/utils/metarproxy/README 2019-02-05 07:10:25.154570061 -0500 +@@ -266,13 +266,13 @@ + ===================== + Download addresses for the last 24 hours: + +- http://tgftp.nws.noaa.gov/data/observations/metar/cycles/ ++ https://tgftp.nws.noaa.gov/data/observations/metar/cycles/ + ftp://tgftp.nws.noaa.gov/data/observations/metar/cycles/ + + Addresses for the most recent METAR data strings of particular + stations: + +- http://tgftp.nws.noaa.gov/pub/data/observations/metar/stations/ ++ https://tgftp.nws.noaa.gov/pub/data/observations/metar/stations/ + ftp://tgftp.nws.noaa.gov/data/observations/metar/stations/ + + +diff -Naur flightgear-2018.3.2/utils/metarproxy/metarproxy flightgear-2018.3.2.new/utils/metarproxy/metarproxy +--- flightgear-2018.3.2/utils/metarproxy/metarproxy 2019-01-29 08:17:50.000000000 -0500 ++++ flightgear-2018.3.2.new/utils/metarproxy/metarproxy 2019-02-05 07:11:40.534121284 -0500 +@@ -81,7 +81,7 @@ + \$ http_proxy= metarproxy --record LOXL + + Sources: +- http://tgftp.nws.noaa.gov/data/observations/metar/{stations,cycles}/ ++ https://tgftp.nws.noaa.gov/data/observations/metar/{stations,cycles}/ + ftp://tgftp.nws.noaa.gov/data/observations/metar/{stations,cycles}/ + EOF + +@@ -399,7 +399,7 @@ + s/\s+$//; + &log($DEBUG, $_); + +- if (m|^GET\s+http://tgftp.nws.noaa.gov/.*/([A-Z][A-Z0-9]{3}).TXT\s+HTTP/|) { ++ if (m|^GET\s+https://tgftp.nws.noaa.gov/.*/([A-Z][A-Z0-9]{3}).TXT\s+HTTP/|) { + $icao = $1; + } elsif (/X-Time: (\d+)/) { + $epoch = $1; -- cgit v1.2.3-65-gdbad