From 9ccea7265fe79a0b020e5e711b287472d42ab1a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Sj=C3=B6din?= <andreas.sjodin@gmail.com>
Date: Sat, 4 Aug 2018 22:59:32 +0300
Subject: [PATCH] Perl fix 11 (#10259)

* Bump perl-array-compare

* Fix perl-unicode-map

* Unblacklist
---
 build-fail-blacklist                 |  2 --
 recipes/perl-array-compare/build.sh  |  6 +++---
 recipes/perl-array-compare/meta.yaml | 25 +++++++++++++++----------
 recipes/perl-unicode-map/build.sh    | 11 ++++++++---
 recipes/perl-unicode-map/meta.yaml   | 22 ++++++++++++++--------
 5 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/build-fail-blacklist b/build-fail-blacklist
index d9b73f1583389..241a09c425fc2 100644
--- a/build-fail-blacklist
+++ b/build-fail-blacklist
@@ -2055,7 +2055,6 @@ recipes/perl-estscan2/2.1
 recipes/perl-io-socket-inet6
 #recipes/perl-path-class
 recipes/perl-html-tree
-recipes/perl-array-compare
 recipes/perl-html-formatter
 recipes/perl-graphviz
 recipes/perl-test-xml
@@ -2273,7 +2272,6 @@ recipes/perl-estscan1/1.3
 recipes/perl-html-tidy
 recipes/perl-json-parse/0.49
 recipes/perl-text-nsp
-recipes/perl-unicode-map
 recipes/pygresql
 recipes/real
 recipes/rmap
diff --git a/recipes/perl-array-compare/build.sh b/recipes/perl-array-compare/build.sh
index 64652ea2132d9..67918fe672fe6 100644
--- a/recipes/perl-array-compare/build.sh
+++ b/recipes/perl-array-compare/build.sh
@@ -3,10 +3,10 @@
 # If it has Build.PL use that, otherwise use Makefile.PL
 if [ -f Build.PL ]; then
     perl Build.PL
-    ./Build
-    ./Build test
+    perl ./Build
+    perl ./Build test
     # Make sure this goes in site
-    ./Build install --installdirs site
+    perl ./Build install --installdirs site
 elif [ -f Makefile.PL ]; then
     # Make sure this goes in site
     perl Makefile.PL INSTALLDIRS=site
diff --git a/recipes/perl-array-compare/meta.yaml b/recipes/perl-array-compare/meta.yaml
index d0dc06046a0e9..b789521349668 100644
--- a/recipes/perl-array-compare/meta.yaml
+++ b/recipes/perl-array-compare/meta.yaml
@@ -1,33 +1,38 @@
+{% set name = "perl-array-compare" %}
+{% set version = "3.0.1" %}
+{% set sha256 = "eb4f5889342690d2a9a6c2bcce55221e47155412e59842e424ea41ed9a34d23b" %}
+
 package:
-  name: perl-array-compare
-  version: "2.11"
+  name: {{ name }}
+  version: {{ version }}
 
 source:
-  url: http://cpan.metacpan.org/authors/id/D/DA/DAVECROSS/Array-Compare-2.11.tar.gz
-  md5: 57ff4aa504d4c2d1ecef342bd19c0039
+  url: https://cpan.metacpan.org/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.1.tar.gz
+  sha256: {{ sha256 }}
 
 build:
-  number: 1
+  number: 0
 
 requirements:
   host:
     - perl
-    - perl-moo
-    - perl-type-tiny
+    - perl-carp
     - perl-module-build
     - perl-test-nowarnings
+    - perl-moo
+    - perl-types-standard
 
   run:
     - perl
+    - perl-carp
     - perl-moo
-    - perl-type-tiny
+    - perl-types-standard
 
 test:
-  # Perl 'use' tests
   imports:
     - Array::Compare
 
 about:
-  home: http://metacpan.org/pod/Array-Compare
+  home: http://metacpan.org/pod/Array::Compare
   license: perl_5
   summary: 'Perl extension for comparing arrays.'
diff --git a/recipes/perl-unicode-map/build.sh b/recipes/perl-unicode-map/build.sh
index 64652ea2132d9..8b28972072229 100644
--- a/recipes/perl-unicode-map/build.sh
+++ b/recipes/perl-unicode-map/build.sh
@@ -3,10 +3,10 @@
 # If it has Build.PL use that, otherwise use Makefile.PL
 if [ -f Build.PL ]; then
     perl Build.PL
-    ./Build
-    ./Build test
+    perl ./Build
+    perl ./Build test
     # Make sure this goes in site
-    ./Build install --installdirs site
+    perl ./Build install --installdirs site
 elif [ -f Makefile.PL ]; then
     # Make sure this goes in site
     perl Makefile.PL INSTALLDIRS=site
@@ -17,3 +17,8 @@ else
     echo 'Unable to find Build.PL or Makefile.PL. You need to modify build.sh.'
     exit 1
 fi
+
+chmod 755 ${PREFIX}/bin/map
+chmod 755 ${PREFIX}/bin/mirrorMappings
+chmod 755 ${PREFIX}/bin/mkCSGB2312
+chmod 755 ${PREFIX}/bin/mkmapfile
diff --git a/recipes/perl-unicode-map/meta.yaml b/recipes/perl-unicode-map/meta.yaml
index bc68b6e08741f..60deaae018bca 100644
--- a/recipes/perl-unicode-map/meta.yaml
+++ b/recipes/perl-unicode-map/meta.yaml
@@ -1,15 +1,22 @@
+{% set name = "perl-unicode-map" %}
+{% set version = "0.112" %}
+{% set sha256 = "10f0c2f12ebba57dcd4f46d24cf242c1915d31ec0a4ec36b4df18c9ca0cb4a5a" %}
+
 package:
-  name: perl-unicode-map
-  version: "0.112"
+  name: {{ name }}
+  version: {{ version }}
 
 source:
-  url: http://cpan.metacpan.org/authors/id/M/MS/MSCHWARTZ/Unicode-Map-0.112.tar.gz
-  md5: edaa8fc5ddf0e5d805e274283dd0625d
+  url: https://cpan.metacpan.org/authors/id/M/MS/MSCHWARTZ/Unicode-Map-0.112.tar.gz
+  sha256: {{ sha256 }}
 
 build:
-  number: 1
+  number: 2
 
 requirements:
+  build:
+    - {{ compiler('cxx') }}
+
   host:
     - perl
 
@@ -17,7 +24,6 @@ requirements:
     - perl
 
 test:
-  # Perl 'use' tests
   imports:
     - Unicode::Map
 
@@ -25,6 +31,6 @@ test:
     - perl -e 'use Unicode::Map(); $map = new Unicode::Map("ISO-8859-1");'
 
 about:
-  home: http://metacpan.org/pod/Unicode-Map
+  home: http://metacpan.org/pod/Unicode::Map
   license: unknown
-  summary: 'Map charsets from and to UTF-16 unicode'
+  summary: 'An utility to map texts from and to unicode'