[Bps-public-commit] gdgraph branch master updated. b29423a8f3d0fbcc94267cd202810473afe26d72
BPS Git Server
git at git.bestpractical.com
Wed Jan 11 21:47:20 UTC 2023
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gdgraph".
The branch, master has been updated
via b29423a8f3d0fbcc94267cd202810473afe26d72 (commit)
via e0616806b48af1a6b0c66cf1932a0c33509d67d6 (commit)
via 5889cbc579bdac8056e20f6a006cb3c7958f445f (commit)
via c4dad114442265d1a596bdaf7ebd693b7348e190 (commit)
from c908e209c8b1b589484348825e96891bd8919f55 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b29423a8f3d0fbcc94267cd202810473afe26d72
Author: Jim Brandt <jbrandt at bestpractical.com>
Date: Wed Jan 11 16:46:57 2023 -0500
Prep version 1.55
diff --git a/CHANGES b/CHANGES
index 5412250..7b19a1f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+1.55 11 Jan 2023
+
+- Fix failing XBM test resulting from some upstream changes
+- Skip samples tests if libgd has image support disabled, which
+ is the default starting with version 2.3.3. See:
+ https://github.com/libgd/libgd/issues/428
+
1.54 21 Nov 2016
- Disable two Y axes alignment when any y[12]_{min,max}_value is defined
diff --git a/Graph.pm b/Graph.pm
index 9df4e28..652a417 100644
--- a/Graph.pm
+++ b/Graph.pm
@@ -32,7 +32,7 @@
package GD::Graph;
($GD::Graph::prog_version) = '$Revision: 1.55 $' =~ /\s([\d.]+)/;
-$GD::Graph::VERSION = '1.54';
+$GD::Graph::VERSION = '1.55';
use strict;
use GD;
@@ -608,6 +608,18 @@ Create a pie chart.
=head1 DISTRIBUTION STATUS
+=head2 2023 Update
+
+This new release fixes some tests that started to fail based on
+some changes in dependencies. We help this gets all tests passing
+again so users can install cleanly again.
+
+The new active repo is here: L<https://github.com/bestpractical/gdgraph>.
+
+You can continue to use L<https://rt.cpan.org> for bug reports.
+
+=head2 Status from 2013
+
Distribution has no releases since 2007. It has new maintainer starting
of 1.45 and my plan is to keep modules backwards compatible as much as
possible, fix bugs with test cases, apply patches and release new versions
@@ -1784,9 +1796,9 @@ for all concerned.
=head1 AUTHOR
Martien Verbruggen E<lt>mgjv at tradingpost.com.auE<gt>
-
-Current maintenance (including this release) by
Benjamin Warfield E<lt>bwarfield at cpan.orgE<gt>
+Ruslan Zakirov
+Best Practical Solutions E<lt>modules at bestpractical.comE<gt>
=head2 Copyright
diff --git a/Makefile.PL b/Makefile.PL
index a195ee9..f04e5ac 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,6 +23,7 @@ WriteMakefile(
'Martien Verbruggen <mgjv at tradingpost.com.au>',
'Benjamin Warfield <bwarfield at cpan.org>',
'Ruslan Zakirov <Ruslan.Zakirov at gmail.com>',
+ 'Best Practical Solutions <modules at bestpractical.com>',
]
):()
),
@@ -65,8 +66,8 @@ WriteMakefile(
},
repository => {
type => 'git',
- url => 'git://github.com/ruz/GDGraph.git',
- web => 'https://github.com/ruz/GDGraph',
+ url => 'git://github.com/bestpractical/gdgraph.git',
+ web => 'https://github.com/bestpractical/gdgraph',
},
},
@@ -105,8 +106,14 @@ before installing it. You can run the examples in the samples
directory with `make samples` or by going into that directory, and
just running `make`.
If that fails, please read samples/Makefile.
-UPDATE: Running the examples is part of the test procedure now. You
+
+UPDATE 1: Running the examples is part of the test procedure now. You
are still encouraged to run check them out to learn from them and
to see the ouput images.
+
+UPDATE 2: The samples fail if libgd is installed without image support
+enabled, which is the default starting with version 2.3.3. The samples
+should be automatically skipped if this is detected. To run the tests,
+install libgd with image support enabled.
END
diff --git a/README b/README
index 74230a1..4a1f7d6 100644
--- a/README
+++ b/README
@@ -61,9 +61,15 @@ AUTHOR
Martien Verbruggen
mgjv at tradingpost.com.au
-Currently maintained by Benjamin Warfield
+Benjamin Warfield
bwarfield at cpan.org
+Ruslan Zakirov
+
+Best Practical Solutions
+modules at bestpractical.com
+
+
FIRST PNG PORT as Chart::PNGgraph
Steve Bonds
commit e0616806b48af1a6b0c66cf1932a0c33509d67d6
Merge: c4dad11 5889cbc
Author: Jim Brandt <jbrandt at bestpractical.com>
Date: Wed Jan 11 16:23:17 2023 -0500
Merge branch 'libgd-image-disabled'
commit 5889cbc579bdac8056e20f6a006cb3c7958f445f
Author: Jim Brandt <jbrandt at bestpractical.com>
Date: Wed Jan 11 16:15:18 2023 -0500
Skip samples tests if GD image support is disabled
Starting with version 2.3.3, libgd has image support disabled
by default, so some packages are building that way. Skip
samples tests to avoid test failures.
To run these tests, install libgd with --enable-gd-formats. See:
https://github.com/libgd/libgd/issues/428
diff --git a/t/samples.t b/t/samples.t
index 140992d..cff3aa3 100644
--- a/t/samples.t
+++ b/t/samples.t
@@ -10,16 +10,34 @@ push @INC, "$Bin/../samples";
$ENV{GDGRAPH_SAMPLES_PATH} = "$Bin/../samples/";
my @samples = glob("$Bin/../samples/sample*.pl");
-plan tests => 2 * @samples;
+my $test_count = 2 * @samples;
+plan tests => $test_count;
-for my $sample (@samples) {
- lives_ok {
- my $stderr = capture_stderr { require $sample };
- my ($sample_name) = $sample =~ m{samples/(sample..)};
- like $stderr, qr/Processing $sample_name/;
+
+# Check for known GD error message when libgd has image support disabled
+use GD::Graph::bars;
+my $graph = GD::Graph::bars->new;
+eval {
+ capture_stderr { $graph->export_format };
+};
+
+my $skip;
+if ( $@ and $@ =~ /gdImageGdPtr/ ) {
+ $skip = 1;
+}
+
+SKIP: {
+ skip "GD image support has been disabled in installed libgd, skipping", $test_count if $skip;
+ for my $sample (@samples) {
+ lives_ok {
+ my $stderr = capture_stderr { require $sample };
+ my ($sample_name) = $sample =~ m{samples/(sample..)};
+ like $stderr, qr/Processing $sample_name/;
+ }
}
+
+ unlink $_ for glob("sample*.gif");
}
-unlink $_ for glob("sample*.gif");
done_testing();
commit c4dad114442265d1a596bdaf7ebd693b7348e190
Author: Brian Conry <bconry at bestpractical.com>
Date: Tue Feb 15 08:05:04 2022 -0600
Use magic numbers to detect xbm files to fix test failures
Updates to GD in version 2.76 caused an existing test related
to xbm files to start failing. This update fixes the failing
test.
diff --git a/Graph.pm b/Graph.pm
index 5a3b384..9df4e28 100644
--- a/Graph.pm
+++ b/Graph.pm
@@ -347,7 +347,8 @@ sub _read_logo_file
pack("H8",'ffd8ffe0') => "jpeg",
'GIF8' => "gif",
'.PNG' => "png",
- '/* X'=> "xpm", # technically '/* XPM */', but I'm hashing, here
+ '/* X' => "xpm", # technically '/* XPM */', but I'm hashing, here
+ '#def' => "xbm",
);
if (my $match = $magic{ substr $logodata, 0, 4 }) {
push @tried, $match;
-----------------------------------------------------------------------
Summary of changes:
CHANGES | 7 +++++++
Graph.pm | 21 +++++++++++++++++----
Makefile.PL | 13 ++++++++++---
README | 8 +++++++-
t/samples.t | 32 +++++++++++++++++++++++++-------
5 files changed, 66 insertions(+), 15 deletions(-)
hooks/post-receive
--
gdgraph
More information about the Bps-public-commit
mailing list