Update to 2020.3.1

3 files changed, 6 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f0debe7e963b..43d2eb98ec9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = flightgear
 	pkgdesc = An open-source, multi-platform flight simulator
-	pkgver = 2020.1.3
+	pkgver = 2020.3.1
 	pkgrel = 1
 	url = http://www.flightgear.org/
 	arch = x86_64
@@ -24,10 +24,8 @@ pkgbase = flightgear
 	optdepends = qt5-declarative: fgfs --launcher
 	optdepends = flightgear-data
 	options = makeflags
-	source = http://downloads.sourceforge.net/project/flightgear/release-2020.1/flightgear-2020.1.3.tar.bz2
-	source = fg-cmake-fixes.patch
-	sha256sums = 1f07e8ef2c558dae3b9738e313b57e711d38e569f85d49fc2c5ae647e3949a17
-	sha256sums = e6f50770b57388c18a4f6988c5b3b9f09c90dc5bf4d0542b791316d315aa9395
+	source = http://downloads.sourceforge.net/project/flightgear/release-2020.3/flightgear-2020.3.1.tar.bz2
+	sha256sums = 8860d13f8ca41d387dce1850b90650c5e440e3e2505021180d303dfa4784d103
 
 pkgname = flightgear
 
diff --git a/PKGBUILD b/PKGBUILD
index bd73250ec27c..890cbfdef84e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Hans Janssen <hans@janserv.xs4all.nl>
 
 pkgname='flightgear'
-pkgver=2020.1.3
+pkgver=2020.3.1
 _pkgver=${pkgver%.*}
 pkgrel=1
 pkgdesc="An open-source, multi-platform flight simulator"
@@ -18,14 +18,11 @@ optdepends=('qt5-base: fgfs --launcher'
 license=("GPL")
 url="http://www.flightgear.org/"
 options=('makeflags')
-source=("http://downloads.sourceforge.net/project/flightgear/release-${_pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        'fg-cmake-fixes.patch')
-sha256sums=('1f07e8ef2c558dae3b9738e313b57e711d38e569f85d49fc2c5ae647e3949a17'
-            'e6f50770b57388c18a4f6988c5b3b9f09c90dc5bf4d0542b791316d315aa9395')
+source=("http://downloads.sourceforge.net/project/flightgear/release-${_pkgver}/${pkgname}-${pkgver}.tar.bz2")
+sha256sums=('8860d13f8ca41d387dce1850b90650c5e440e3e2505021180d303dfa4784d103')
 
 prepare() {
   cd "$srcdir"/flightgear-$pkgver
-  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 6ab2841a0f41..000000000000
--- a/fg-cmake-fixes.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/CMakeModules/FindDBus.cmake b/CMakeModules/FindDBus.cmake
-index 09753d2..b202b08 100644
---- a/CMakeModules/FindDBus.cmake
-+++ b/CMakeModules/FindDBus.cmake
-@@ -16,7 +16,7 @@ if(WIN32)
- 		)
- 	endif()
- else()
--	include(FindPkgConfig)
-+	find_package(PkgConfig)
- 
- 	if(PKG_CONFIG_FOUND)
- 		# FIXME : clean this up once we requrie CMake 3.6
-@@ -33,5 +33,5 @@ else()
- endif(WIN32)
- 
- include(FindPackageHandleStandardArgs)
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(DBUS DEFAULT_MSG
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(DBus DEFAULT_MSG
- 	DBUS_INCLUDE_DIRS DBUS_LIBRARIES)
-\ No newline at end of file
-diff --git a/CMakeModules/FindLibEvent.cmake b/CMakeModules/FindLibEvent.cmake
-index a58202d..fe376ed 100644
---- a/CMakeModules/FindLibEvent.cmake
-+++ b/CMakeModules/FindLibEvent.cmake
-@@ -8,5 +8,5 @@ FIND_PATH(LIBEVENT_INCLUDE_DIR event2/event.h PATH_SUFFIXES include HINTS ${ADDI
- FIND_LIBRARY(LIBEVENT_LIB NAMES event_core PATH_SUFFIXES lib HINTS ${ADDITIONAL_LIBRARY_PATHS})
- 
- include(FindPackageHandleStandardArgs)
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBEVENT DEFAULT_MSG
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibEvent DEFAULT_MSG
- 	LIBEVENT_INCLUDE_DIR LIBEVENT_LIB)
-\ No newline at end of file
-diff --git a/CMakeModules/Translations.cmake b/CMakeModules/Translations.cmake
-index 2012b69..05e9105 100644
---- a/CMakeModules/Translations.cmake
-+++ b/CMakeModules/Translations.cmake
-@@ -35,10 +35,10 @@ function(translation_dir_list result curdir)
-   set(${result} ${dirlist} PARENT_SCOPE)
- endfunction()
- 
--translation_dir_list(LANGUAGES ${TRANSLATIONS_SRC_DIR})
--message(STATUS "Detected language files: ${LANGUAGES}")
--
- if (${do_translate})
-+    translation_dir_list(LANGUAGES ${TRANSLATIONS_SRC_DIR})
-+    message(STATUS "Detected language files: ${LANGUAGES}")
-+
-     set(translation_res "${PROJECT_BINARY_DIR}/translations.qrc")
- 
-     add_custom_target(fgfs_qm_files ALL)