[libencode-arabic-perl] 01/03: Add patch from Colin Watson fixing more regexp warnings with Perl 5.22
Niko Tyni
ntyni at moszumanska.debian.org
Wed Dec 30 18:33:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
ntyni pushed a commit to branch master
in repository libencode-arabic-perl.
commit 90f7e01a5f8120dda6413ac70b68437bae563164
Author: Niko Tyni <ntyni at debian.org>
Date: Wed Dec 30 19:46:34 2015 +0200
Add patch from Colin Watson fixing more regexp warnings with Perl 5.22
Closes: #809094
---
debian/patches/series | 1 +
debian/patches/spell_out_unicode_charclasses.patch | 118 +++++++++++++++++++++
2 files changed, 119 insertions(+)
diff --git a/debian/patches/series b/debian/patches/series
index 0602d4e..2092638 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
typos.diff
unescaped_left_brace.patch
+spell_out_unicode_charclasses.patch
diff --git a/debian/patches/spell_out_unicode_charclasses.patch b/debian/patches/spell_out_unicode_charclasses.patch
new file mode 100644
index 0000000..5a34b22
--- /dev/null
+++ b/debian/patches/spell_out_unicode_charclasses.patch
@@ -0,0 +1,118 @@
+Description: Spell out Unicode ranges in full in replacement expressions
+ Otherwise, Perl 5.22 gives us "Replacement list is longer than search list"
+ warnings. We also have to be more careful about when to apply the /d
+ modifier to tr when decoding, to avoid "Useless use of /d modifier in
+ transliteration operator" warnings after fixing the previous warnings.
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/809094
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=110786
+Author: Colin Watson <cjwatson at ubuntu.com>
+Last-Update: 2015-12-29
+
+Index: b/lib/Encode/Arabic/Buckwalter.pm
+===================================================================
+--- a/lib/Encode/Arabic/Buckwalter.pm
++++ b/lib/Encode/Arabic/Buckwalter.pm
+@@ -218,9 +218,11 @@
+ : q [\x{0640}] ) .
+ q [\x{0623}\x{0624}\x{0625}] .
+ q [\x{060C}\x{061B}\x{061F}] .
+- q [\x{0621}\x{0622}\x{0626}-\x{063A}\x{0641}-\x{064A}] .
++ q [\x{0621}\x{0622}\x{0626}\x{0627}\x{0628}\x{0629}\x{062A}\x{062B}\x{062C}\x{062D}\x{062E}] .
++ q [\x{062F}\x{0630}\x{0631}\x{0632}\x{0633}\x{0634}\x{0635}\x{0636}\x{0637}\x{0638}\x{0639}] .
++ q [\x{063A}\x{0641}\x{0642}\x{0643}\x{0644}\x{0645}\x{0646}\x{0647}\x{0648}\x{0649}\x{064A}] .
+ q [\x{067E}\x{0686}\x{0698}\x{06A4}\x{06AF}] .
+- q [\x{0660}-\x{0669}] .
++ q [\x{0660}\x{0661}\x{0662}\x{0663}\x{0664}\x{0665}\x{0666}\x{0667}\x{0668}\x{0669}] .
+ ( $mode == 0
+ ? q [\x{0671}]
+ : q [\x{0627}] ) .
+@@ -228,7 +230,7 @@
+ ? ''
+ : q [\x{0651}] . ( $mode == 2
+ ? ''
+- : q [\x{064B}-\x{0650}\x{0670}] . ( $mode == 3
++ : q [\x{064B}\x{064C}\x{064D}\x{064E}\x{064F}\x{0650}\x{0670}] . ( $mode == 3
+ ? ''
+ : q [\x{0652}] ) ) )
+
+@@ -242,7 +244,7 @@
+ sub decoder ($) {
+
+ $_[0] =~ tr[/ . $set[0] . q /]
+- [/ . $set[1] . q /]d;
++ [/ . $set[1] . q /]/ . (($kshd or $mode > 0) ? 'd' : '') . q /;
+
+ return $_[0];
+ }
+Index: b/lib/Encode/Arabic/Habash.pm
+===================================================================
+--- a/lib/Encode/Arabic/Habash.pm
++++ b/lib/Encode/Arabic/Habash.pm
+@@ -220,9 +220,11 @@
+ : q [\x{0640}] ) .
+ q [\x{0623}\x{0624}\x{0625}] .
+ q [\x{060C}\x{061B}\x{061F}] .
+- q [\x{0621}\x{0622}\x{0626}-\x{063A}\x{0641}-\x{064A}] .
++ q [\x{0621}\x{0622}\x{0626}\x{0627}\x{0628}\x{0629}\x{062A}\x{062B}\x{062C}\x{062D}\x{062E}] .
++ q [\x{062F}\x{0630}\x{0631}\x{0632}\x{0633}\x{0634}\x{0635}\x{0636}\x{0637}\x{0638}\x{0639}] .
++ q [\x{063A}\x{0641}\x{0642}\x{0643}\x{0644}\x{0645}\x{0646}\x{0647}\x{0648}\x{0649}\x{064A}] .
+ q [\x{067E}\x{0686}\x{0698}\x{06A4}\x{06AF}] .
+- q [\x{0660}-\x{0669}] .
++ q [\x{0660}\x{0661}\x{0662}\x{0663}\x{0664}\x{0665}\x{0666}\x{0667}\x{0668}\x{0669}] .
+ ( $mode == 0
+ ? q [\x{0671}]
+ : q [\x{0627}] ) .
+@@ -230,7 +232,7 @@
+ ? ''
+ : q [\x{0651}] . ( $mode == 2
+ ? ''
+- : q [\x{064B}-\x{0650}\x{0670}] . ( $mode == 3
++ : q [\x{064B}\x{064C}\x{064D}\x{064E}\x{064F}\x{0650}\x{0670}] . ( $mode == 3
+ ? ''
+ : q [\x{0652}] ) ) )
+
+@@ -244,7 +246,7 @@
+ sub decoder ($) {
+
+ $_[0] =~ tr[/ . $set[0] . q /]
+- [/ . $set[1] . q /]d;
++ [/ . $set[1] . q /]/ . (($kshd or $mode > 0) ? 'd' : '') . q /;
+
+ return $_[0];
+ }
+Index: b/lib/Encode/Arabic/Parkinson.pm
+===================================================================
+--- a/lib/Encode/Arabic/Parkinson.pm
++++ b/lib/Encode/Arabic/Parkinson.pm
+@@ -211,8 +211,10 @@
+ : q [\x{0640}] ) .
+ q [\x{0623}\x{0624}\x{0625}] .
+ q [\x{060C}\x{061B}\x{061F}] .
+- q [\x{0621}\x{0622}\x{0626}-\x{063A}\x{0641}-\x{064A}] .
+- q [\x{0660}-\x{0669}] .
++ q [\x{0621}\x{0622}\x{0626}\x{0627}\x{0628}\x{0629}\x{062A}\x{062B}\x{062C}\x{062D}\x{062E}] .
++ q [\x{062F}\x{0630}\x{0631}\x{0632}\x{0633}\x{0634}\x{0635}\x{0636}\x{0637}\x{0638}\x{0639}] .
++ q [\x{063A}\x{0641}\x{0642}\x{0643}\x{0644}\x{0645}\x{0646}\x{0647}\x{0648}\x{0649}\x{064A}] .
++ q [\x{0660}\x{0661}\x{0662}\x{0663}\x{0664}\x{0665}\x{0666}\x{0667}\x{0668}\x{0669}] .
+ ( $mode == 0
+ ? q [\x{0671}]
+ : q [\x{0627}] ) .
+@@ -220,7 +222,7 @@
+ ? ''
+ : q [\x{0651}] . ( $mode == 2
+ ? ''
+- : q [\x{064B}-\x{0650}\x{0670}] . ( $mode == 3
++ : q [\x{064B}\x{064C}\x{064D}\x{064E}\x{064F}\x{0650}\x{0670}] . ( $mode == 3
+ ? ''
+ : q [\x{0652}] ) ) )
+
+@@ -234,7 +236,7 @@
+ sub decoder ($) {
+
+ $_[0] =~ tr[/ . $set[0] . q /]
+- [/ . $set[1] . q /]d;
++ [/ . $set[1] . q /]/ . (($kshd or $mode > 0) ? 'd' : '') . q /;
+
+ return $_[0];
+ }
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libencode-arabic-perl.git
More information about the Pkg-perl-cvs-commits
mailing list