[perl-perl5i] Add upstream fix for compatibility with utf8::all ≳ 0.013 (#1134872)

Paul Howarth pghmcfc at fedoraproject.org
Tue Sep 9 18:18:25 UTC 2014


commit 22b9e1a487eb2074a761b31112994fcd1642d29c
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Sep 9 19:17:55 2014 +0100

    Add upstream fix for compatibility with utf8::all ≳ 0.013 (#1134872)

 ...tests-broken-with-utf8-all-0.013-or-later.patch |   31 ++++++++++++++++++++
 perl-perl5i.spec                                   |   11 ++++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-ARGV-tests-broken-with-utf8-all-0.013-or-later.patch b/0001-Fix-ARGV-tests-broken-with-utf8-all-0.013-or-later.patch
new file mode 100644
index 0000000..7d66ce9
--- /dev/null
+++ b/0001-Fix-ARGV-tests-broken-with-utf8-all-0.013-or-later.patch
@@ -0,0 +1,31 @@
+From 6422710e0303c02b68f0f3634a34d5b0004a2ab5 Mon Sep 17 00:00:00 2001
+From: Paul Howarth <github at trace.city-fan.org>
+Date: Mon, 8 Sep 2014 15:03:29 +0100
+Subject: [PATCH] Fix ARGV tests broken with utf8::all 0.013 or later
+
+Addresses https://github.com/evalEmpire/perl5i/issues/279
+
+Loads utf8::all in the caller to get the desired behaviour.
+---
+ lib/perl5i/2.pm | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/lib/perl5i/2.pm b/lib/perl5i/2.pm
+index b53b5f3..1c34732 100644
+--- a/lib/perl5i/2.pm
++++ b/lib/perl5i/2.pm
+@@ -127,10 +127,7 @@ my %Features = (
+     },
+     'utf8::all' => sub {
+         my ($class, $caller) = @_;
+-
+-        # use utf8::all
+-        require utf8::all;
+-        utf8::all::import($class);
++        load_in_caller($caller, ['utf8::all']);
+     },
+     Want => sub {
+         my ($class, $caller) = @_;
+-- 
+1.9.3
+
diff --git a/perl-perl5i.spec b/perl-perl5i.spec
index 60f2c36..bffa6bb 100644
--- a/perl-perl5i.spec
+++ b/perl-perl5i.spec
@@ -1,12 +1,14 @@
 Name:		perl-perl5i
 Summary:	Fix as much of Perl 5 as possible in one pragma
 Version:	2.13.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		https://metacpan.org/release/perl5i
 Source0:	http://cpan.metacpan.org/authors/id/M/MS/MSCHWERN/perl5i-v%{version}.tar.gz
+Patch0:		0001-Fix-ARGV-tests-broken-with-utf8-all-0.013-or-later.patch
 # Module Build
+BuildRequires:	perl
 BuildRequires:	perl(lib)
 BuildRequires:	perl(Module::Build) >= 0.36
 # Module Runtime
@@ -151,6 +153,10 @@ like a branch you control) and implement it yourself.
 %prep
 %setup -q -n perl5i-v%{version}
 
+# Upstream fix for compatibility with utf8::all ≳ 0.013
+# https://github.com/evalEmpire/perl5i/pull/280
+%patch0 -p1
+
 %build
 perl Build.PL --installdirs=vendor --optimize="%{optflags}"
 ./Build
@@ -176,6 +182,9 @@ perl Build.PL --installdirs=vendor --optimize="%{optflags}"
 %{_mandir}/man3/perl5ifaq.3pm*
 
 %changelog
+* Tue Sep  9 2014 Paul Howarth <paul at city-fan.org> - 2.13.0-4
+- Add upstream fix for compatibility with utf8::all ≳ 0.013 (#1134872)
+
 * Mon Sep 01 2014 Jitka Plesnikova <jplesnik at redhat.com> - 2.13.0-3
 - Perl 5.20 rebuild
 



More information about the perl-devel mailing list