[libcgi-formbuilder-perl] 14/16: Drop patch 0004: Fixed upstream.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository libcgi-formbuilder-perl.

commit 0ee6720ec6fe02363bb6173efcc563693f23ea59
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Aug 22 16:41:25 2016 +0200

    Drop patch 0004: Fixed upstream.
---
 ...nneeded-warning-from-CGI.pm-4.05-or-newer.patch | 76 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 77 deletions(-)

diff --git a/debian/patches/0004-Avoid-unneeded-warning-from-CGI.pm-4.05-or-newer.patch b/debian/patches/0004-Avoid-unneeded-warning-from-CGI.pm-4.05-or-newer.patch
deleted file mode 100644
index 1c66512..0000000
--- a/debian/patches/0004-Avoid-unneeded-warning-from-CGI.pm-4.05-or-newer.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Wed, 12 Nov 2014 20:41:26 +0000
-Subject: Avoid unneeded warning from CGI.pm 4.05 or newer
-
-Based on earlier patches by Amitai Schlair, but modified to retain
-support for objects like Catalyst::Request that mimic the CGI interface
-but do not have a param_fetch method.
-
---- a/lib/CGI/FormBuilder.pm
-+++ b/lib/CGI/FormBuilder.pm
-@@ -855,7 +855,18 @@
- 
-     # Make sure to get all values
-     for my $p (@keep) {
--        for my $v ($self->{params}->param($p)) {
-+        my @values;
-+        if ($self->{params}->can('param_fetch')) {
-+            @values = @{$self->{params}->param_fetch($p)};
-+        }
-+        else {
-+            # array-context calls to param($p) are deprecated in
-+            # CGI.pm, but some other objects that mimic
-+            # its interface don't have param_fetch
-+            @values = $self->{params}->param($p);
-+        }
-+
-+        for my $v (@values) {
-             debug 1, "keepextras: saving hidden param $p = $v";
-             push @html, htmltag('input', name => $p, type => 'hidden', value => $v);
-         }
---- a/lib/CGI/FormBuilder/Field.pm
-+++ b/lib/CGI/FormBuilder/Field.pm
-@@ -189,7 +189,19 @@
-     my $self = shift;
-     debug 2, "$self->{name}: called \$field->cgi_value";
-     puke "Cannot set \$field->cgi_value manually" if @_;
--    if (my @v = $self->{_form}{params}->param($self->name)) {
-+
-+    my @v;
-+    if ($self->{_form}{params}->can('param_fetch')) {
-+        @v = @{$self->{_form}{params}->param_fetch($self->name)};
-+    }
-+    else {
-+        # array-context calls to param($p) are deprecated in
-+        # CGI.pm, but some other objects that mimic
-+        # its interface don't have param_fetch
-+        @v = $self->{_form}{params}->param($self->name);
-+    }
-+
-+    if (@v) {
-         for my $v (@v) {
-             if ($self->other && $v eq $self->othername) {
-                 debug 1, "$self->{name}: redoing value from _other field";
---- a/lib/CGI/FormBuilder/Multi.pm
-+++ b/lib/CGI/FormBuilder/Multi.pm
-@@ -218,7 +218,19 @@
-         }
-         for my $k (@{$self->{keepextras}}) {
-             next if $k eq $pnam;
--            for my $v ($self->{params}->param($k)) {
-+
-+            my @values;
-+            if ($self->{params}->can('param_fetch')) {
-+                @values = @{$self->{params}->param_fetch($k)};
-+            }
-+            else {
-+                # array-context calls to param($k) are deprecated in
-+                # CGI.pm, but some other objects that mimic
-+                # its interface don't have param_fetch
-+                @values = $self->{params}->param($k);
-+            }
-+
-+            for my $v (@values) {
-                 push @keep, { name => $k, value => $v };
-             }
-         }
diff --git a/debian/patches/series b/debian/patches/series
index b90bcc8..886fdac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 pod-encoding.patch
 pod-spelling.patch
-0004-Avoid-unneeded-warning-from-CGI.pm-4.05-or-newer.patch
 0007-Comment-that-cgi_param-is-context-sensitive-just-lik.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcgi-formbuilder-perl.git