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

[Wesley-Chan <Wesley-Chan@users.noreply.github.com>]

[-- 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