[libcss-dom-perl] 01/01: Apply upstream patch to work around Encode changes included in perl and libencode-perl stable updates (Closes: #826993)

[dom at earth.li]

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

dom pushed a commit to branch jessie
in repository libcss-dom-perl.

commit 01a8af068f7e667ecb05cd2f70371a3190a08fbf
Author: Dominic Hargreaves <dom at earth.li>
Date:   Sat Jun 11 19:33:07 2016 +0100

    Apply upstream patch to work around Encode changes included in perl and libencode-perl stable updates (Closes: #826993)
---
 debian/changelog                       |  8 ++++++++
 debian/patches/encode_workaround.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 95888ce..c5bc903 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libcss-dom-perl (0.15-1+deb8u1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Apply upstream patch to work around Encode changes included in
+    perl and libencode-perl stable updates (Closes: #826993)
+
+ -- Dominic Hargreaves <dom at earth.li>  Sat, 11 Jun 2016 19:31:56 +0100
+
 libcss-dom-perl (0.15-1) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/encode_workaround.patch b/debian/patches/encode_workaround.patch
new file mode 100644
index 0000000..6b8e109
--- /dev/null
+++ b/debian/patches/encode_workaround.patch
@@ -0,0 +1,26 @@
+Author: Father Chrysostomos <sprout at cpan.org>
+Origin: https://metacpan.org/release/CSS-DOM
+Description: Work around an incompatible change in Encode 2.77 (RT #107221, #107043)
+
+diff --git a/lib/CSS/DOM/Parser.pm b/lib/CSS/DOM/Parser.pm
+index 7c2156e..8eb5c1d 100644
+--- a/lib/CSS/DOM/Parser.pm
++++ b/lib/CSS/DOM/Parser.pm
+@@ -578,7 +578,7 @@ sub _decode { my $at; for(''.shift) {
+ 	) {
+ 		my $origenc = my $enc = Encode::decode('utf16le', $2);
+ 		my $dec = eval{Encode::decode($enc, $1, 9)};
+-		defined $dec or $dec
++		!defined $dec || $dec !~ /^\@/ and $dec
+ 			= eval{Encode::decode($enc.='-le', $1, 9)};
+ 		if(defined $dec) {
+ 			$dec eq "\@charset \"$origenc\";"
+@@ -638,7 +638,7 @@ sub _decode { my $at; for(''.shift) {
+ 	) {
+ 		my $origenc = my $enc = Encode::decode('utf32le', $2);
+ 		my $dec = eval{Encode::decode($enc, $1, 9)};
+-		defined $dec or $dec
++		!defined $dec || $dec !~ /^\@/ and $dec
+ 			= eval{Encode::decode($enc.='-le', $1, 9)};
+ 		if(defined $dec) {
+ 			$dec eq "\@charset \"$origenc\";"
diff --git a/debian/patches/series b/debian/patches/series
index 5766d01..6b13072 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 pod-encoding.patch
+encode_workaround.patch

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