summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2021-07-18 21:16:06 +0200
committerConrad Kostecki <conikost@gentoo.org>2021-07-25 23:32:42 +0200
commitcd3f6f49cd5db1d0650a6dbf5bb4fbeb37c1b0de (patch)
treec25575b3daa35b4d8c8b9176ac6d8e2593df5bca /dev-perl/PDL-Graphics-Gnuplot
parentwww-servers/apache: add ewarn message for user unlock (diff)
downloadgentoo-cd3f6f49cd5db1d0650a6dbf5bb4fbeb37c1b0de.tar.gz
gentoo-cd3f6f49cd5db1d0650a6dbf5bb4fbeb37c1b0de.tar.bz2
gentoo-cd3f6f49cd5db1d0650a6dbf5bb4fbeb37c1b0de.zip
dev-perl/PDL-Graphics-Gnuplot: remove unused patch(es)
Closes: https://github.com/gentoo/gentoo/pull/21709 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'dev-perl/PDL-Graphics-Gnuplot')
-rw-r--r--dev-perl/PDL-Graphics-Gnuplot/files/PDL-Graphics-Gnuplot-2.13.0-components.patch78
-rw-r--r--dev-perl/PDL-Graphics-Gnuplot/files/PDL-Graphics-Gnuplot-2.13.0-titletest.patch33
2 files changed, 0 insertions, 111 deletions
diff --git a/dev-perl/PDL-Graphics-Gnuplot/files/PDL-Graphics-Gnuplot-2.13.0-components.patch b/dev-perl/PDL-Graphics-Gnuplot/files/PDL-Graphics-Gnuplot-2.13.0-components.patch
deleted file mode 100644
index 16b5f0c37883..000000000000
--- a/dev-perl/PDL-Graphics-Gnuplot/files/PDL-Graphics-Gnuplot-2.13.0-components.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 1a1910fbe5ba97963b40e8b7731f49e08cf46f59 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Thu, 8 Apr 2021 14:57:34 +0200
-Subject: [PATCH 1/2] Allow a Gnuplot version with three components
-
----
- lib/PDL/Graphics/Gnuplot.pm | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/lib/PDL/Graphics/Gnuplot.pm b/lib/PDL/Graphics/Gnuplot.pm
-index 39fef00..45c8f5c 100644
---- a/lib/PDL/Graphics/Gnuplot.pm
-+++ b/lib/PDL/Graphics/Gnuplot.pm
-@@ -2009,8 +2009,8 @@ if($Alien::Gnuplot::VERSION < 1.031) {
- die "PDL::Graphics::Gnuplot requires Alien::Gnuplot version 1.031 or higher\n (v$Alien::Gnuplot::VERSION found). You can pull the latest from CPAN.\n";
- }
-
--our $gnuplot_dep_v = 4.6; # Versions below this are deprecated.
--our $gnuplot_req_v = 4.4; # Versions below this are not supported.
-+our $gnuplot_dep_v = 4.006; # Versions below this are deprecated.
-+our $gnuplot_req_v = 4.004; # Versions below this are not supported.
-
- # Compile time config flags...
- our $check_syntax = 0;
-@@ -2022,7 +2022,8 @@ our $debug_echo = 0; # If set, mock up Losedows hal
- our $VERSION = '2.013';
- $VERSION = eval $VERSION;
-
--our $gp_version = undef; # eventually gets the extracted gnuplot(1) version number.
-+our $gp_version = undef; # eventually gets the extracted gnuplot(1) version number.
-+our $gp_numversion = undef; # which is here converted to a float
-
- my $did_warn_non_numeric_patchlevel; # whether we already warned about this
-
-@@ -6217,7 +6218,7 @@ our $_OptionEmitters = {
- #### This is because some "withs" (e.g. "lines") must have dt specifiers for the correct behavior,
- #### but other "withs" (e.g. "labels") barf if dt is specified.
- 'dt' => sub { my($k,$v,$h, $w) = @_;
-- return "" unless($gp_version >= 5.0);
-+ return "" unless($gp_numversion >= 5.0);
- return "" if(($v//"") eq 'INVALID');
- unless($v) {
- if($w->{options}->{terminal} =~ m/dashed/) {
-@@ -7489,11 +7490,13 @@ EOM
- ##############################
- # Parse version number. If the version or pl changed, try reloading Alien::Gnuplot
- # to get them in sync.
-- if( $s =~ m/Version (\d+\.\d+) (patchlevel (\w+))?/i ) {
-+ if( $s =~ m/Version ((\d+)\.(\d+)(\.(\d+))?) (patchlevel (\w+))?/i ) {
- $gp_version = $1;
-- $gp_pl = $3;
-+ $gp_numversion = $2 + 0.001*$3 + 0.000001*$5;
-+ $gp_pl = $7;
- $this->{gp_version} = $1;
-- $this->{gp_pl} = $3;
-+ $this->{gp_numversion} = $gp_numversion;
-+ $this->{gp_pl} = $7;
- } else {
-
- # Something went wrong with i/o. See if the process still exists.
-@@ -7546,12 +7549,12 @@ EOM
- }
-
- # On windows, gnuplot versions 4.6.5 and older echo back commands.
-- if ( $gp_version <= '4.6' && $gp_pl <= 5 ) {
-+ if ( $gp_numversion <= '4.006' && $gp_pl <= 5 ) {
- $echo_eating = 1;
- }
- }
-
-- if( $gp_version < $gnuplot_dep_v and !$PDL::Graphics::Gnuplot::deprecated_this_session ) {
-+ if( $gp_numversion < $gnuplot_dep_v and !$PDL::Graphics::Gnuplot::deprecated_this_session ) {
- $PDL::Graphics::Gnuplot::deprecated_this_session = 1;
- unless($ENV{GNUPLOT_DEPRECATED}){
- carp <<"EOM";
---
-2.26.3
-
diff --git a/dev-perl/PDL-Graphics-Gnuplot/files/PDL-Graphics-Gnuplot-2.13.0-titletest.patch b/dev-perl/PDL-Graphics-Gnuplot/files/PDL-Graphics-Gnuplot-2.13.0-titletest.patch
deleted file mode 100644
index 101ffb5a6cf6..000000000000
--- a/dev-perl/PDL-Graphics-Gnuplot/files/PDL-Graphics-Gnuplot-2.13.0-titletest.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 73764d7180d998fb5a435e0fc73a76b00466009e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Thu, 8 Apr 2021 15:11:09 +0200
-Subject: [PATCH 2/2] Disable failing title test
-
----
- t/plot.t | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/plot.t b/t/plot.t
-index d3b5eb9..5138207 100644
---- a/t/plot.t
-+++ b/t/plot.t
-@@ -1,6 +1,6 @@
- #!perl
-
--use Test::More tests => 185;
-+use Test::More tests => 184;
-
- BEGIN {
- use_ok( 'PDL::Graphics::Gnuplot', qw(plot) ) || print "Bail out!\n";
-@@ -853,7 +853,7 @@ SKIP:{
- skip "Skipping title tests due to obsolete version of gnuplot (BSD uses 4.2, which fails these)",3
- if($w->{gp_version} < $PDL::Graphics::Gnuplot::gnuplot_req_v);
-
-- ok($lines[1] =~ m/This is a plot title/, "Plot title gets placed on plot");
-+# ok($lines[1] =~ m/This is a plot title/, "Plot title gets placed on plot");
-
-
- eval { $w->plot({title=>""},with=>'points',xvals(5));};
---
-2.26.3
-