Perl 5.16+ has started to complain if you import all symbols from both
POSIX and Locale::gettext, which quilt does in a couple of places. This
is ugly and breaks 'make check':
[10] $ quilt refresh -- failed
Prototype mismatch: sub main::LC_ALL: none vs () at
.../quilt/scripts/remove-trailing-ws line 21. != Refreshed patch
patches/test.diff
Prototype mismatch: sub main::LC_NUMERIC: none vs () at
.../quilt/scripts/remove-trailing-ws line 21. != ~
Prototype mismatch: sub main::LC_TIME: none vs () at
.../quilt/scripts/remove-trailing-ws line 21. != ~
Prototype mismatch: sub main::LC_MONETARY: none vs () at
.../quilt/scripts/remove-trailing-ws line 21. != ~
Prototype mismatch: sub main::LC_CTYPE: none vs () at
.../quilt/scripts/remove-trailing-ws line 21. != ~
Prototype mismatch: sub main::LC_MESSAGES: none vs () at
.../quilt/scripts/remove-trailing-ws line 21. != ~
Prototype mismatch: sub main::LC_COLLATE: none vs () at
.../quilt/scripts/remove-trailing-ws line 21. != ~
Refreshed patch patches/test.diff
!= ~
Fix trivial.
Index: quilt/quilt/scripts/edmail.in
===================================================================
--- quilt.orig/quilt/scripts/edmail.in 2013-03-31 19:37:11.190159678 +0100
+++ quilt/quilt/scripts/edmail.in 2013-03-31 19:37:13.129997757 +0100
@@ -7,6 +7,7 @@
# Message Header Extensions for Non-ASCII Text
use Getopt::Long;
+use POSIX qw(setlocale);
use strict;
# This ugly trick lets the script work even if gettext support is missing.
@@ -15,8 +16,6 @@
BEGIN {
if (eval { require Locale::gettext }) {
import Locale::gettext;
- require POSIX;
- import POSIX, qw(setlocale);
} else {
eval '
use constant LC_MESSAGES => 0;
Index: quilt/quilt/scripts/remove-trailing-ws.in
===================================================================
--- quilt.orig/quilt/scripts/remove-trailing-ws.in 2013-03-31
19:37:11.190159678 +0100
+++ quilt/quilt/scripts/remove-trailing-ws.in 2013-03-31 19:37:13.129997757
+0100
@@ -9,6 +9,7 @@
use FileHandle;
use File::Temp qw( :mktemp );
use Getopt::Std;
+use POSIX qw(setlocale);
use vars qw($opt_p $opt_n);
# This ugly trick lets the script work even if gettext support is missing.
@@ -17,8 +18,6 @@
BEGIN {
if (eval { require Locale::gettext }) {
import Locale::gettext;
- require POSIX;
- import POSIX, qw(setlocale);
} else {
eval '
use constant LC_MESSAGES => 0;
_______________________________________________
Quilt-dev mailing list
[email protected]
https://lists.nongnu.org/mailman/listinfo/quilt-dev
