[libmojomojo-perl] 01/02: Add patch from upstream issue tracker for compatibility with newer Enode.

gregor herrmann gregoa at debian.org
Sat Jun 28 18:44:23 UTC 2014


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

gregoa pushed a commit to branch master
in repository libmojomojo-perl.

commit 4f4b05a224ceab252bcb81355e9d59564eccbf93
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Jun 28 20:34:11 2014 +0200

    Add patch from upstream issue tracker for compatibility with newer Enode.
    
    Closes: #753030
---
 debian/patches/encode.patch | 37 +++++++++++++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 2 files changed, 38 insertions(+)

diff --git a/debian/patches/encode.patch b/debian/patches/encode.patch
new file mode 100644
index 0000000..400969a
--- /dev/null
+++ b/debian/patches/encode.patch
@@ -0,0 +1,37 @@
+From f3fb6a261e047ca7068b08c0c292ae22d9007656 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Tue, 29 Apr 2014 12:37:39 +0200
+Subject: [PATCH] normalize name as a byte string
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Since Encode-2.53, Encode::decode_utf8() requires argument to be
+a byte string. Because URI::Escape::uri_unescape() returns unicode
+string on unicode string input, one need to convert it to a byte
+string before.
+
+<https://github.com/mojomojo/mojomojo/issues/121#issuecomment-41651507>
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ lib/MojoMojo/Schema/ResultSet/Page.pm | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/MojoMojo/Schema/ResultSet/Page.pm b/lib/MojoMojo/Schema/ResultSet/Page.pm
+index 306aa6a..3f1a7e2 100644
+--- a/lib/MojoMojo/Schema/ResultSet/Page.pm
++++ b/lib/MojoMojo/Schema/ResultSet/Page.pm
+@@ -177,8 +177,8 @@ sub normalize_name {
+     $name =~ s/\s+/_/g;
+     $name = lc($name);
+     return (
+-        Encode::decode_utf8(URI::Escape::uri_unescape($name_orig)),
+-        Encode::decode_utf8(URI::Escape::uri_unescape($name)),
++        Encode::decode_utf8(URI::Escape::uri_unescape(Encode::encode_utf8($name_orig))),
++        Encode::decode_utf8(URI::Escape::uri_unescape(Encode::encode_utf8($name))),
+     );
+ }
+
+-- 
+1.9.0
diff --git a/debian/patches/series b/debian/patches/series
index f1aea6c..eeb5834 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 no-initial-qmark-split.patch
+encode.patch

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



More information about the Pkg-perl-cvs-commits mailing list