[PR PATCH] goocanvas: update to 3.0.0.

[PR PATCH] goocanvas: update to 3.0.0.

[Wesley-Chan]

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

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

https://github.com/Wesley-Chan/void-packages master
https://github.com/void-linux/void-packages/pull/39647

goocanvas: update to 3.0.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86-64-musl)

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-39647.patch --]
[-- Type: text/x-diff, Size: 1568 bytes --]

From 3d6f29c95ecc4902280b45ca42261b3750dd4251 Mon Sep 17 00:00:00 2001
From: Wesley Chan <wesley.chan@posteo.org>
Date: Mon, 3 Oct 2022 09:30:29 +0800
Subject: [PATCH] goocanvas: update to 3.0.0.

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

diff --git a/common/shlibs b/common/shlibs
index 3297091f7cc0..806fc239ae7a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2385,6 +2385,7 @@ 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 bc2cdf8420c5..1f5a80a225da 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

Re: [PR PATCH] [Updated] goocanvas: update to 3.0.0.

[Wesley-Chan]

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

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

https://github.com/Wesley-Chan/void-packages master
https://github.com/void-linux/void-packages/pull/39647

goocanvas: update to 3.0.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86-64-musl)

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-39647.patch --]
[-- Type: text/x-diff, Size: 1592 bytes --]

From 0b8481cfb7fa7a3f6f809d550b2a3c7e72268263 Mon Sep 17 00:00:00 2001
From: Wesley Chan <wesley.chan@posteo.org>
Date: Mon, 3 Oct 2022 09:30:29 +0800
Subject: [PATCH] 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 3297091f7cc0..b2aff32c4a50 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2384,7 +2384,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 bc2cdf8420c5..1f5a80a225da 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

Re: goocanvas: update to 3.0.0.

[Wesley-Chan]

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

New comment by Wesley-Chan on void-packages repository

https://github.com/void-linux/void-packages/pull/39647#issuecomment-1265185515

Comment:
The failure in CI is due to this package: gpredict

It specifically requires goocanvas 2 in configure.ac, but as discussed in [this issue](https://github.com/csete/gpredict/issues/246), gpredict can use goocanvas 3 as well. [Changes to adapt to it](https://github.com/csete/gpredict/blob/master/configure.ac#L52-L65) was also merged into its master but gpredict has no new version released after that change.

In our case, it is one package that is blocking our advancement. Is the normal way to resolve conflicts to make a newer version of goocanvas in Void Linux, or make custom patch to gpredict?

Please advice. Thank you very much.

Re: goocanvas: update to 3.0.0.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/39647#issuecomment-1265284852

Comment:
if you can find the upstream commit(s)/pr that added goocanvas3 support for gpredict, you can export it as a patch by adding `.patch` to the url and download it to srcpkgs/gpredict/patches

Re: [PR PATCH] [Updated] goocanvas: update to 3.0.0.

[Wesley-Chan]

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

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

https://github.com/Wesley-Chan/void-packages master
https://github.com/void-linux/void-packages/pull/39647

goocanvas: update to 3.0.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86-64-musl)

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-39647.patch --]
[-- Type: text/x-diff, Size: 3696 bytes --]

From ef32f99cf24ec3fbdc0f4fa3688f73e467b7d35a Mon Sep 17 00:00:00 2001
From: Wesley Chan <wesley.chan@posteo.org>
Date: Mon, 3 Oct 2022 09:30:29 +0800
Subject: [PATCH] goocanvas: update to 3.0.0.

---
 common/shlibs                                 |  2 +-
 srcpkgs/goocanvas/template                    |  6 +--
 .../patches/goocanvas-3-compatible.diff       | 42 +++++++++++++++++++
 3 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gpredict/patches/goocanvas-3-compatible.diff

diff --git a/common/shlibs b/common/shlibs
index 3297091f7cc0..b2aff32c4a50 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2384,7 +2384,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 bc2cdf8420c5..1f5a80a225da 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
diff --git a/srcpkgs/gpredict/patches/goocanvas-3-compatible.diff b/srcpkgs/gpredict/patches/goocanvas-3-compatible.diff
new file mode 100644
index 000000000000..1f8b770b0292
--- /dev/null
+++ b/srcpkgs/gpredict/patches/goocanvas-3-compatible.diff
@@ -0,0 +1,42 @@
+As of version 2.2.1, Gpredict only supports goocanvas 2.
+However, simple tests have been made and official master branch already
+detects goocanvas 3 in configure.
+Related Pull Request: https://github.com/csete/gpredict/pull/251
+Consider removing this patch when the support comes from upstream.
+--- a/configure
++++ b/configure
+@@ -12772,12 +12772,19 @@
+     as_fn_error $? "Gpredict requires libglib-dev 2.32 or later" "$LINENO" 5
+ fi
+ 
+-# check for goocanvas (depends on gtk and glib)
++# check for goocanvas 2 or 3 (depends on gtk and glib)
+ if pkg-config --atleast-version=2.0 goocanvas-2.0; then
+     CFLAGS="$CFLAGS `pkg-config --cflags goocanvas-2.0`"
+     LIBS="$LIBS `pkg-config --libs goocanvas-2.0`"
++    havegoocanvas2=true
+ else
+-    as_fn_error $? "Gpredict requires libgoocanvas-2.0-dev" "$LINENO" 5
++    if pkg-config --atleast-version=3.0 goocanvas-3.0; then
++        CFLAGS="$CFLAGS `pkg-config --cflags goocanvas-3.0`"
++        LIBS="$LIBS `pkg-config --libs goocanvas-3.0`"
++        havegoocanvas3=true
++    else
++        as_fn_error $? "Gpredict requires libgoocanvas-2.0-dev or libgoocanvas-3.0-dev" "$LINENO" 5
++    fi
+ fi
+ 
+ # check for libgps (optional)
+@@ -13555,6 +13562,12 @@
+ GTK_V=`pkg-config --modversion gtk+-3.0`
+ GOOC_V=`pkg-config --modversion goocanvas-2.0`
+ CURL_V=`pkg-config --modversion libcurl`
++if test "$havegoocanvas2" = true ;  then
++    GOOC_V=`pkg-config --modversion goocanvas-2.0`
++fi
++if test "$havegoocanvas3" = true ;  then
++    GOOC_V=`pkg-config --modversion goocanvas-3.0`
++fi
+ if test "$havelibgps" = true ; then
+    GPS_V=`pkg-config --modversion libgps`
+ fi

Re: goocanvas: update to 3.0.0.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/39647#issuecomment-1265436275

Comment:
`perl-GooCanvas2` is the only other package that depends on goocanvas, so I think we should stay on goocanvas 2.x for now.

Re: goocanvas: update to 3.0.0.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/39647#issuecomment-1265436275

Comment:
looking into this more, `perl-GooCanvas2` is the only other package that depends on goocanvas, so I think we should stay on goocanvas 2.x for now.

Re: goocanvas: update to 3.0.0.

[Wesley-Chan]

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

New comment by Wesley-Chan on void-packages repository

https://github.com/void-linux/void-packages/pull/39647#issuecomment-1265451844

Comment:
Hey, @classabbyamp. Thank you for your quick reply.

Sorry, I don't quite understand what you meant by "`perl-GooCanvas2` is the only other package that depends on goocanvas". Doesn't `gpredict` also depend on goocanvas by linking to it?

The motivation of mine to update goocanvas is to bring [Akira](https://github.com/akiraux/Akira) to Void, which does depend on goocanvas 3. If I understand correctly, if other packages like `gpredict` or `perl-Goocanvas2` refuse to move on, `Akira` could never land on Void Linux, right?

Thank you very much.

P.S. How do I verify the GitHub action `Verify repository state` locally? Is it documented anywhere? Thanks again.

Re: goocanvas: update to 3.0.0.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/39647#issuecomment-1265467455

Comment:
> Sorry, I don't quite understand what you meant by "`perl-GooCanvas2` is the only other package that depends on goocanvas". Doesn't `gpredict` also depend on goocanvas by linking to it?

only package other than gpredict is what I meant

> The motivation of mine to update goocanvas is to bring [Akira](https://github.com/akiraux/Akira) to Void, which does depend on goocanvas 3. If I understand correctly, if other packages like `gpredict` or `perl-Goocanvas2` refuse to move on, `Akira` could never land on Void Linux, right?

in this case, we'd want to have a versioned package for the time being, like `goocanvas2` and `goocanvas`. however, it seems that akira removed goocanvas? (https://github.com/akiraux/Akira/pull/652)

> How do I verify the GitHub action `Verify repository state` locally? Is it documented anywhere?

that ci step:
https://github.com/void-linux/void-packages/blob/2cb7f280f8fbded19d8f4fc22813dd47336665a0/.github/workflows/build.yaml#L120-L126
runs this script:
https://github.com/void-linux/void-packages/blob/master/common/travis/check-install.sh
I would not recommend running it locally outside of a container.

Re: goocanvas: update to 3.0.0.

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/39647#issuecomment-1368603665

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: goocanvas: update to 3.0.0.

[newbluemoon]

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

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/39647#issuecomment-1368669275

Comment:
There is also #31159 which worked for me (i.e. the `pre_configure`-fix). I tested it with all depending packages just didn’t pursue it any further, because there didn’t seem to be much interest at that time. ;)

Re: goocanvas: update to 3.0.0.

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/39647#issuecomment-1495226562

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Closed]: goocanvas: update to 3.0.0.

[github-actions]

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

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

goocanvas: update to 3.0.0.
https://github.com/void-linux/void-packages/pull/39647

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86-64-musl)

Re: [PR PATCH] [Updated] goocanvas: update to 3.0.0

[reback00]

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

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

https://github.com/reback00/void-packages goocanvas-3
https://github.com/void-linux/void-packages/pull/31159

goocanvas: update to 3.0.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-goocanvas-3-31159.patch --]
[-- Type: text/x-diff, Size: 4492 bytes --]

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 666da46e0481..f041d36e04f4 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 bc2cdf8420c5..1f5a80a225da 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 5240dd44000d..4dbb8c503d30 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 0c750c9ab0c0..8b93e61702b4 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
+}

Re: [PR PATCH] [Updated] goocanvas: update to 3.0.0

[reback00]

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

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

https://github.com/reback00/void-packages goocanvas-3
https://github.com/void-linux/void-packages/pull/31159

goocanvas: update to 3.0.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-goocanvas-3-31159.patch --]
[-- Type: text/x-diff, Size: 4410 bytes --]

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 666da46e0481..f041d36e04f4 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 bc2cdf8420c5..1f5a80a225da 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 5240dd44000d..4dbb8c503d30 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 87e343e62c9673686b8dde05f359cc1a1fe5ff5e 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 0c750c9ab0c0..2dd809c000d0 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
 
 CFLAGS="-fcommon"
+
+pre_configure() {
+	# For adapting to goocanvas 3.0
+	vsed -i "s/goocanvas-2.0/goocanvas-3.0/" configure
+	# To allow changed configure files for goocanvas 3
+	# Details: https://github.com/apereo/mod_auth_cas/issues/97
+	touch *
+}

Re: [PR PATCH] [Updated] goocanvas: update to 3.0.0

[reback00]

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

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

https://github.com/reback00/void-packages goocanvas-3
https://github.com/void-linux/void-packages/pull/31159

goocanvas: update to 3.0.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-goocanvas-3-31159.patch --]
[-- Type: text/x-diff, Size: 3020 bytes --]

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/2] 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 666da46e0481..f041d36e04f4 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 bc2cdf8420c5..1f5a80a225da 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/2] 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 5240dd44000d..4dbb8c503d30 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
+}

Re: [PR PATCH] [Updated] goocanvas: update to 3.0.0

[reback00]

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

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

https://github.com/reback00/void-packages goocanvas-3
https://github.com/void-linux/void-packages/pull/31159

goocanvas: update to 3.0.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-goocanvas-3-31159.patch --]
[-- Type: text/x-diff, Size: 4182 bytes --]

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 666da46e0481..f041d36e04f4 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 bc2cdf8420c5..1f5a80a225da 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 a3716d86c75a3af6ba2e5bb3d0c356a5fc004b06 Mon Sep 17 00:00:00 2001
From: reback00 <reback00@protonmail.com>
Date: Fri, 28 May 2021 22:39:43 +0600
Subject: [PATCH 2/3] perl-GooCanvas2: Adapted to goocanvas 3, license and
 xlint fixes

---
 srcpkgs/perl-GooCanvas2/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-GooCanvas2/template b/srcpkgs/perl-GooCanvas2/template
index 5240dd44000d..b372c79d98c5 100644
--- a/srcpkgs/perl-GooCanvas2/template
+++ b/srcpkgs/perl-GooCanvas2/template
@@ -6,11 +6,16 @@ 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 f49d1b1e8ffd20cd57f6006f0d48f968e559c5a7 Mon Sep 17 00:00:00 2001
From: reback00 <reback00@protonmail.com>
Date: Fri, 28 May 2021 23:15:46 +0600
Subject: [PATCH 3/3] gpredict: Adapted to goocanvas 3, xlint fix

---
 srcpkgs/gpredict/template | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gpredict/template b/srcpkgs/gpredict/template
index 0c750c9ab0c0..44f1130640b0 100644
--- a/srcpkgs/gpredict/template
+++ b/srcpkgs/gpredict/template
@@ -7,9 +7,17 @@ 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
 
 CFLAGS="-fcommon"
+
+pre_configure() {
+	# For adapting to goocanvas 3.0
+	vsed -i "s/goocanvas-2.0/goocanvas-3.0/" configure
+	# To allow changed configure files for goocanvas 3
+	# Details: https://github.com/apereo/mod_auth_cas/issues/97
+	touch *
+}

Re: [PR PATCH] [Updated] goocanvas: update to 3.0.0

[reback00]

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

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

https://github.com/reback00/void-packages goocanvas-3
https://github.com/void-linux/void-packages/pull/31159

goocanvas: update to 3.0.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-goocanvas-3-31159.patch --]
[-- Type: text/x-diff, Size: 4053 bytes --]

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 666da46e0481..f041d36e04f4 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 bc2cdf8420c5..1f5a80a225da 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 a3716d86c75a3af6ba2e5bb3d0c356a5fc004b06 Mon Sep 17 00:00:00 2001
From: reback00 <reback00@protonmail.com>
Date: Fri, 28 May 2021 22:39:43 +0600
Subject: [PATCH 2/3] perl-GooCanvas2: Adapted to goocanvas 3, license and
 xlint fixes

---
 srcpkgs/perl-GooCanvas2/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-GooCanvas2/template b/srcpkgs/perl-GooCanvas2/template
index 5240dd44000d..b372c79d98c5 100644
--- a/srcpkgs/perl-GooCanvas2/template
+++ b/srcpkgs/perl-GooCanvas2/template
@@ -6,11 +6,16 @@ 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 c45a34f4ca47f5395562765c072a5e5474c8331f Mon Sep 17 00:00:00 2001
From: reback00 <reback00@protonmail.com>
Date: Fri, 28 May 2021 23:15:46 +0600
Subject: [PATCH 3/3] gpredict: Adapted to goocanvas 3, xlint fix

---
 srcpkgs/gpredict/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gpredict/template b/srcpkgs/gpredict/template
index 0c750c9ab0c0..656abbd25578 100644
--- a/srcpkgs/gpredict/template
+++ b/srcpkgs/gpredict/template
@@ -7,9 +7,14 @@ 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
 
 CFLAGS="-fcommon"
+
+pre_configure() {
+	# For adapting to goocanvas 3.0
+	vsed -i "s/goocanvas-2.0/goocanvas-3.0/" configure
+}