Control: tag -1 + patch
On Sun, Jun 05, 2016 at 10:44:41PM +0300, Niko Tyni wrote:
> Package: xindy
> Version: 2.5.1.20160104-1
> Severity: minor
> User: debian-p...@lists.debian.org
> Usertags: perl-5.24-transition
>
> Building this package triggers deprecation warnings with Perl 5.24
> (currently in experimental), and probably with Perl 5.22 (current sid)
> too.
>
> Unescaped left brace in regex is deprecated, passed through in regex;
> marked by <-- HERE in m/\\indexentry{ <-- HERE
> (.+)--([8-9a-f][0-9a-f])\}\{1\}/ at ./make-inp-rules.pl line 11.
Hi, Norbert
Trivial proposed patch attached,
--
Agustin
>From 4ee00ccea3d6bedf3276a07a8fa6d7d5f7b6108c Mon Sep 17 00:00:00 2001
From: Agustin Martin Domingo
Date: Mon, 6 Jun 2016 18:05:27 +0200
Subject: [PATCH] Handle perl 5.22 deprecation of unescaped left brace in
regular expressions (#826507).
perl 5.22 now warns about use of unescaped left braces in regular
expressions:
Unescaped left brace in regex is deprecated,
passed through in regex; marked by
<-- HERE in m/\\indexentry{ <-- HERE (.+)--([8-9a-f][0-9a-f])\}\{1\}/
at ./make-inp-rules.pl line 11.
---
...00_Unescaped-left-brace-deprecated-in-regexps.diff | 19 +++
debian/patches/series | 1 +
2 files changed, 20 insertions(+)
create mode 100644 debian/patches/1000_Unescaped-left-brace-deprecated-in-regexps.diff
diff --git a/debian/patches/1000_Unescaped-left-brace-deprecated-in-regexps.diff b/debian/patches/1000_Unescaped-left-brace-deprecated-in-regexps.diff
new file mode 100644
index 000..a271d3d
--- /dev/null
+++ b/debian/patches/1000_Unescaped-left-brace-deprecated-in-regexps.diff
@@ -0,0 +1,19 @@
+Author: Agustin Martin Domingo
+Description: Handle perl 5.22 deprecation of unescaped left brace in regular expressions.
+Bug-Debian: https://bugs.debian.org/826507
+
+This is to deal with new perl 5.22 warning about that
+
+Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/\\indexentry{ <-- HERE (.+)--([8-9a-f][0-9a-f])\}\{1\}/ at ./make-inp-rules.pl line 11.
+
+--- a/make-rules/inputenc/make-inp-rules.pl
b/make-rules/inputenc/make-inp-rules.pl
+@@ -8,7 +8,7 @@
+
+
+ while () {
+- if (/\\indexentry{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) {
++ if (/\\indexentry\{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) {
+ if (!($1 =~ /inputenc Error|\@inpenc\@undefined/)) {
+ $i = hex($2);
+ $macro = $1;
diff --git a/debian/patches/series b/debian/patches/series
index d147b28..30b8800 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
#fix-echo-expansion
fix-FHS
+1000_Unescaped-left-brace-deprecated-in-regexps.diff
help-option
#config.guess+sub
#fix-alphabets-doc-geometry
--
2.8.1
