update to latest git revision

3 files changed, 4 insertions, 117 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0fd37343e73..812fb8838405 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = opencpn-git
 	pkgdesc = Open Source Chart Plotting / Marine Navigation - Git version
-	pkgver = 5.0.0.r413.g46c14aeac
+	pkgver = 5.0.0.r770.g037c31a26
 	pkgrel = 1
 	url = http://opencpn.org
 	install = opencpn.install
@@ -18,9 +18,7 @@ pkgbase = opencpn-git
 	provides = opencpn
 	conflicts = opencpn
 	source = opencpn-git::git+https://github.com/OpenCPN/OpenCPN.git
-	source = getarch.patch
 	sha1sums = SKIP
-	sha1sums = 3f1d73ac5b7843ecfa84034b402bcd9bb1e9ef6f
 
 pkgname = opencpn-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 7f6423122dd0..bb50b940eaae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # ---------------------------------------------------------------
 
 pkgname=opencpn-git
-pkgver=5.0.0.r413.g46c14aeac
+pkgver=5.0.0.r770.g037c31a26
 pkgrel=1
 pkgdesc="Open Source Chart Plotting / Marine Navigation - Git version"
 arch=('x86_64' 'aarch64')
@@ -15,9 +15,8 @@ provides=('opencpn')
 
 url="http://opencpn.org"
 install=opencpn.install
-source=("$pkgname::git+https://github.com/OpenCPN/OpenCPN.git" "getarch.patch")
-sha1sums=('SKIP'
-          '3f1d73ac5b7843ecfa84034b402bcd9bb1e9ef6f')
+source=("$pkgname::git+https://github.com/OpenCPN/OpenCPN.git")
+sha1sums=('SKIP')
 
 
 pkgver() {
@@ -27,7 +26,6 @@ pkgver() {
 
 prepare() {
   cd $pkgname
-  patch  --forward --strip=1 --input="${srcdir}/getarch.patch"
 }
 
 build() {
diff --git a/getarch.patch b/getarch.patch
deleted file mode 100644
index 9e838f275249..000000000000
--- a/getarch.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff --git a/cmake/GetArch.cmake b/cmake/GetArch.cmake
-index 6c722a235..c630a2d38 100644
---- a/cmake/GetArch.cmake
-+++ b/cmake/GetArch.cmake
-@@ -10,80 +10,45 @@
- 
- # Based on code from nohal
- function(GetArch)
--    if (NOT WIN32)
-+  if (NOT WIN32)
-     # default
--    set (ARCH "i386")
-+    set (ARCH "x86_64")
-     set (LIB_INSTALL_DIR "lib")
-+    if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
-+      if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-+        set (ARCH "arm64")
-+      else ()
-+        set (ARCH "armhf")
-+      endif ()
-+    else (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
-+      set (ARCH ${CMAKE_SYSTEM_PROCESSOR})
-+    endif ()
-     if (EXISTS /etc/debian_version)
-       set (PACKAGE_FORMAT "DEB")
-       set (PACKAGE_RECS "xcalib,xdg-utils")
-       set (LIB_INSTALL_DIR "lib")
--      if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
--        if (CMAKE_SIZEOF_VOID_P MATCHES "8")
--          set (ARCH "arm64")
--        else ()
--          set (ARCH "armhf")
--        endif ()
--      else (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
--        if (CMAKE_SIZEOF_VOID_P MATCHES "8")
--          set (ARCH "amd64")
--        else ()
--          set (ARCH "i386")
--        endif ()
--      endif (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
-+      if (ARCH STREQUAL "x86_64")
-+        set (ARCH "amd64")
-+      endif ()
-       set(TENTATIVE_PREFIX "/usr/local")
--    endif (EXISTS /etc/debian_version)
--    if (EXISTS /etc/redhat-release)
-+    elseif (EXISTS /etc/redhat-release)
-       set (PACKAGE_FORMAT "TBZ2")
--      if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
--        if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-+      set (LIB_INSTALL_DIR "lib64")
-+      if (ARCH STREQUAL "arm64")
-           set (ARCH "aarch64")
--        else ()
--          set (ARCH "armhf")
--        endif ()
--      else (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
--        if (CMAKE_SIZEOF_VOID_P MATCHES "8")
--          set (ARCH "x86_64")
--          set (LIB_INSTALL_DIR "lib64")
--        else ()
--          set (ARCH "i386")
--          set (LIB_INSTALL_DIR "lib")
--        endif ()
--      endif (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
--    endif (EXISTS /etc/redhat-release)
--    if (EXISTS /etc/suse-release OR EXISTS /etc/SuSE-release)
-+      endif()
-+    elseif (EXISTS /etc/suse-release OR EXISTS /etc/SuSE-release)
-       set (PACKAGE_FORMAT "TBZ2")
--      if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
--        if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-+      if (ARCH STREQUAL "arm64")
-           set (ARCH "aarch64")
--        else ()
--          set (ARCH "armhf")
--        endif ()
--      else (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
--        if (cMAKE_SIZEOF_VOID_P MATCHES "8")
--          set (ARCH "x86_64")
--          set (LIB_INSTALL_DIR "lib")
--          # In recent openSUSE versions (as of 2016), lib64 is mostly 
--          # used when there are both 32-bit and 64-bit versions, although 
--          # not limited to that. This CMake variable only affects the location
--          # of OpenCPN plugins at installation time, and nothing more than that.
--          # At run time, the plugin directory is determined by 
--          # wxStandardPaths::GetPluginsDir(), which returns "lib", so this can 
--          # be considered canonical.
--        else ()
--          set (ARCH "i386")
--          set (LIB_INSTALL_DIR "lib")
--        endif ()
--      endif (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
--    endif (EXISTS /etc/suse-release OR EXISTS /etc/SuSE-release)
--    if (EXISTS /etc/gentoo-release)
-+      endif()
-+    elseif (EXISTS /etc/gentoo-release)
-       set (LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
--    endif ()
--    if (APPLE)
-+    elseif (APPLE)
-       if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-         set(ARCH "x86_64")
-       endif ()
--    endif (APPLE)
-+    endif ()
-   else (NOT WIN32)
-     # On WIN32 probably CMAKE_SIZEOF_VOID_P EQUAL 8, but we don't use it at all now...
-     set (ARCH "i386")