From 936920f8a1bd0299c157afe43a36a1dbf31e38f6 Mon Sep 17 00:00:00 2001
From: reback00 <reback00@protonmail.com>
Date: Fri, 28 May 2021 10:26:13 +0600
Subject: [PATCH 1/3] goocanvas: update to 3.0.0

---
 common/shlibs              | 2 +-
 srcpkgs/goocanvas/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 666da46e048127..f041d36e04f403 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2371,7 +2371,7 @@ libtbb.so.2 tbb-4.3_1
 libtbbmalloc_debug.so.2 tbb-4.3_1
 libembree.so.2 embree-2.5.1_1
 libgtkimageview.so.0 gtkimageview-1.6.4_1
-libgoocanvas-2.0.so.9 goocanvas-2.0.4_1
+libgoocanvas-3.0.so.9 goocanvas-3.0.0_1
 libp8-platform.so.2 p8-platform-2.1.0.1_1
 libOIS.so.1.5.0 ois-1.5_1
 libSILLY.so.1 silly-0.1.0_1
diff --git a/srcpkgs/goocanvas/template b/srcpkgs/goocanvas/template
index bc2cdf8420c56b..1f5a80a225dac1 100644
--- a/srcpkgs/goocanvas/template
+++ b/srcpkgs/goocanvas/template
@@ -1,7 +1,7 @@
 # Template file for 'goocanvas'
 pkgname=goocanvas
-version=2.0.4
-revision=2
+version=3.0.0
+revision=1
 build_style=gnu-configure
 build_helper=gir
 hostmakedepends="pkg-config python3 glib-devel"
@@ -11,7 +11,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/GooCanvas"
 distfiles="${GNOME_SITE}/goocanvas/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c728e2b7d4425ae81b54e1e07a3d3c8a4bd6377a63cffa43006045bceaa92e90
+checksum=670a7557fe185c2703a14a07506156eceb7cea3b4bf75076a573f34ac52b401a
 
 build_options=gir
 build_options_default=gir

From 83af64471de96e985fdf7d2d92544a3132b6c860 Mon Sep 17 00:00:00 2001
From: reback00 <reback00@protonmail.com>
Date: Fri, 28 May 2021 23:52:40 +0600
Subject: [PATCH 2/3] perl-GooCanvas2: Adapted to goocanvas 3, license and
 xlint fixes

---
 srcpkgs/perl-GooCanvas2/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-GooCanvas2/template b/srcpkgs/perl-GooCanvas2/template
index 5240dd44000d2d..4dbb8c503d30dd 100644
--- a/srcpkgs/perl-GooCanvas2/template
+++ b/srcpkgs/perl-GooCanvas2/template
@@ -1,16 +1,21 @@
 # Template file for 'perl-GooCanvas2'
 pkgname=perl-GooCanvas2
 version=0.06
-revision=2
+revision=3
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl-Gtk3"
-checkdepends="goocanvas"
 depends="${makedepends} goocanvas"
+checkdepends="goocanvas"
 short_desc="Perl binding for GooCanvas2 widget using Glib::Object::Introspection"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
-license="Artistic-2.0, GPL-1"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/GooCanvas2"
 distfiles="https://cpan.metacpan.org/authors/id/P/PE/PERLMAX/${pkgname/perl-/}-${version}.tar.gz"
 checksum=e24c87873e19063dd4d5e2c709caacf8c0ae8881044395bb865dc2b4fdd63b50
+
+pre_configure() {
+	# For adapting to goocanvas 3.0
+	vsed -i "s/version => '2.0'/version => '3.0'/" lib/GooCanvas2.pm
+}

From 89717253be2957cc3780d7d2b5946a6a08036281 Mon Sep 17 00:00:00 2001
From: reback00 <reback00@protonmail.com>
Date: Sat, 29 May 2021 00:08:54 +0600
Subject: [PATCH 3/3] gpredict: Adapted to goocanvas 3, xlint fix

---
 srcpkgs/gpredict/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gpredict/template b/srcpkgs/gpredict/template
index 0c750c9ab0c06c..8b93e61702b458 100644
--- a/srcpkgs/gpredict/template
+++ b/srcpkgs/gpredict/template
@@ -1,15 +1,23 @@
 # Template file for 'gpredict'
 pkgname=gpredict
 version=2.2.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libcurl-devel glib-devel gtk+3-devel goocanvas-devel"
 short_desc="Real-time satellite tracking and orbit prediction application"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="GPL-2-or-later"
+license="GPL-2.0-or-later"
 homepage="http://gpredict.oz9aec.net/"
 distfiles="https://github.com/csete/gpredict/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
 checksum=e759c4bae0b17b202a7c0f8281ff016f819b502780d3e77b46fe8767e7498e43
+# Check needs to be skipped for a gtk-sat-tree.c related error which is not important for local use.
+# Details: https://github.com/void-linux/void-packages/pull/31159#issuecomment-850569764
+make_check=no
 
 CFLAGS="-fcommon"
+
+pre_configure() {
+	# For adapting to goocanvas 3.0
+	vsed -i "s/goocanvas-2.0/goocanvas-3.0/" configure
+}