* 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; 28+ 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] 28+ 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; 28+ 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] 28+ 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; 28+ 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] 28+ 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; 28+ 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] 28+ 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; 28+ 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] 28+ 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; 28+ 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] 28+ 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; 28+ 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] 28+ 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; 28+ 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] 28+ 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; 28+ 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] 28+ 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; 28+ 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] 28+ 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; 28+ 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] 28+ 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; 28+ 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] 28+ messages in thread
* Re: goocanvas: update to 3.0.0
2021-05-28 4:30 [PR PATCH] " reback00
@ 2021-05-28 4:50 ` reback00
2021-05-28 7:03 ` newbluemoon
` (13 subsequent siblings)
14 siblings, 0 replies; 28+ messages in thread
From: reback00 @ 2021-05-28 4:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 663 bytes --]
New comment by reback00 on void-packages repository
https://github.com/void-linux/void-packages/pull/31159#issuecomment-850128822
Comment:
I got [this](https://github.com/void-linux/void-packages/pull/31159/checks?check_run_id=2691115369) error:
```
goocanvas-devel-3.0.0_1 install i686 /github/home/hostdir/binpkgs 1346304 214048
gpredict-2.2.1_1: broken, unresolvable shlib `libgoocanvas-2.0.so.9'
Transaction aborted due to unresolved shlibs.
Failed to install 'goocanvas' and 'gpredict-2.2.1_1'
Error: Process completed with exit code 1.
```
Seems like gpredict would need a rebuild. Anybody know how to solve this?
cc @newbluemoon @bra1nwave
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: goocanvas: update to 3.0.0
2021-05-28 4:30 [PR PATCH] " reback00
2021-05-28 4:50 ` reback00
@ 2021-05-28 7:03 ` newbluemoon
2021-05-28 10:50 ` reback00
` (12 subsequent siblings)
14 siblings, 0 replies; 28+ messages in thread
From: newbluemoon @ 2021-05-28 7:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 568 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/31159#issuecomment-850197200
Comment:
I didn’t update goocanvas to 3.0.0, because it breaks gpredict and perl-GooCanvas2 --> gscan2pdf.
Building gpredict with goocanvas-3.0.0 errors out with:
`Gpredict requires libgoocanvas-2.0-dev`
and perl-GooCanvas2 fails running tests with
`Typelib file for namespace 'GooCanvas', version '2.0' not fount at ...`
Haven’t looked into fixing those two packages, but without it goocanvas-3.0.0 cannot be merged.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: goocanvas: update to 3.0.0
2021-05-28 4:30 [PR PATCH] " reback00
2021-05-28 4:50 ` reback00
2021-05-28 7:03 ` newbluemoon
@ 2021-05-28 10:50 ` reback00
2021-05-28 10:55 ` reback00
` (11 subsequent siblings)
14 siblings, 0 replies; 28+ messages in thread
From: reback00 @ 2021-05-28 10:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2282 bytes --]
New comment by reback00 on void-packages repository
https://github.com/void-linux/void-packages/pull/31159#issuecomment-850332099
Comment:
I see. I just tried on my machine for updating my package for [akira](https://notabug.org/reback00/void-goodies/src/master/srcpkgs/akira). It worked so thought of committing the changes. Didn't know it has so many things attached to it.
Arch Linux has recently moved to goocanvas 3. I think I got some hints. Arch's `perl-goocanvas2` has had [these changes](https://github.com/archlinux/svntogit-community/commit/18f64b84269d2eab6ad8005b5997fe22e1d691e5#diff-3e341d2d9c67be01819b25b25d5e53ea3cdf3a38d28846cda85a195eb9b7203a) for updating to goocanvas 3. Mainly a sed line is needed. So we can have something like this:
```
pre_configure() {
# For adapting to goocanvas 3.0
sed -i "s/version => '2.0'/version => '3.0'/" lib/GooCanvas2.pm
}
```
[`gpredict`](https://aur.archlinux.org/packages/gpredict) and [`gpredict-git`](https://aur.archlinux.org/packages/gpredict-git/) haven't been updated for years, so we'd have to solve it ourselves. I've looked into `gpredict` source tree for `goocanvas` references and I found the most prominent instance in `configure`:
```
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`"
else
as_fn_error $? "Gpredict requires libgoocanvas-2.0-dev" "$LINENO" 5
fi
...
GOOC_V=`pkg-config --modversion goocanvas-2.0`
```
`configure.ac` also has similar code. I used [this patch](https://gist.github.com/reback00/b3b0cf8d367d114900b0e2b00f1af37b) to update them. However, changing these to `3.0` shows this message:
```
WARNING: 'aclocal-1.15' is missing on your system.
You should only need it if you modified 'acinclude.m4' or
'configure.ac' or m4 files included by 'configure.ac'.
```
To remedy this, something like this has to be added to template:
```
pre_configure() {
# To allow patched configure files by goocanvas 3 patches
# Details: https://github.com/apereo/mod_auth_cas/issues/97
touch *
}
```
I haven't looked into `gscan2pdf` ( cc @Hoshpak ) but I think it should build fine if `perl-goocanvas2` is updated.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: goocanvas: update to 3.0.0
2021-05-28 4:30 [PR PATCH] " reback00
` (2 preceding siblings ...)
2021-05-28 10:50 ` reback00
@ 2021-05-28 10:55 ` reback00
2021-05-28 10:56 ` reback00
` (10 subsequent siblings)
14 siblings, 0 replies; 28+ messages in thread
From: reback00 @ 2021-05-28 10:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 348 bytes --]
New comment by reback00 on void-packages repository
https://github.com/void-linux/void-packages/pull/31159#issuecomment-850334791
Comment:
If the changes are ok, should this PR contain all the changes for updating to goocanvas 3? Or can the changes be in separate PRs for separate packages?
In any case, let me know if I can help in anything.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: goocanvas: update to 3.0.0
2021-05-28 4:30 [PR PATCH] " reback00
` (3 preceding siblings ...)
2021-05-28 10:55 ` reback00
@ 2021-05-28 10:56 ` reback00
2021-05-28 12:17 ` newbluemoon
` (9 subsequent siblings)
14 siblings, 0 replies; 28+ messages in thread
From: reback00 @ 2021-05-28 10:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
New comment by reback00 on void-packages repository
https://github.com/void-linux/void-packages/pull/31159#issuecomment-850334791
Comment:
If the above changes are ok, should this PR contain all the changes for updating to goocanvas 3? Or can the changes be in separate PRs for separate packages?
In any case, let me know if I can help in anything.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: goocanvas: update to 3.0.0
2021-05-28 4:30 [PR PATCH] " reback00
` (4 preceding siblings ...)
2021-05-28 10:56 ` reback00
@ 2021-05-28 12:17 ` newbluemoon
2021-05-28 12:56 ` newbluemoon
` (8 subsequent siblings)
14 siblings, 0 replies; 28+ messages in thread
From: newbluemoon @ 2021-05-28 12:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/31159#issuecomment-850377842
Comment:
I think this PR should contain all the necessary changes, but in a separate commit per affected package.
Just built `perl-GooCanvas2` with your suggested patch; `do_check` succeeds and `gscan2pdf` works without a problem.
Probably better to change `sed` to `vsed` though and while you’re at it, please update the license to the proper SPDX id:
`license="Artistic-1.0-Perl, GPL-1.0-or-later"`
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: goocanvas: update to 3.0.0
2021-05-28 4:30 [PR PATCH] " reback00
` (5 preceding siblings ...)
2021-05-28 12:17 ` newbluemoon
@ 2021-05-28 12:56 ` newbluemoon
2021-05-28 13:03 ` newbluemoon
` (7 subsequent siblings)
14 siblings, 0 replies; 28+ messages in thread
From: newbluemoon @ 2021-05-28 12:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 335 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/31159#issuecomment-850399429
Comment:
Sorry, I was running `gscan2pdf` still with `goocanvas-2.0.4`; it actually complains about not finding the typelib file for GooCanvas version 2.0, so `gscan2pdf` seems to need patching, too.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: goocanvas: update to 3.0.0
2021-05-28 4:30 [PR PATCH] " reback00
` (6 preceding siblings ...)
2021-05-28 12:56 ` newbluemoon
@ 2021-05-28 13:03 ` newbluemoon
2021-05-28 13:13 ` newbluemoon
` (6 subsequent siblings)
14 siblings, 0 replies; 28+ messages in thread
From: newbluemoon @ 2021-05-28 13:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 569 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/31159#issuecomment-850403794
Comment:
As for `gpredict`: the current [`configure.ac`-git-version](https://github.com/csete/gpredict/blob/master/configure.ac#L52) (lines 52 and 109) checks for goocanvas 2 or 3 and both versions seem to be interchangably.
Just tested it – this time really with goocanvas-3.0 ;) – and it works.
However, a simple `sed` sufficies:
```
pre_configure() {
vsed -i "s/goocanvas-2.0/goocanvas-3.0/" configure
}
```
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: goocanvas: update to 3.0.0
2021-05-28 4:30 [PR PATCH] " reback00
` (7 preceding siblings ...)
2021-05-28 13:03 ` newbluemoon
@ 2021-05-28 13:13 ` newbluemoon
2021-05-28 13:25 ` newbluemoon
` (5 subsequent siblings)
14 siblings, 0 replies; 28+ messages in thread
From: newbluemoon @ 2021-05-28 13:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 342 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/31159#issuecomment-850399429
Comment:
<s>Sorry, I was running `gscan2pdf` still with `goocanvas-2.0.4`; it actually complains about not finding the typelib file for GooCanvas version 2.0, so `gscan2pdf` seems to need patching, too.</s>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: goocanvas: update to 3.0.0
2021-05-28 4:30 [PR PATCH] " reback00
` (8 preceding siblings ...)
2021-05-28 13:13 ` newbluemoon
@ 2021-05-28 13:25 ` newbluemoon
2021-05-28 17:31 ` newbluemoon
` (4 subsequent siblings)
14 siblings, 0 replies; 28+ messages in thread
From: newbluemoon @ 2021-05-28 13:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/31159#issuecomment-850417809
Comment:
Sorry again, got a little confused with old and modified packages on my system, but all sorted out now. ;)
`gscan2pdf` does work as mentioned above without problem (I was actually still using the unmodified `perl-GooCanvas2`).
So, to summarize, with the two `sed`s applied to `gpredict` and `perl-GooCanvas2`: `gscan2pdf` and `gpredict` work fine here. :)
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: goocanvas: update to 3.0.0
2021-05-28 4:30 [PR PATCH] " reback00
` (9 preceding siblings ...)
2021-05-28 13:25 ` newbluemoon
@ 2021-05-28 17:31 ` newbluemoon
2021-05-28 17:37 ` reback00
` (3 subsequent siblings)
14 siblings, 0 replies; 28+ messages in thread
From: newbluemoon @ 2021-05-28 17:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/31159#issuecomment-850566485
Comment:
I think `perl-GooCanvas2` and `gpredict` need a revbump, else it lgtm, thanks for updating. :)
About that gpredict check error: the file it complains about, `gtk-sat-tree.c`, is not in the source tarball. So maybe the check should be skipped, because the program runs fine without it locally.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: goocanvas: update to 3.0.0
2021-05-28 4:30 [PR PATCH] " reback00
` (10 preceding siblings ...)
2021-05-28 17:31 ` newbluemoon
@ 2021-05-28 17:37 ` reback00
2021-05-28 17:50 ` newbluemoon
` (2 subsequent siblings)
14 siblings, 0 replies; 28+ messages in thread
From: reback00 @ 2021-05-28 17:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1054 bytes --]
New comment by reback00 on void-packages repository
https://github.com/void-linux/void-packages/pull/31159#issuecomment-850569764
Comment:
@newbluemoon
Thanks. I've tried with the changes you suggested. But build fails with [this message](https://github.com/void-linux/void-packages/pull/31159/checks?check_run_id=2696420943):
```
Making check in po
make[2]: Entering directory '/builddir/gpredict-2.2.1/po'
make[2]: *** No rule to make target '../src/gtk-sat-tree.c', needed by 'gpredict.pot'. Stop.
make[2]: Leaving directory '/builddir/gpredict-2.2.1/po'
make[1]: *** [Makefile:440: check-recursive] Error 1
make[1]: Leaving directory '/builddir/gpredict-2.2.1'
make: *** [Makefile:731: check] Error 2
=> ERROR: gpredict-2.2.1_1: do_check: '${make_cmd} ${make_check_args} ${make_check_target}' exited with 2
=> ERROR: in do_check() at common/build-style/gnu-configure.sh:33
Error: Process completed with exit code 1.
```
Seems to be related to translations. This didn't happen in my machine though. Any idea why this is happening?
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: goocanvas: update to 3.0.0
2021-05-28 4:30 [PR PATCH] " reback00
` (11 preceding siblings ...)
2021-05-28 17:37 ` reback00
@ 2021-05-28 17:50 ` newbluemoon
2021-05-28 17:50 ` reback00
2022-05-20 2:12 ` github-actions
14 siblings, 0 replies; 28+ messages in thread
From: newbluemoon @ 2021-05-28 17:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 538 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/31159#issuecomment-850575918
Comment:
You probably didn’t use the `-Q` option with `xbps-src` and never ran the check locally, but the CI does.
You could add `make_check=no` to gpredict’s template to skip the test.
The file is missing in the tarball, but the package is built fine without it – anyway, it was missing the entire time and no one reported an error as did my limited testing – so I guess it is fine to do so.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: goocanvas: update to 3.0.0
2021-05-28 4:30 [PR PATCH] " reback00
` (12 preceding siblings ...)
2021-05-28 17:50 ` newbluemoon
@ 2021-05-28 17:50 ` reback00
2022-05-20 2:12 ` github-actions
14 siblings, 0 replies; 28+ messages in thread
From: reback00 @ 2021-05-28 17:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 671 bytes --]
New comment by reback00 on void-packages repository
https://github.com/void-linux/void-packages/pull/31159#issuecomment-850576107
Comment:
> About that gpredict check error: the file it complains about, `gtk-sat-tree.c`, is not in the source tarball. So maybe the check should be skipped, because the program runs fine without it locally.
Oh! I didn't see your comment.
So I'm trying with something like this:
```
# 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
```
Also applying revision change...
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: goocanvas: update to 3.0.0
2021-05-28 4:30 [PR PATCH] " reback00
` (13 preceding siblings ...)
2021-05-28 17:50 ` reback00
@ 2022-05-20 2:12 ` github-actions
14 siblings, 0 replies; 28+ messages in thread
From: github-actions @ 2022-05-20 2:12 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/31159#issuecomment-1132374916
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] 28+ messages in thread