From f060b96dd6e813522571f99c317e4f812af5993b Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 10 Dec 2015 05:37:01 +0000
Subject: [PATCH] extra/js17 to 17.0.0-3

---
 extra/js17/PKGBUILD      | 17 +++++++++--------
 extra/js17/perl522.patch | 12 ------------
 2 files changed, 9 insertions(+), 20 deletions(-)
 delete mode 100644 extra/js17/perl522.patch

diff --git a/extra/js17/PKGBUILD b/extra/js17/PKGBUILD
index 4e77e61a6..55726abd1 100644
--- a/extra/js17/PKGBUILD
+++ b/extra/js17/PKGBUILD
@@ -3,11 +3,10 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - patch for AArch64
-#  - patch for perl 5.22 deprecation
 
 pkgname=js17
 pkgver=17.0.0
-pkgrel=1
+pkgrel=3
 pkgdesc="JavaScript interpreter and libraries (legacy)"
 arch=(i686 x86_64)
 url="https://developer.mozilla.org/En/SpiderMonkey/17"
@@ -17,16 +16,18 @@ makedepends=(python2 zip libffi)
 conflicts=('js<24.2.0')
 options=(!staticlibs)
 source=(http://ftp.mozilla.org/pub/mozilla.org/js/mozjs$pkgver.tar.gz
-        aarch64.patch
-        perl522.patch)
+        aarch64.patch)
 md5sums=('20b6f8f1140ef6e47daa3b16965c9202'
-         '144736bd4a4825ba5a1c87439230964d'
-         '84903b1c3fcef04cbb7b0c9fa2143e43')
+         '144736bd4a4825ba5a1c87439230964d')
 
 prepare() {
-  cd mozjs$pkgver
+  cd mozjs$pkgver/js/src
+
+  # Fix incompatibility with Perl 5.22
+  sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl
+
+  cd ../..
   patch -p1 -i ../aarch64.patch
-  patch -p1 -i ../perl522.patch
 }
 
 build() {
diff --git a/extra/js17/perl522.patch b/extra/js17/perl522.patch
deleted file mode 100644
index c0ced0554..000000000
--- a/extra/js17/perl522.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN a/js/src/config/milestone.pl b/js/src/config/milestone.pl
---- a/js/src/config/milestone.pl	2013-02-11 15:33:22.000000000 -0700
-+++ b/js/src/config/milestone.pl	2015-07-11 12:38:09.202030816 -0600
-@@ -55,7 +55,7 @@
- #
- my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE);
- 
--if (defined(@TEMPLATE_FILE)) {
-+if ($#TEMPLATE_FILE >= 0) {
-   my $TFILE;
- 
-   foreach $TFILE (@TEMPLATE_FILE) {