[gnome-continuous] js24: add patch for compatibility with perl-5.22



commit 485ebd5bd978ae92c27a1d13c4ab2056333a82bd
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Wed Oct 12 09:40:54 2016 -0400

    js24: add patch for compatibility with perl-5.22
    
    Without this path, the major/minor versions are mis-detected and we
    end up with mozjs-..pc

 manifest.json                  |    2 +-
 patches/js24-perl-compat.patch |   25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 3e1c0f3..d444597 100644
--- a/manifest.json
+++ b/manifest.json
@@ -864,7 +864,7 @@
                 "name": "js24",
                  "component": "minimal",
                 "checksum": "e62f3f331ddd90df1e238c09d61a505c516fe9fd8c5c95336611d191d18437d8",
-                "patches": ["js24-buildapi.patch", "js24-virtualenv.patch"],
+                "patches": ["js24-buildapi.patch", "js24-virtualenv.patch", "js24-perl-compat.patch"],
                 "config-opts": ["--enable-threadsafe",
                                 "--with-system-nspr",
                                 "--disable-tests",
diff --git a/patches/js24-perl-compat.patch b/patches/js24-perl-compat.patch
new file mode 100644
index 0000000..3bb4a4a
--- /dev/null
+++ b/patches/js24-perl-compat.patch
@@ -0,0 +1,25 @@
+From b296762a793c0c8890caba7129e2215bc2a59e7a Mon Sep 17 00:00:00 2001
+From: "Owen W. Taylor" <otaylor fishsoup net>
+Date: Wed, 12 Oct 2016 09:27:27 -0400
+Subject: [PATCH] Fix compatibility with perl-5.22
+
+---
+ js/src/config/milestone.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/src/config/milestone.pl b/js/src/config/milestone.pl
+index aedfddf..9aad212 100644
+--- a/js/src/config/milestone.pl
++++ b/js/src/config/milestone.pl
+@@ -56,7 +56,7 @@ $MILESTONE_FILE  = "$TOPSRCDIR/config/milestone.txt";
+ #
+ my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE);
+ 
+-if (defined(@TEMPLATE_FILE)) {
++if (@TEMPLATE_FILE) {
+   my $TFILE;
+ 
+   foreach $TFILE (@TEMPLATE_FILE) {
+-- 
+2.7.4
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]