* Re: [PR PATCH] [Updated] goocanvas: update to 3.0.0.
2022-10-03 1:36 [PR PATCH] goocanvas: update to 3.0.0 Wesley-Chan
@ 2022-10-03 1:49 ` Wesley-Chan
2022-10-03 9:38 ` Wesley-Chan
` (10 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Wesley-Chan @ 2022-10-03 1:49 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: goocanvas: update to 3.0.0.
2022-10-03 1:36 [PR PATCH] goocanvas: update to 3.0.0 Wesley-Chan
2022-10-03 1:49 ` [PR PATCH] [Updated] " Wesley-Chan
@ 2022-10-03 9:38 ` Wesley-Chan
2022-10-03 11:10 ` classabbyamp
` (9 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Wesley-Chan @ 2022-10-03 9:38 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: goocanvas: update to 3.0.0.
2022-10-03 1:36 [PR PATCH] goocanvas: update to 3.0.0 Wesley-Chan
2022-10-03 1:49 ` [PR PATCH] [Updated] " Wesley-Chan
2022-10-03 9:38 ` Wesley-Chan
@ 2022-10-03 11:10 ` classabbyamp
2022-10-03 13:11 ` [PR PATCH] [Updated] " Wesley-Chan
` (8 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: classabbyamp @ 2022-10-03 11:10 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] goocanvas: update to 3.0.0.
2022-10-03 1:36 [PR PATCH] goocanvas: update to 3.0.0 Wesley-Chan
` (2 preceding siblings ...)
2022-10-03 11:10 ` classabbyamp
@ 2022-10-03 13:11 ` Wesley-Chan
2022-10-03 13:24 ` classabbyamp
` (7 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Wesley-Chan @ 2022-10-03 13:11 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: goocanvas: update to 3.0.0.
2022-10-03 1:36 [PR PATCH] goocanvas: update to 3.0.0 Wesley-Chan
` (3 preceding siblings ...)
2022-10-03 13:11 ` [PR PATCH] [Updated] " Wesley-Chan
@ 2022-10-03 13:24 ` classabbyamp
2022-10-03 13:24 ` classabbyamp
` (6 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: classabbyamp @ 2022-10-03 13:24 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: goocanvas: update to 3.0.0.
2022-10-03 1:36 [PR PATCH] goocanvas: update to 3.0.0 Wesley-Chan
` (4 preceding siblings ...)
2022-10-03 13:24 ` classabbyamp
@ 2022-10-03 13:24 ` classabbyamp
2022-10-03 13:35 ` Wesley-Chan
` (5 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: classabbyamp @ 2022-10-03 13:24 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: goocanvas: update to 3.0.0.
2022-10-03 1:36 [PR PATCH] goocanvas: update to 3.0.0 Wesley-Chan
` (5 preceding siblings ...)
2022-10-03 13:24 ` classabbyamp
@ 2022-10-03 13:35 ` Wesley-Chan
2022-10-03 13:47 ` classabbyamp
` (4 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Wesley-Chan @ 2022-10-03 13:35 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: goocanvas: update to 3.0.0.
2022-10-03 1:36 [PR PATCH] goocanvas: update to 3.0.0 Wesley-Chan
` (6 preceding siblings ...)
2022-10-03 13:35 ` Wesley-Chan
@ 2022-10-03 13:47 ` classabbyamp
2023-01-02 1:57 ` github-actions
` (3 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: classabbyamp @ 2022-10-03 13:47 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: goocanvas: update to 3.0.0.
2022-10-03 1:36 [PR PATCH] goocanvas: update to 3.0.0 Wesley-Chan
` (7 preceding siblings ...)
2022-10-03 13:47 ` classabbyamp
@ 2023-01-02 1:57 ` github-actions
2023-01-02 5:31 ` newbluemoon
` (2 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: github-actions @ 2023-01-02 1:57 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: goocanvas: update to 3.0.0.
2022-10-03 1:36 [PR PATCH] goocanvas: update to 3.0.0 Wesley-Chan
` (8 preceding siblings ...)
2023-01-02 1:57 ` github-actions
@ 2023-01-02 5:31 ` newbluemoon
2023-04-04 1:53 ` github-actions
2023-04-19 1:54 ` [PR PATCH] [Closed]: " github-actions
11 siblings, 0 replies; 14+ messages in thread
From: newbluemoon @ 2023-01-02 5:31 UTC (permalink / raw)
To: ml
[-- 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. ;)
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: goocanvas: update to 3.0.0.
2022-10-03 1:36 [PR PATCH] goocanvas: update to 3.0.0 Wesley-Chan
` (9 preceding siblings ...)
2023-01-02 5:31 ` newbluemoon
@ 2023-04-04 1:53 ` github-actions
2023-04-19 1:54 ` [PR PATCH] [Closed]: " github-actions
11 siblings, 0 replies; 14+ messages in thread
From: github-actions @ 2023-04-04 1:53 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Closed]: goocanvas: update to 3.0.0.
2022-10-03 1:36 [PR PATCH] goocanvas: update to 3.0.0 Wesley-Chan
` (10 preceding siblings ...)
2023-04-04 1:53 ` github-actions
@ 2023-04-19 1:54 ` github-actions
11 siblings, 0 replies; 14+ messages in thread
From: github-actions @ 2023-04-19 1:54 UTC (permalink / raw)
To: ml
[-- 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)
^ permalink raw reply [flat|nested] 14+ messages in thread