goocanvas: update to 3.0.0.

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

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

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