Phase out i686: https://www.archlinux.org/news/the-end-of-i686-support/

2 files changed, 7 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 78bf4d50e808..9db2e642c905 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -4,7 +4,6 @@ pkgbase = google-earth
 	pkgrel = 1
 	url = https://www.google.com/earth/index.html
 	install = google-earth.install
-	arch = i686
 	arch = x86_64
 	license = custom:earth
 	depends = glu
@@ -16,22 +15,20 @@ pkgbase = google-earth
 	optdepends = catalyst-utils: For AMD Catalyst
 	optdepends = nvidia-utils: For the NVIDIA driver
 	options = !emptydirs
+	source = google-earth-stable_7.1.8.3036_amd64.deb::https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_7.1.8.3036-r0_amd64.deb
 	source = googleearth.sh
 	source = baifaao.cpp
 	source = Google-Terms-of-Service.html::https://www.google.com/intl/ALL/policies/terms/index.html
 	source = Google-Earth-Additional-Terms-of-Service.html::https://www.google.com/help/terms_maps.html
 	source = Legal-Notices-for-Google-Earth-and-Google-Earth-APIs.html::https://www.google.com/help/legalnotices_maps.html
 	source = Google-Privacy-Policy.html::https://www.google.com/intl/ALL/policies/privacy/index.html
+	md5sums = 77cb0eacde195c224767a77ccf54c8ef
 	md5sums = e84f5d51ea3545c131d1794f89f6464a
 	md5sums = 598d579a1c3199c77850d86ba78f7b44
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
-	source_i686 = google-earth-stable_7.1.8.3036_i386.deb::https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_7.1.8.3036-r0_i386.deb
-	md5sums_i686 = bf6ccc911ce09a9ec5dc0e6ee98e92d5
-	source_x86_64 = google-earth-stable_7.1.8.3036_amd64.deb::https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_7.1.8.3036-r0_amd64.deb
-	md5sums_x86_64 = 77cb0eacde195c224767a77ccf54c8ef
 
 pkgname = google-earth
 
diff --git a/PKGBUILD b/PKGBUILD
index 758c88fb9181..03d0f0ecd4a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=google-earth
 pkgver=7.1.8.3036
 pkgrel=1
 pkgdesc="Semi-legacy 3D interface to explore the globe, terrain, streets, buildings and other planets"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="https://www.google.com/earth/index.html"
 license=('custom:earth')
 depends=('glu' 'hicolor-icon-theme' 'ld-lsb>=3-5' 'libsm' 'libxrender' 'nss')
@@ -20,29 +20,20 @@ optdepends=('catalyst-utils: For AMD Catalyst'
             'nvidia-utils: For the NVIDIA driver')
 options=('!emptydirs')
 install=$pkgname.install
-source=('googleearth.sh'
+source=("google-earth-stable_${pkgver}_amd64.deb::https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_7.1.8.3036-r0_amd64.deb"
+        'googleearth.sh'
         'baifaao.cpp'
         'Google-Terms-of-Service.html::https://www.google.com/intl/ALL/policies/terms/index.html'
         'Google-Earth-Additional-Terms-of-Service.html::https://www.google.com/help/terms_maps.html'
         'Legal-Notices-for-Google-Earth-and-Google-Earth-APIs.html::https://www.google.com/help/legalnotices_maps.html'
         'Google-Privacy-Policy.html::https://www.google.com/intl/ALL/policies/privacy/index.html')
-source_i686=("google-earth-stable_${pkgver}_i386.deb::https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_7.1.8.3036-r0_i386.deb")
-source_x86_64=("google-earth-stable_${pkgver}_amd64.deb::https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_7.1.8.3036-r0_amd64.deb")
-md5sums=('e84f5d51ea3545c131d1794f89f6464a'
+md5sums=('77cb0eacde195c224767a77ccf54c8ef'
+         'e84f5d51ea3545c131d1794f89f6464a'
          '598d579a1c3199c77850d86ba78f7b44'
          'SKIP'
          'SKIP'
          'SKIP'
          'SKIP')
-md5sums_i686=('bf6ccc911ce09a9ec5dc0e6ee98e92d5')
-md5sums_x86_64=('77cb0eacde195c224767a77ccf54c8ef')
-
-# For new crashy version:
-#pkgver=7.3.0.3827
-#source_i686=("google-earth-stable_${pkgver}_i386.deb::https://dl.google.com/earth/client/current/google-earth-stable_current_i386.deb")
-#source_x86_64=("google-earth-stable_${pkgver}_amd64.deb::https://dl.google.com/earth/client/current/google-earth-stable_current_amd64.deb")
-#md5sums_i686=('7f4eb5dc6a30ccb8015216adf2517e5c')
-#md5sums_x86_64=('c92a95342789e2202efc42a619970034')
 
 _instdir=/opt/google/earth/free/