[PR PATCH] google-earth-pro: update to 7.3.3.7721

[PR PATCH] google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 349 bytes --]

There is a new pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages google-earth-pro-7.3.3.7721
https://github.com/void-linux/void-packages/pull/23743

google-earth-pro: update to 7.3.3.7721


A patch file from https://github.com/void-linux/void-packages/pull/23743.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-google-earth-pro-7.3.3.7721-23743.patch --]
[-- Type: text/x-diff, Size: 1380 bytes --]

From 6d211aeb7023054bc4a1e47ba68958c39c56132e Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..a5114655e1e 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
-repository=nonfree
-restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 

Re: google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 201 bytes --]

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23743#issuecomment-662659814

Comment:
Is there a better string for license other than "Google"?

Re: google-earth-pro: update to 7.3.3.7721

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 156 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23743#issuecomment-662661168

Comment:
`custom:Google`

Re: [PR PATCH] [Updated] google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages google-earth-pro-7.3.3.7721
https://github.com/void-linux/void-packages/pull/23743

google-earth-pro: update to 7.3.3.7721


A patch file from https://github.com/void-linux/void-packages/pull/23743.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-google-earth-pro-7.3.3.7721-23743.patch --]
[-- Type: text/x-diff, Size: 2438 bytes --]

From 6d211aeb7023054bc4a1e47ba68958c39c56132e Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 1/2] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..a5114655e1e 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
-repository=nonfree
-restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 

From 93a2461e0f302c0d1f385791665be1b03249175f Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 14:54:44 -0500
Subject: [PATCH 2/2] google-earth-pro: update license string.

---
 srcpkgs/google-earth-pro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a5114655e1e..69046968bb8 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -7,7 +7,7 @@ depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
 maintainer="Jason Manley <jason@jasondavid.tv>"
-license="Google"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
 checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152

Re: google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23743#issuecomment-662670371

Comment:
With regards to the other failing check... first of all I wonder how this went unnoticed in previous builds. Although I didn't dig too deep, I didn't find where the list of packages in binary-bootstrap gets installed. tar and xz certainly need to be added to them. Or can this be worked around with makedepends ?

Re: google-earth-pro: update to 7.3.3.7721

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 171 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23743#issuecomment-662671518

Comment:
Use `bsdtar` instead of `tar`.

Re: google-earth-pro: update to 7.3.3.7721

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 312 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23743#issuecomment-662672648

Comment:
Please read https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#review 

You should use `git commit --amend` to avoid needing to squash your commits.

Re: [PR PATCH] [Updated] google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages google-earth-pro-7.3.3.7721
https://github.com/void-linux/void-packages/pull/23743

google-earth-pro: update to 7.3.3.7721


A patch file from https://github.com/void-linux/void-packages/pull/23743.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-google-earth-pro-7.3.3.7721-23743.patch --]
[-- Type: text/x-diff, Size: 4218 bytes --]

From 6d211aeb7023054bc4a1e47ba68958c39c56132e Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 1/4] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..a5114655e1e 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
-repository=nonfree
-restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 

From 93a2461e0f302c0d1f385791665be1b03249175f Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 14:54:44 -0500
Subject: [PATCH 2/4] google-earth-pro: update license string.

---
 srcpkgs/google-earth-pro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a5114655e1e..69046968bb8 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -7,7 +7,7 @@ depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
 maintainer="Jason Manley <jason@jasondavid.tv>"
-license="Google"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
 checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152

From f738009cddce24f85ada10578752b42f8fe7efd9 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 14:54:44 -0500
Subject: [PATCH 3/4] google-earth-pro: update license string.

---
 srcpkgs/google-earth-pro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a5114655e1e..69046968bb8 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -7,7 +7,7 @@ depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
 maintainer="Jason Manley <jason@jasondavid.tv>"
-license="Google"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
 checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152

From c245789b5c0f329b91a204f2e9bb1eec481df418 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 15:19:22 -0500
Subject: [PATCH 4/4] google-earth-pro: change old use of tar to bsdtar.

---
 srcpkgs/google-earth-pro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 69046968bb8..5e9a9249a37 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -26,7 +26,7 @@ post_fetch() {
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}-r0_amd64.deb
-	tar xf data.tar.xz
+	bsdtar xf data.tar.xz
 }
 
 do_install() {

Re: [PR PATCH] [Updated] google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages google-earth-pro-7.3.3.7721
https://github.com/void-linux/void-packages/pull/23743

google-earth-pro: update to 7.3.3.7721


A patch file from https://github.com/void-linux/void-packages/pull/23743.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-google-earth-pro-7.3.3.7721-23743.patch --]
[-- Type: text/x-diff, Size: 5974 bytes --]

From 6d211aeb7023054bc4a1e47ba68958c39c56132e Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 1/5] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..a5114655e1e 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
-repository=nonfree
-restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 

From 93a2461e0f302c0d1f385791665be1b03249175f Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 14:54:44 -0500
Subject: [PATCH 2/5] google-earth-pro: update license string.

---
 srcpkgs/google-earth-pro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a5114655e1e..69046968bb8 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -7,7 +7,7 @@ depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
 maintainer="Jason Manley <jason@jasondavid.tv>"
-license="Google"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
 checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152

From f738009cddce24f85ada10578752b42f8fe7efd9 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 14:54:44 -0500
Subject: [PATCH 3/5] google-earth-pro: update license string.

---
 srcpkgs/google-earth-pro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a5114655e1e..69046968bb8 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -7,7 +7,7 @@ depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
 maintainer="Jason Manley <jason@jasondavid.tv>"
-license="Google"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
 checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152

From c245789b5c0f329b91a204f2e9bb1eec481df418 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 15:19:22 -0500
Subject: [PATCH 4/5] google-earth-pro: change old use of tar to bsdtar.

---
 srcpkgs/google-earth-pro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 69046968bb8..5e9a9249a37 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -26,7 +26,7 @@ post_fetch() {
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}-r0_amd64.deb
-	tar xf data.tar.xz
+	bsdtar xf data.tar.xz
 }
 
 do_install() {

From 8901e441b1090a3d9f26bf76ae3cccfa751e21eb Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 5/5] google-earth-pro: update to 7.3.3.7721

google-earth-pro: update license string.

google-earth-pro: change old use of tar to bsdtar.

google-earth-pro: update license string.
---
 srcpkgs/google-earth-pro/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..5e9a9249a37 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Google"
-repository=nonfree
-restricted=yes
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 
@@ -26,7 +26,7 @@ post_fetch() {
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}-r0_amd64.deb
-	tar xf data.tar.xz
+	bsdtar xf data.tar.xz
 }
 
 do_install() {

Re: [PR PATCH] [Updated] google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages google-earth-pro-7.3.3.7721
https://github.com/void-linux/void-packages/pull/23743

google-earth-pro: update to 7.3.3.7721


A patch file from https://github.com/void-linux/void-packages/pull/23743.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-google-earth-pro-7.3.3.7721-23743.patch --]
[-- Type: text/x-diff, Size: 7595 bytes --]

From 6d211aeb7023054bc4a1e47ba68958c39c56132e Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 1/6] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..a5114655e1e 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
-repository=nonfree
-restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 

From 93a2461e0f302c0d1f385791665be1b03249175f Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 14:54:44 -0500
Subject: [PATCH 2/6] google-earth-pro: update license string.

---
 srcpkgs/google-earth-pro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a5114655e1e..69046968bb8 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -7,7 +7,7 @@ depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
 maintainer="Jason Manley <jason@jasondavid.tv>"
-license="Google"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
 checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152

From f738009cddce24f85ada10578752b42f8fe7efd9 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 14:54:44 -0500
Subject: [PATCH 3/6] google-earth-pro: update license string.

---
 srcpkgs/google-earth-pro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a5114655e1e..69046968bb8 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -7,7 +7,7 @@ depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
 maintainer="Jason Manley <jason@jasondavid.tv>"
-license="Google"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
 checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152

From c245789b5c0f329b91a204f2e9bb1eec481df418 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 15:19:22 -0500
Subject: [PATCH 4/6] google-earth-pro: change old use of tar to bsdtar.

---
 srcpkgs/google-earth-pro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 69046968bb8..5e9a9249a37 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -26,7 +26,7 @@ post_fetch() {
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}-r0_amd64.deb
-	tar xf data.tar.xz
+	bsdtar xf data.tar.xz
 }
 
 do_install() {

From 8901e441b1090a3d9f26bf76ae3cccfa751e21eb Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 5/6] google-earth-pro: update to 7.3.3.7721

google-earth-pro: update license string.

google-earth-pro: change old use of tar to bsdtar.

google-earth-pro: update license string.
---
 srcpkgs/google-earth-pro/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..5e9a9249a37 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Google"
-repository=nonfree
-restricted=yes
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 
@@ -26,7 +26,7 @@ post_fetch() {
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}-r0_amd64.deb
-	tar xf data.tar.xz
+	bsdtar xf data.tar.xz
 }
 
 do_install() {

From 526f6fe7922a564dea5f982d4bd84aa716f9fc95 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 6/6] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..5e9a9249a37 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Google"
-repository=nonfree
-restricted=yes
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 
@@ -26,7 +26,7 @@ post_fetch() {
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}-r0_amd64.deb
-	tar xf data.tar.xz
+	bsdtar xf data.tar.xz
 }
 
 do_install() {

Re: [PR PATCH] [Updated] google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages google-earth-pro-7.3.3.7721
https://github.com/void-linux/void-packages/pull/23743

google-earth-pro: update to 7.3.3.7721


A patch file from https://github.com/void-linux/void-packages/pull/23743.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-google-earth-pro-7.3.3.7721-23743.patch --]
[-- Type: text/x-diff, Size: 7595 bytes --]

From 6d211aeb7023054bc4a1e47ba68958c39c56132e Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 1/6] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..a5114655e1e 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
-repository=nonfree
-restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 

From 93a2461e0f302c0d1f385791665be1b03249175f Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 14:54:44 -0500
Subject: [PATCH 2/6] google-earth-pro: update license string.

---
 srcpkgs/google-earth-pro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a5114655e1e..69046968bb8 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -7,7 +7,7 @@ depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
 maintainer="Jason Manley <jason@jasondavid.tv>"
-license="Google"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
 checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152

From f738009cddce24f85ada10578752b42f8fe7efd9 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 14:54:44 -0500
Subject: [PATCH 3/6] google-earth-pro: update license string.

---
 srcpkgs/google-earth-pro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a5114655e1e..69046968bb8 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -7,7 +7,7 @@ depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
 maintainer="Jason Manley <jason@jasondavid.tv>"
-license="Google"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
 checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152

From c245789b5c0f329b91a204f2e9bb1eec481df418 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 15:19:22 -0500
Subject: [PATCH 4/6] google-earth-pro: change old use of tar to bsdtar.

---
 srcpkgs/google-earth-pro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 69046968bb8..5e9a9249a37 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -26,7 +26,7 @@ post_fetch() {
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}-r0_amd64.deb
-	tar xf data.tar.xz
+	bsdtar xf data.tar.xz
 }
 
 do_install() {

From 8901e441b1090a3d9f26bf76ae3cccfa751e21eb Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 5/6] google-earth-pro: update to 7.3.3.7721

google-earth-pro: update license string.

google-earth-pro: change old use of tar to bsdtar.

google-earth-pro: update license string.
---
 srcpkgs/google-earth-pro/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..5e9a9249a37 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Google"
-repository=nonfree
-restricted=yes
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 
@@ -26,7 +26,7 @@ post_fetch() {
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}-r0_amd64.deb
-	tar xf data.tar.xz
+	bsdtar xf data.tar.xz
 }
 
 do_install() {

From 526f6fe7922a564dea5f982d4bd84aa716f9fc95 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 6/6] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..5e9a9249a37 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Google"
-repository=nonfree
-restricted=yes
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 
@@ -26,7 +26,7 @@ post_fetch() {
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}-r0_amd64.deb
-	tar xf data.tar.xz
+	bsdtar xf data.tar.xz
 }
 
 do_install() {

Re: google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 574 bytes --]

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23743#issuecomment-662680133

Comment:
> Please read https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#review
> 
> You should use `git commit --amend` to avoid needing to squash your commits.

I'll remember to do that in the future. Something is being weird on my end trying to squash commits. It wants me to pull before push every time after git merge --rebase and is creating more commits. Is there a function here to merge + squash commits?

Re: google-earth-pro: update to 7.3.3.7721

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23743#issuecomment-662683035

Comment:
Why arae you trying to do merge??

Just `git rebase -i HEAD~11`, squash everything in the text editor, and force push.

Re: google-earth-pro: update to 7.3.3.7721

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23743#issuecomment-662683334

Comment:
https://medium.com/@slamflipstrom/a-beginners-guide-to-squashing-commits-with-git-rebase-8185cf6e62ec

Re: google-earth-pro: update to 7.3.3.7721

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 260 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23743#issuecomment-662683035

Comment:
Why are you trying to do merge??

Just `git rebase -i HEAD~11`, squash everything in the text editor, and force push.

Re: google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 469 bytes --]

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23743#issuecomment-662684864

Comment:
> Why are you trying to do merge??
> 
> Just `git rebase -i HEAD~11`, squash everything in the text editor, and force push.

Do I also put "squash" for the original commit? My mistake might have been squashing everything except the first commit "google-earth-pro: update to 7.3.3.7221" if I misunderstood how that worked.

Re: [PR PATCH] [Updated] google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages google-earth-pro-7.3.3.7721
https://github.com/void-linux/void-packages/pull/23743

google-earth-pro: update to 7.3.3.7721


A patch file from https://github.com/void-linux/void-packages/pull/23743.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-google-earth-pro-7.3.3.7721-23743.patch --]
[-- Type: text/x-diff, Size: 2958 bytes --]

From 6d211aeb7023054bc4a1e47ba68958c39c56132e Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 1/2] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..a5114655e1e 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
-repository=nonfree
-restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 

From 5834d878e0954e8dcd7c4e69504b6def9f2b446f Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 2/2] google-earth-pro: update to 7.3.3.7721

google-earth-pro: update to 7.3.3.7721

google-earth-pro: update license string.

google-earth-pro: change old use of tar to bsdtar.

google-earth-pro: update license string.

google-earth-pro: update license string.

google-earth-pro: change old use of tar to bsdtar.

google-earth-pro: update license string.
---
 srcpkgs/google-earth-pro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a5114655e1e..5e9a9249a37 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -7,7 +7,7 @@ depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
 maintainer="Jason Manley <jason@jasondavid.tv>"
-license="Google"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
 checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
@@ -26,7 +26,7 @@ post_fetch() {
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}-r0_amd64.deb
-	tar xf data.tar.xz
+	bsdtar xf data.tar.xz
 }
 
 do_install() {

Re: google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 173 bytes --]

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23743#issuecomment-662687214

Comment:
I squashed almost everything.

Re: google-earth-pro: update to 7.3.3.7721

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23743#issuecomment-662687791

Comment:
You shouldn't squash the original commits, only the ones leading up to it. You should also fix the commit message. 

Re: google-earth-pro: update to 7.3.3.7721

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 255 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23743#issuecomment-662687791

Comment:
You shouldn't squash the original commit, only the ones leading up to it. You should also fix the commit message. 

Re: [PR PATCH] [Updated] google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages google-earth-pro-7.3.3.7721
https://github.com/void-linux/void-packages/pull/23743

google-earth-pro: update to 7.3.3.7721


A patch file from https://github.com/void-linux/void-packages/pull/23743.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-google-earth-pro-7.3.3.7721-23743.patch --]
[-- Type: text/x-diff, Size: 2648 bytes --]

From 6d211aeb7023054bc4a1e47ba68958c39c56132e Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 1/2] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..a5114655e1e 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
-repository=nonfree
-restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 

From 628ce5a195a1feb61574e3959e137ecba2f24c79 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 2/2] google-earth-pro: update to 7.3.3.7721.

---
 srcpkgs/google-earth-pro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a5114655e1e..5e9a9249a37 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -7,7 +7,7 @@ depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
 maintainer="Jason Manley <jason@jasondavid.tv>"
-license="Google"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
 checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
@@ -26,7 +26,7 @@ post_fetch() {
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}-r0_amd64.deb
-	tar xf data.tar.xz
+	bsdtar xf data.tar.xz
 }
 
 do_install() {

Re: [PR PATCH] [Updated] google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages google-earth-pro-7.3.3.7721
https://github.com/void-linux/void-packages/pull/23743

google-earth-pro: update to 7.3.3.7721


A patch file from https://github.com/void-linux/void-packages/pull/23743.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-google-earth-pro-7.3.3.7721-23743.patch --]
[-- Type: text/x-diff, Size: 2648 bytes --]

From 6d211aeb7023054bc4a1e47ba68958c39c56132e Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 1/2] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..a5114655e1e 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
-repository=nonfree
-restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 

From e5d49f55cd4f56c1c80467fd5f6bc6fe8b5f420f Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 2/2] google-earth-pro: update to 7.3.3.7721.

---
 srcpkgs/google-earth-pro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a5114655e1e..5e9a9249a37 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -7,7 +7,7 @@ depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
 maintainer="Jason Manley <jason@jasondavid.tv>"
-license="Google"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
 checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
@@ -26,7 +26,7 @@ post_fetch() {
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}-r0_amd64.deb
-	tar xf data.tar.xz
+	bsdtar xf data.tar.xz
 }
 
 do_install() {

Re: google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23743#issuecomment-662687214

Comment:
I squashed almost everything. It's still showing two commits instead of one. a rebase -i <the first one> only then lists the second one in the text editor for commit message.

Re: [PR PATCH] [Updated] google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages google-earth-pro-7.3.3.7721
https://github.com/void-linux/void-packages/pull/23743

google-earth-pro: update to 7.3.3.7721


A patch file from https://github.com/void-linux/void-packages/pull/23743.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-google-earth-pro-7.3.3.7721-23743.patch --]
[-- Type: text/x-diff, Size: 3912 bytes --]

From 6d211aeb7023054bc4a1e47ba68958c39c56132e Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 1/3] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..a5114655e1e 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
-repository=nonfree
-restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 

From 628ce5a195a1feb61574e3959e137ecba2f24c79 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 2/3] google-earth-pro: update to 7.3.3.7721.

---
 srcpkgs/google-earth-pro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a5114655e1e..5e9a9249a37 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -7,7 +7,7 @@ depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
 maintainer="Jason Manley <jason@jasondavid.tv>"
-license="Google"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
 checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
@@ -26,7 +26,7 @@ post_fetch() {
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}-r0_amd64.deb
-	tar xf data.tar.xz
+	bsdtar xf data.tar.xz
 }
 
 do_install() {

From e5d49f55cd4f56c1c80467fd5f6bc6fe8b5f420f Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH 3/3] google-earth-pro: update to 7.3.3.7721.

---
 srcpkgs/google-earth-pro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a5114655e1e..5e9a9249a37 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -7,7 +7,7 @@ depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
 maintainer="Jason Manley <jason@jasondavid.tv>"
-license="Google"
+license="custom:Google"
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
 checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
@@ -26,7 +26,7 @@ post_fetch() {
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}-r0_amd64.deb
-	tar xf data.tar.xz
+	bsdtar xf data.tar.xz
 }
 
 do_install() {

Re: [PR PATCH] [Updated] google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages google-earth-pro-7.3.3.7721
https://github.com/void-linux/void-packages/pull/23743

google-earth-pro: update to 7.3.3.7721


A patch file from https://github.com/void-linux/void-packages/pull/23743.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-google-earth-pro-7.3.3.7721-23743.patch --]
[-- Type: text/x-diff, Size: 1380 bytes --]

From 6d211aeb7023054bc4a1e47ba68958c39c56132e Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..a5114655e1e 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
-repository=nonfree
-restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 

Re: [PR PATCH] [Updated] google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages google-earth-pro-7.3.3.7721
https://github.com/void-linux/void-packages/pull/23743

google-earth-pro: update to 7.3.3.7721


A patch file from https://github.com/void-linux/void-packages/pull/23743.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-google-earth-pro-7.3.3.7721-23743.patch --]
[-- Type: text/x-diff, Size: 1380 bytes --]

From 6d211aeb7023054bc4a1e47ba68958c39c56132e Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 22 Jul 2020 13:46:05 -0500
Subject: [PATCH] google-earth-pro: update to 7.3.3.7721

---
 srcpkgs/google-earth-pro/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index 41763ae7d25..a5114655e1e 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -1,18 +1,18 @@
 # Template file for 'google-earth-pro'
 pkgname=google-earth-pro
-version=7.3.2.5494
+version=7.3.3.7721
 revision=1
 archs="x86_64"
 depends="alsa-lib desktop-file-utils fontconfig glu gst-plugins-base1
  hicolor-icon-theme libSM libXi libXrender libcups libproxy nss"
 short_desc="Explore the far reaches of the world"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="Google"
-repository=nonfree
-restricted=yes
 homepage="https://www.google.com/earth/index.html"
 distfiles="https://dl.google.com/linux/earth/deb/pool/main/g/${pkgname}-stable/${pkgname}-stable_${version}-r0_amd64.deb"
-checksum=86df2e14c94c1776f5fb5ff8d88a82620b74cdeb0c5e0e0df78c23b549f75618
+checksum=db3f4b224426789ffb8d76a5f64126f8a2822bc42d30da162ac05d039047a152
+repository=nonfree
+restricted=yes
 
 nostrip=yes
 

Re: google-earth-pro: update to 7.3.3.7721

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 274 bytes --]

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/23743#issuecomment-662696883

Comment:
I believe I have fixed everything, down to one commit, and a commit --amend for the other fixes. Thank you for your patience here.

Re: [PR PATCH] [Closed]: google-earth-pro: update to 7.3.3.7721

[the-maldridge]

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

There's a closed pull request on the void-packages repository

google-earth-pro: update to 7.3.3.7721
https://github.com/void-linux/void-packages/pull/23743

Description: