File: encode_workaround.patch

package info (click to toggle)
libcss-dom-perl 0.15-1%2Bdeb8u1
  • links: PTS, VCS
  • area: main
  • in suites: jessie
  • size: 716 kB
  • ctags: 249
  • sloc: perl: 7,310; makefile: 2
file content (26 lines) | stat: -rw-r--r-- 1,012 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
Author: Father Chrysostomos <sprout@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\";"