* Re: perl-rrdtool: Add missing "perl" dependency
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
@ 2022-12-22 20:52 ` paper42
2022-12-22 20:53 ` paper42
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: paper42 @ 2022-12-22 20:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41245#issuecomment-1363330548
Comment:
This is not a proper solution, $shlib_requires is supposed to add perl to run_depends using the entry in common/shlibs. I don't know why it didn't, but just rebuilding the package helps.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: perl-rrdtool: Add missing "perl" dependency
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
2022-12-22 20:52 ` paper42
@ 2022-12-22 20:53 ` paper42
2022-12-22 21:36 ` [PR PATCH] [Updated] " crtxcr
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: paper42 @ 2022-12-22 20:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 334 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41245#issuecomment-1363330548
Comment:
This is not a proper solution, `$shlib_requires` is supposed to add perl to `run_depends` using the entry in `common/shlibs`. I don't know why it didn't, but just rebuilding the package helps.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] perl-rrdtool: Add missing "perl" dependency
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
2022-12-22 20:52 ` paper42
2022-12-22 20:53 ` paper42
@ 2022-12-22 21:36 ` crtxcr
2022-12-22 21:37 ` crtxcr
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: crtxcr @ 2022-12-22 21:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1121 bytes --]
There is an updated pull request by crtxcr against master on the void-packages repository
https://github.com/crtxcr/void-packages fix_rrdtool_depends
https://github.com/void-linux/void-packages/pull/41245
perl-rrdtool: Add missing "perl" dependency
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
The test for https://github.com/void-linux/void-packages/pull/41228 fails with:
> perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'
This can be reproduced by:
```
./xbps-src -m musl_temp binary-bootstrap x86_64-musl
./xbps-src -m musl_temp chroot
xbps-install perl-rrdtool
```
This is a due to missing "depends" on perl.
This PR simply adds perl to the dependecy
CC @Gottox
A patch file from https://github.com/void-linux/void-packages/pull/41245.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix_rrdtool_depends-41245.patch --]
[-- Type: text/x-diff, Size: 930 bytes --]
From 02eda9a979cc06464560d872e569290351e54925 Mon Sep 17 00:00:00 2001
From: Albert Schwarzkopf <dev-voidlinux@quitesimple.org>
Date: Thu, 22 Dec 2022 22:34:03 +0100
Subject: [PATCH] perl-rddtool: rebuild to fix unresolvable shlib
Rebuild to get rid of error:
"perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'"
For some reason, a previous revbump didn't do it.
---
srcpkgs/rrdtool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index c45176f72a85..d2827f0b2104 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,7 +1,7 @@
# Template file for 'rrdtool'
pkgname=rrdtool
version=1.7.2
-revision=13
+revision=14
build_style=gnu-configure
# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
# until this is fixed upstream, manually define am_cv_python_version to circumvent
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] perl-rrdtool: Add missing "perl" dependency
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
` (2 preceding siblings ...)
2022-12-22 21:36 ` [PR PATCH] [Updated] " crtxcr
@ 2022-12-22 21:37 ` crtxcr
2022-12-22 21:40 ` perl-rddtool: rebuild to fix unresolvable shlib crtxcr
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: crtxcr @ 2022-12-22 21:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1121 bytes --]
There is an updated pull request by crtxcr against master on the void-packages repository
https://github.com/crtxcr/void-packages fix_rrdtool_depends
https://github.com/void-linux/void-packages/pull/41245
perl-rrdtool: Add missing "perl" dependency
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
The test for https://github.com/void-linux/void-packages/pull/41228 fails with:
> perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'
This can be reproduced by:
```
./xbps-src -m musl_temp binary-bootstrap x86_64-musl
./xbps-src -m musl_temp chroot
xbps-install perl-rrdtool
```
This is a due to missing "depends" on perl.
This PR simply adds perl to the dependecy
CC @Gottox
A patch file from https://github.com/void-linux/void-packages/pull/41245.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix_rrdtool_depends-41245.patch --]
[-- Type: text/x-diff, Size: 930 bytes --]
From e79d1e9a80728563725191552f0bc7d842179897 Mon Sep 17 00:00:00 2001
From: Albert Schwarzkopf <dev-voidlinux@quitesimple.org>
Date: Thu, 22 Dec 2022 22:34:03 +0100
Subject: [PATCH] perl-rrdtool: rebuild to fix unresolvable shlib
Rebuild to get rid of error:
"perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'"
For some reason, a previous revbump didn't do it.
---
srcpkgs/rrdtool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index c45176f72a85..d2827f0b2104 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,7 +1,7 @@
# Template file for 'rrdtool'
pkgname=rrdtool
version=1.7.2
-revision=13
+revision=14
build_style=gnu-configure
# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
# until this is fixed upstream, manually define am_cv_python_version to circumvent
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: perl-rddtool: rebuild to fix unresolvable shlib
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
` (3 preceding siblings ...)
2022-12-22 21:37 ` crtxcr
@ 2022-12-22 21:40 ` crtxcr
2022-12-22 23:40 ` [PR PATCH] [Updated] " crtxcr
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: crtxcr @ 2022-12-22 21:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
New comment by crtxcr on void-packages repository
https://github.com/void-linux/void-packages/pull/41245#issuecomment-1363375726
Comment:
I have simply changed this PR to be a revbump then
Although the rddtool tests fail, they also failed before according to: https://github.com/void-linux/void-packages/pull/39463
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] perl-rddtool: rebuild to fix unresolvable shlib
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
` (4 preceding siblings ...)
2022-12-22 21:40 ` perl-rddtool: rebuild to fix unresolvable shlib crtxcr
@ 2022-12-22 23:40 ` crtxcr
2022-12-22 23:41 ` crtxcr
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: crtxcr @ 2022-12-22 23:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1125 bytes --]
There is an updated pull request by crtxcr against master on the void-packages repository
https://github.com/crtxcr/void-packages fix_rrdtool_depends
https://github.com/void-linux/void-packages/pull/41245
perl-rddtool: rebuild to fix unresolvable shlib
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
The test for https://github.com/void-linux/void-packages/pull/41228 fails with:
> perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'
This can be reproduced by:
```
./xbps-src -m musl_temp binary-bootstrap x86_64-musl
./xbps-src -m musl_temp chroot
xbps-install perl-rrdtool
```
This is a due to missing "depends" on perl.
This PR simply adds perl to the dependecy
CC @Gottox
A patch file from https://github.com/void-linux/void-packages/pull/41245.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix_rrdtool_depends-41245.patch --]
[-- Type: text/x-diff, Size: 3333 bytes --]
From 00493ba7ca216c6bb902d3806fefcd7717964c15 Mon Sep 17 00:00:00 2001
From: Albert Schwarzkopf <dev-voidlinux@quitesimple.org>
Date: Thu, 22 Dec 2022 22:34:03 +0100
Subject: [PATCH] rrdtool: rebuild to fix unresolvable shlib, fix tests
Rebuild to get rid of error:
"perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'"
For some reason, a previous revbump didn't do it.
Add "bc" to makehostdepends so a test doesn't fail.
Add upstream patch so test does not fail on musl
---
.../set_fallback_first_weekday_to_0.patch | 39 +++++++++++++++++++
srcpkgs/rrdtool/template | 4 +-
2 files changed, 41 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
diff --git a/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch b/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
new file mode 100644
index 000000000000..dcd4ab322635
--- /dev/null
+++ b/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
@@ -0,0 +1,39 @@
+From 784a3913e64bd10ec544945f2c05c354677a726a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jean-Michel=20Vourg=C3=A8re?= <nirgal@debian.org>
+Date: Sun, 16 Jun 2019 08:07:32 +0200
+Subject: [PATCH] Set fallback first_weekday to 0 (fix #1012)
+
+- Set first_weekday to 0 (Sunday), when HAVE__NL_TIME_WEEK_1STDAY
+ is not defined
+- Fixes: https://github.com/oetiker/rrdtool-1.x/issues/1012
+---
+ src/rrd_graph.c | 2 +-
+ src/rrd_rpncalc.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rrd_graph.c b/src/rrd_graph.c
+index f5d2cdec5..62c3e645f 100644
+--- a/src/rrd_graph.c
++++ b/src/rrd_graph.c
+@@ -1568,7 +1568,7 @@ static int find_first_weekday(
+ }
+ first_weekday = (week_1stday + first_weekday - 1) % 7;
+ #else
+- first_weekday = 1;
++ first_weekday = 0;
+ #endif
+ }
+ return first_weekday;
+diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
+index 0f54c6be6..84f692119 100644
+--- a/src/rrd_rpncalc.c
++++ b/src/rrd_rpncalc.c
+@@ -564,7 +564,7 @@ static int find_first_weekday(void){
+ }
+ first_weekday=(week_1stday + first_weekday - 1) % 7;
+ #else
+- first_weekday = 1;
++ first_weekday = 0;
+ #endif
+ }
+ return first_weekday;
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index c45176f72a85..9d39d9bca42d 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,7 +1,7 @@
# Template file for 'rrdtool'
pkgname=rrdtool
version=1.7.2
-revision=13
+revision=14
build_style=gnu-configure
# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
# until this is fixed upstream, manually define am_cv_python_version to circumvent
@@ -10,7 +10,7 @@ configure_args="--enable-perl --enable-perl-site-install
--enable-ruby-site-install --enable-python --enable-lua
--enable-lua-site-install --enable-tcl --disable-libwrap
am_cv_python_version=${py3_ver}"
-hostmakedepends="pkg-config groff intltool python3-setuptools perl-XML-Parser"
+hostmakedepends="pkg-config groff intltool python3-setuptools perl-XML-Parser bc"
makedepends="libxml2-devel pango-devel python3-devel ruby-devel LuaJIT-devel perl"
depends="dejavu-fonts-ttf"
short_desc="Data logging and graphing system for time series data"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] perl-rddtool: rebuild to fix unresolvable shlib
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
` (5 preceding siblings ...)
2022-12-22 23:40 ` [PR PATCH] [Updated] " crtxcr
@ 2022-12-22 23:41 ` crtxcr
2022-12-22 23:48 ` crtxcr
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: crtxcr @ 2022-12-22 23:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1125 bytes --]
There is an updated pull request by crtxcr against master on the void-packages repository
https://github.com/crtxcr/void-packages fix_rrdtool_depends
https://github.com/void-linux/void-packages/pull/41245
perl-rddtool: rebuild to fix unresolvable shlib
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
The test for https://github.com/void-linux/void-packages/pull/41228 fails with:
> perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'
This can be reproduced by:
```
./xbps-src -m musl_temp binary-bootstrap x86_64-musl
./xbps-src -m musl_temp chroot
xbps-install perl-rrdtool
```
This is a due to missing "depends" on perl.
This PR simply adds perl to the dependecy
CC @Gottox
A patch file from https://github.com/void-linux/void-packages/pull/41245.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix_rrdtool_depends-41245.patch --]
[-- Type: text/x-diff, Size: 3333 bytes --]
From c9423ae02ba3535c504990c149295cfef62cc3ab Mon Sep 17 00:00:00 2001
From: Albert Schwarzkopf <dev-voidlinux@quitesimple.org>
Date: Thu, 22 Dec 2022 22:34:03 +0100
Subject: [PATCH] rrdtool: rebuild to fix unresolvable shlib, fix tests
Rebuild to get rid of error:
"perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'"
For some reason, a previous revbump didn't do it.
Add "bc" to hostmakedepends so a test doesn't fail.
Add upstream patch so test does not fail on musl
---
.../set_fallback_first_weekday_to_0.patch | 39 +++++++++++++++++++
srcpkgs/rrdtool/template | 4 +-
2 files changed, 41 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
diff --git a/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch b/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
new file mode 100644
index 000000000000..dcd4ab322635
--- /dev/null
+++ b/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
@@ -0,0 +1,39 @@
+From 784a3913e64bd10ec544945f2c05c354677a726a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jean-Michel=20Vourg=C3=A8re?= <nirgal@debian.org>
+Date: Sun, 16 Jun 2019 08:07:32 +0200
+Subject: [PATCH] Set fallback first_weekday to 0 (fix #1012)
+
+- Set first_weekday to 0 (Sunday), when HAVE__NL_TIME_WEEK_1STDAY
+ is not defined
+- Fixes: https://github.com/oetiker/rrdtool-1.x/issues/1012
+---
+ src/rrd_graph.c | 2 +-
+ src/rrd_rpncalc.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rrd_graph.c b/src/rrd_graph.c
+index f5d2cdec5..62c3e645f 100644
+--- a/src/rrd_graph.c
++++ b/src/rrd_graph.c
+@@ -1568,7 +1568,7 @@ static int find_first_weekday(
+ }
+ first_weekday = (week_1stday + first_weekday - 1) % 7;
+ #else
+- first_weekday = 1;
++ first_weekday = 0;
+ #endif
+ }
+ return first_weekday;
+diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
+index 0f54c6be6..84f692119 100644
+--- a/src/rrd_rpncalc.c
++++ b/src/rrd_rpncalc.c
+@@ -564,7 +564,7 @@ static int find_first_weekday(void){
+ }
+ first_weekday=(week_1stday + first_weekday - 1) % 7;
+ #else
+- first_weekday = 1;
++ first_weekday = 0;
+ #endif
+ }
+ return first_weekday;
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index c45176f72a85..9d39d9bca42d 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,7 +1,7 @@
# Template file for 'rrdtool'
pkgname=rrdtool
version=1.7.2
-revision=13
+revision=14
build_style=gnu-configure
# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
# until this is fixed upstream, manually define am_cv_python_version to circumvent
@@ -10,7 +10,7 @@ configure_args="--enable-perl --enable-perl-site-install
--enable-ruby-site-install --enable-python --enable-lua
--enable-lua-site-install --enable-tcl --disable-libwrap
am_cv_python_version=${py3_ver}"
-hostmakedepends="pkg-config groff intltool python3-setuptools perl-XML-Parser"
+hostmakedepends="pkg-config groff intltool python3-setuptools perl-XML-Parser bc"
makedepends="libxml2-devel pango-devel python3-devel ruby-devel LuaJIT-devel perl"
depends="dejavu-fonts-ttf"
short_desc="Data logging and graphing system for time series data"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: perl-rddtool: rebuild to fix unresolvable shlib
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
` (6 preceding siblings ...)
2022-12-22 23:41 ` crtxcr
@ 2022-12-22 23:48 ` crtxcr
2022-12-22 23:48 ` crtxcr
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: crtxcr @ 2022-12-22 23:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 278 bytes --]
New comment by crtxcr on void-packages repository
https://github.com/void-linux/void-packages/pull/41245#issuecomment-1363443966
Comment:
I've found an upstream patch to solve the failing error on musl and added "bc" so the "dc" command required by a test becomes available.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: perl-rddtool: rebuild to fix unresolvable shlib
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
` (7 preceding siblings ...)
2022-12-22 23:48 ` crtxcr
@ 2022-12-22 23:48 ` crtxcr
2022-12-23 0:35 ` rrdtool: rebuild to fix unresolvable shlib, fix tests paper42
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: crtxcr @ 2022-12-22 23:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
New comment by crtxcr on void-packages repository
https://github.com/void-linux/void-packages/pull/41245#issuecomment-1363443966
Comment:
I've found an upstream patch to solve the failing error on musl and added "bc" so the "dc" command required by a test becomes available.
Forced-pushed these changes
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: rrdtool: rebuild to fix unresolvable shlib, fix tests
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
` (8 preceding siblings ...)
2022-12-22 23:48 ` crtxcr
@ 2022-12-23 0:35 ` paper42
2022-12-23 7:34 ` sgn
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: paper42 @ 2022-12-23 0:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41245#issuecomment-1363470983
Comment:
awesome, but please put it to checkdepends if it's only needed for tests
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: rrdtool: rebuild to fix unresolvable shlib, fix tests
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
` (9 preceding siblings ...)
2022-12-23 0:35 ` rrdtool: rebuild to fix unresolvable shlib, fix tests paper42
@ 2022-12-23 7:34 ` sgn
2022-12-23 7:52 ` [PR PATCH] [Updated] " crtxcr
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: sgn @ 2022-12-23 7:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 423 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/41245#issuecomment-1363695795
Comment:
> This is not a proper solution, `$shlib_requires` is supposed to add perl to `run_depends` using the entry in `common/shlibs`. I don't know why it didn't, but just rebuilding the package helps.
rebuild package works because of https://github.com/void-linux/void-packages/pull/40412
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] rrdtool: rebuild to fix unresolvable shlib, fix tests
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
` (10 preceding siblings ...)
2022-12-23 7:34 ` sgn
@ 2022-12-23 7:52 ` crtxcr
2022-12-23 7:54 ` crtxcr
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: crtxcr @ 2022-12-23 7:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1132 bytes --]
There is an updated pull request by crtxcr against master on the void-packages repository
https://github.com/crtxcr/void-packages fix_rrdtool_depends
https://github.com/void-linux/void-packages/pull/41245
rrdtool: rebuild to fix unresolvable shlib, fix tests
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
The test for https://github.com/void-linux/void-packages/pull/41228 fails with:
> perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'
This can be reproduced by:
```
./xbps-src -m musl_temp binary-bootstrap x86_64-musl
./xbps-src -m musl_temp chroot
xbps-install perl-rrdtool
```
This is a due to missing "depends" on perl.
This PR simply adds perl to the dependecy
CC @Gottox
A patch file from https://github.com/void-linux/void-packages/pull/41245.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix_rrdtool_depends-41245.patch --]
[-- Type: text/x-diff, Size: 3213 bytes --]
From 8cc5ed81ede98fe8fa02d0c86fafa99206473e73 Mon Sep 17 00:00:00 2001
From: Albert Schwarzkopf <dev-voidlinux@quitesimple.org>
Date: Thu, 22 Dec 2022 22:34:03 +0100
Subject: [PATCH] rrdtool: rebuild to fix unresolvable shlib, fix tests
Rebuild to get rid of error:
"perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'"
A previous revbump didn't do it because #40412 wasn't merged yet.
Add "bc" to checkdepends so a test doesn't fail.
Add upstream patch so test does not fail on musl
---
.../set_fallback_first_weekday_to_0.patch | 39 +++++++++++++++++++
srcpkgs/rrdtool/template | 3 +-
2 files changed, 41 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
diff --git a/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch b/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
new file mode 100644
index 000000000000..dcd4ab322635
--- /dev/null
+++ b/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
@@ -0,0 +1,39 @@
+From 784a3913e64bd10ec544945f2c05c354677a726a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jean-Michel=20Vourg=C3=A8re?= <nirgal@debian.org>
+Date: Sun, 16 Jun 2019 08:07:32 +0200
+Subject: [PATCH] Set fallback first_weekday to 0 (fix #1012)
+
+- Set first_weekday to 0 (Sunday), when HAVE__NL_TIME_WEEK_1STDAY
+ is not defined
+- Fixes: https://github.com/oetiker/rrdtool-1.x/issues/1012
+---
+ src/rrd_graph.c | 2 +-
+ src/rrd_rpncalc.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rrd_graph.c b/src/rrd_graph.c
+index f5d2cdec5..62c3e645f 100644
+--- a/src/rrd_graph.c
++++ b/src/rrd_graph.c
+@@ -1568,7 +1568,7 @@ static int find_first_weekday(
+ }
+ first_weekday = (week_1stday + first_weekday - 1) % 7;
+ #else
+- first_weekday = 1;
++ first_weekday = 0;
+ #endif
+ }
+ return first_weekday;
+diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
+index 0f54c6be6..84f692119 100644
+--- a/src/rrd_rpncalc.c
++++ b/src/rrd_rpncalc.c
+@@ -564,7 +564,7 @@ static int find_first_weekday(void){
+ }
+ first_weekday=(week_1stday + first_weekday - 1) % 7;
+ #else
+- first_weekday = 1;
++ first_weekday = 0;
+ #endif
+ }
+ return first_weekday;
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index c45176f72a85..f8b3b51b7d33 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,7 +1,7 @@
# Template file for 'rrdtool'
pkgname=rrdtool
version=1.7.2
-revision=13
+revision=14
build_style=gnu-configure
# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
# until this is fixed upstream, manually define am_cv_python_version to circumvent
@@ -12,6 +12,7 @@ configure_args="--enable-perl --enable-perl-site-install
am_cv_python_version=${py3_ver}"
hostmakedepends="pkg-config groff intltool python3-setuptools perl-XML-Parser"
makedepends="libxml2-devel pango-devel python3-devel ruby-devel LuaJIT-devel perl"
+checkdepends="bc"
depends="dejavu-fonts-ttf"
short_desc="Data logging and graphing system for time series data"
maintainer="Enno Boland <gottox@voidlinux.org>"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] rrdtool: rebuild to fix unresolvable shlib, fix tests
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
` (11 preceding siblings ...)
2022-12-23 7:52 ` [PR PATCH] [Updated] " crtxcr
@ 2022-12-23 7:54 ` crtxcr
2022-12-23 8:01 ` crtxcr
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: crtxcr @ 2022-12-23 7:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1132 bytes --]
There is an updated pull request by crtxcr against master on the void-packages repository
https://github.com/crtxcr/void-packages fix_rrdtool_depends
https://github.com/void-linux/void-packages/pull/41245
rrdtool: rebuild to fix unresolvable shlib, fix tests
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
The test for https://github.com/void-linux/void-packages/pull/41228 fails with:
> perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'
This can be reproduced by:
```
./xbps-src -m musl_temp binary-bootstrap x86_64-musl
./xbps-src -m musl_temp chroot
xbps-install perl-rrdtool
```
This is a due to missing "depends" on perl.
This PR simply adds perl to the dependecy
CC @Gottox
A patch file from https://github.com/void-linux/void-packages/pull/41245.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix_rrdtool_depends-41245.patch --]
[-- Type: text/x-diff, Size: 3206 bytes --]
From abf2d65faa33c1a89d6410068026d7fdbef0f18d Mon Sep 17 00:00:00 2001
From: Albert Schwarzkopf <dev-voidlinux@quitesimple.org>
Date: Thu, 22 Dec 2022 22:34:03 +0100
Subject: [PATCH] rrdtool: rebuild to fix unresolvable shlib, fix tests
Rebuild to get rid of error:
"perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'"
A previous revbump didn't do it because #40412 wasn't merged yet.
Add "bc" to checkdepends so a test doesn't fail.
Add upstream patch so test does not fail on musl
---
.../set_fallback_first_weekday_to_0.patch | 39 +++++++++++++++++++
srcpkgs/rrdtool/template | 3 +-
2 files changed, 41 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
diff --git a/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch b/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
new file mode 100644
index 000000000000..dcd4ab322635
--- /dev/null
+++ b/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
@@ -0,0 +1,39 @@
+From 784a3913e64bd10ec544945f2c05c354677a726a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jean-Michel=20Vourg=C3=A8re?= <nirgal@debian.org>
+Date: Sun, 16 Jun 2019 08:07:32 +0200
+Subject: [PATCH] Set fallback first_weekday to 0 (fix #1012)
+
+- Set first_weekday to 0 (Sunday), when HAVE__NL_TIME_WEEK_1STDAY
+ is not defined
+- Fixes: https://github.com/oetiker/rrdtool-1.x/issues/1012
+---
+ src/rrd_graph.c | 2 +-
+ src/rrd_rpncalc.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rrd_graph.c b/src/rrd_graph.c
+index f5d2cdec5..62c3e645f 100644
+--- a/src/rrd_graph.c
++++ b/src/rrd_graph.c
+@@ -1568,7 +1568,7 @@ static int find_first_weekday(
+ }
+ first_weekday = (week_1stday + first_weekday - 1) % 7;
+ #else
+- first_weekday = 1;
++ first_weekday = 0;
+ #endif
+ }
+ return first_weekday;
+diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
+index 0f54c6be6..84f692119 100644
+--- a/src/rrd_rpncalc.c
++++ b/src/rrd_rpncalc.c
+@@ -564,7 +564,7 @@ static int find_first_weekday(void){
+ }
+ first_weekday=(week_1stday + first_weekday - 1) % 7;
+ #else
+- first_weekday = 1;
++ first_weekday = 0;
+ #endif
+ }
+ return first_weekday;
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index c45176f72a85..d6558b2c92af 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,7 +1,7 @@
# Template file for 'rrdtool'
pkgname=rrdtool
version=1.7.2
-revision=13
+revision=14
build_style=gnu-configure
# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
# until this is fixed upstream, manually define am_cv_python_version to circumvent
@@ -13,6 +13,7 @@ configure_args="--enable-perl --enable-perl-site-install
hostmakedepends="pkg-config groff intltool python3-setuptools perl-XML-Parser"
makedepends="libxml2-devel pango-devel python3-devel ruby-devel LuaJIT-devel perl"
depends="dejavu-fonts-ttf"
+checkdepends="bc"
short_desc="Data logging and graphing system for time series data"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: rrdtool: rebuild to fix unresolvable shlib, fix tests
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
` (12 preceding siblings ...)
2022-12-23 7:54 ` crtxcr
@ 2022-12-23 8:01 ` crtxcr
2022-12-23 10:59 ` [PR PATCH] [Updated] " crtxcr
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: crtxcr @ 2022-12-23 8:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New comment by crtxcr on void-packages repository
https://github.com/void-linux/void-packages/pull/41245#issuecomment-1363711919
Comment:
>awesome, but please put it to checkdepends if it's only needed for tests
I forgot about it, thx. done!
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] rrdtool: rebuild to fix unresolvable shlib, fix tests
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
` (13 preceding siblings ...)
2022-12-23 8:01 ` crtxcr
@ 2022-12-23 10:59 ` crtxcr
2022-12-23 11:00 ` crtxcr
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: crtxcr @ 2022-12-23 10:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1132 bytes --]
There is an updated pull request by crtxcr against master on the void-packages repository
https://github.com/crtxcr/void-packages fix_rrdtool_depends
https://github.com/void-linux/void-packages/pull/41245
rrdtool: rebuild to fix unresolvable shlib, fix tests
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
The test for https://github.com/void-linux/void-packages/pull/41228 fails with:
> perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'
This can be reproduced by:
```
./xbps-src -m musl_temp binary-bootstrap x86_64-musl
./xbps-src -m musl_temp chroot
xbps-install perl-rrdtool
```
This is a due to missing "depends" on perl.
This PR simply adds perl to the dependecy
CC @Gottox
A patch file from https://github.com/void-linux/void-packages/pull/41245.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix_rrdtool_depends-41245.patch --]
[-- Type: text/x-diff, Size: 3479 bytes --]
From 8e4193a4b018a3f71f423b8782d01a4598cffe41 Mon Sep 17 00:00:00 2001
From: Albert Schwarzkopf <dev-voidlinux@quitesimple.org>
Date: Thu, 22 Dec 2022 22:34:03 +0100
Subject: [PATCH] rrdtool: rebuild to fix unresolvable shlib, fix tests
Rebuild to get rid of error:
"perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'"
A previous revbump didn't do it because #40412 wasn't merged yet.
Add "bc" to checkdepends so a test doesn't fail.
Add upstream patch so test does not fail on musl
Add python3 dependency for python3-rrdtool
---
.../set_fallback_first_weekday_to_0.patch | 39 +++++++++++++++++++
srcpkgs/rrdtool/template | 4 +-
2 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
diff --git a/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch b/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
new file mode 100644
index 000000000000..dcd4ab322635
--- /dev/null
+++ b/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
@@ -0,0 +1,39 @@
+From 784a3913e64bd10ec544945f2c05c354677a726a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jean-Michel=20Vourg=C3=A8re?= <nirgal@debian.org>
+Date: Sun, 16 Jun 2019 08:07:32 +0200
+Subject: [PATCH] Set fallback first_weekday to 0 (fix #1012)
+
+- Set first_weekday to 0 (Sunday), when HAVE__NL_TIME_WEEK_1STDAY
+ is not defined
+- Fixes: https://github.com/oetiker/rrdtool-1.x/issues/1012
+---
+ src/rrd_graph.c | 2 +-
+ src/rrd_rpncalc.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rrd_graph.c b/src/rrd_graph.c
+index f5d2cdec5..62c3e645f 100644
+--- a/src/rrd_graph.c
++++ b/src/rrd_graph.c
+@@ -1568,7 +1568,7 @@ static int find_first_weekday(
+ }
+ first_weekday = (week_1stday + first_weekday - 1) % 7;
+ #else
+- first_weekday = 1;
++ first_weekday = 0;
+ #endif
+ }
+ return first_weekday;
+diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
+index 0f54c6be6..84f692119 100644
+--- a/src/rrd_rpncalc.c
++++ b/src/rrd_rpncalc.c
+@@ -564,7 +564,7 @@ static int find_first_weekday(void){
+ }
+ first_weekday=(week_1stday + first_weekday - 1) % 7;
+ #else
+- first_weekday = 1;
++ first_weekday = 0;
+ #endif
+ }
+ return first_weekday;
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index c45176f72a85..95b3c69e4e38 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,7 +1,7 @@
# Template file for 'rrdtool'
pkgname=rrdtool
version=1.7.2
-revision=13
+revision=14
build_style=gnu-configure
# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
# until this is fixed upstream, manually define am_cv_python_version to circumvent
@@ -13,6 +13,7 @@ configure_args="--enable-perl --enable-perl-site-install
hostmakedepends="pkg-config groff intltool python3-setuptools perl-XML-Parser"
makedepends="libxml2-devel pango-devel python3-devel ruby-devel LuaJIT-devel perl"
depends="dejavu-fonts-ttf"
+checkdepends="bc"
short_desc="Data logging and graphing system for time series data"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
@@ -30,6 +31,7 @@ python-rrdtool_package() {
python3-rrdtool_package() {
short_desc+=" - Python 3 bindings"
+ depends=python3
replaces="python-rrdtool>=0"
provides="python-rrdtool-${version}_$revision"
pkg_install() {
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] rrdtool: rebuild to fix unresolvable shlib, fix tests
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
` (14 preceding siblings ...)
2022-12-23 10:59 ` [PR PATCH] [Updated] " crtxcr
@ 2022-12-23 11:00 ` crtxcr
2022-12-23 11:06 ` crtxcr
2022-12-23 11:16 ` [PR PATCH] [Merged]: " paper42
17 siblings, 0 replies; 19+ messages in thread
From: crtxcr @ 2022-12-23 11:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1132 bytes --]
There is an updated pull request by crtxcr against master on the void-packages repository
https://github.com/crtxcr/void-packages fix_rrdtool_depends
https://github.com/void-linux/void-packages/pull/41245
rrdtool: rebuild to fix unresolvable shlib, fix tests
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
The test for https://github.com/void-linux/void-packages/pull/41228 fails with:
> perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'
This can be reproduced by:
```
./xbps-src -m musl_temp binary-bootstrap x86_64-musl
./xbps-src -m musl_temp chroot
xbps-install perl-rrdtool
```
This is a due to missing "depends" on perl.
This PR simply adds perl to the dependecy
CC @Gottox
A patch file from https://github.com/void-linux/void-packages/pull/41245.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix_rrdtool_depends-41245.patch --]
[-- Type: text/x-diff, Size: 3481 bytes --]
From f5d17a9ad37463736666ea4e4bc43fb630b15c5c Mon Sep 17 00:00:00 2001
From: Albert Schwarzkopf <dev-voidlinux@quitesimple.org>
Date: Thu, 22 Dec 2022 22:34:03 +0100
Subject: [PATCH] rrdtool: rebuild to fix unresolvable shlib, fix tests
Rebuild to get rid of error:
"perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'"
A previous revbump didn't do it because #40412 wasn't merged yet.
Add "bc" to checkdepends so a test doesn't fail.
Add upstream patch so test does not fail on musl
Add python3 dependency for python3-rrdtool
---
.../set_fallback_first_weekday_to_0.patch | 39 +++++++++++++++++++
srcpkgs/rrdtool/template | 4 +-
2 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
diff --git a/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch b/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
new file mode 100644
index 000000000000..dcd4ab322635
--- /dev/null
+++ b/srcpkgs/rrdtool/patches/set_fallback_first_weekday_to_0.patch
@@ -0,0 +1,39 @@
+From 784a3913e64bd10ec544945f2c05c354677a726a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jean-Michel=20Vourg=C3=A8re?= <nirgal@debian.org>
+Date: Sun, 16 Jun 2019 08:07:32 +0200
+Subject: [PATCH] Set fallback first_weekday to 0 (fix #1012)
+
+- Set first_weekday to 0 (Sunday), when HAVE__NL_TIME_WEEK_1STDAY
+ is not defined
+- Fixes: https://github.com/oetiker/rrdtool-1.x/issues/1012
+---
+ src/rrd_graph.c | 2 +-
+ src/rrd_rpncalc.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rrd_graph.c b/src/rrd_graph.c
+index f5d2cdec5..62c3e645f 100644
+--- a/src/rrd_graph.c
++++ b/src/rrd_graph.c
+@@ -1568,7 +1568,7 @@ static int find_first_weekday(
+ }
+ first_weekday = (week_1stday + first_weekday - 1) % 7;
+ #else
+- first_weekday = 1;
++ first_weekday = 0;
+ #endif
+ }
+ return first_weekday;
+diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
+index 0f54c6be6..84f692119 100644
+--- a/src/rrd_rpncalc.c
++++ b/src/rrd_rpncalc.c
+@@ -564,7 +564,7 @@ static int find_first_weekday(void){
+ }
+ first_weekday=(week_1stday + first_weekday - 1) % 7;
+ #else
+- first_weekday = 1;
++ first_weekday = 0;
+ #endif
+ }
+ return first_weekday;
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index c45176f72a85..50b6aee29f6d 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,7 +1,7 @@
# Template file for 'rrdtool'
pkgname=rrdtool
version=1.7.2
-revision=13
+revision=14
build_style=gnu-configure
# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
# until this is fixed upstream, manually define am_cv_python_version to circumvent
@@ -13,6 +13,7 @@ configure_args="--enable-perl --enable-perl-site-install
hostmakedepends="pkg-config groff intltool python3-setuptools perl-XML-Parser"
makedepends="libxml2-devel pango-devel python3-devel ruby-devel LuaJIT-devel perl"
depends="dejavu-fonts-ttf"
+checkdepends="bc"
short_desc="Data logging and graphing system for time series data"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
@@ -30,6 +31,7 @@ python-rrdtool_package() {
python3-rrdtool_package() {
short_desc+=" - Python 3 bindings"
+ depends="python3"
replaces="python-rrdtool>=0"
provides="python-rrdtool-${version}_$revision"
pkg_install() {
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: rrdtool: rebuild to fix unresolvable shlib, fix tests
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
` (15 preceding siblings ...)
2022-12-23 11:00 ` crtxcr
@ 2022-12-23 11:06 ` crtxcr
2022-12-23 11:16 ` [PR PATCH] [Merged]: " paper42
17 siblings, 0 replies; 19+ messages in thread
From: crtxcr @ 2022-12-23 11:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 238 bytes --]
New comment by crtxcr on void-packages repository
https://github.com/void-linux/void-packages/pull/41245#issuecomment-1363855988
Comment:
> I just noticed python3-rrdtool is missing a dependency on python3, could you add that?
Done
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Merged]: rrdtool: rebuild to fix unresolvable shlib, fix tests
2022-12-22 20:24 [PR PATCH] perl-rrdtool: Add missing "perl" dependency crtxcr
` (16 preceding siblings ...)
2022-12-23 11:06 ` crtxcr
@ 2022-12-23 11:16 ` paper42
17 siblings, 0 replies; 19+ messages in thread
From: paper42 @ 2022-12-23 11:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 966 bytes --]
There's a merged pull request on the void-packages repository
rrdtool: rebuild to fix unresolvable shlib, fix tests
https://github.com/void-linux/void-packages/pull/41245
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
The test for https://github.com/void-linux/void-packages/pull/41228 fails with:
> perl-rrdtool-1.7.2_13: broken, unresolvable shlib `libperl.so.5.36'
This can be reproduced by:
```
./xbps-src -m musl_temp binary-bootstrap x86_64-musl
./xbps-src -m musl_temp chroot
xbps-install perl-rrdtool
```
This is a due to missing "depends" on perl.
This PR simply adds perl to the dependecy
CC @Gottox
^ permalink raw reply [flat|nested] 19+ messages in thread