From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 25 May 2019 05:22:41 +0000 (+0200)
Subject: - updated to 60.7.0 (using firefox sources)
X-Git-Tag: auto/th/mozjs68-68.7.0-1~7
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fmozjs68.git;a=commitdiff_plain;h=7e2c7f102ca41b770f2103ba0b083d308892f72b

- updated to 60.7.0 (using firefox sources)
- updated x32 patch
---

diff --git a/mozjs60.spec b/mozjs60.spec
index a4e1ee1..5afd194 100644
--- a/mozjs60.spec
+++ b/mozjs60.spec
@@ -5,12 +5,13 @@
 Summary:	SpiderMonkey 60 - JavaScript implementation
 Summary(pl.UTF-8):	SpiderMonkey 60 - implementacja języka JavaScript
 Name:		mozjs60
-Version:	60.1.0
-Release:	2
+Version:	60.7.0
+Release:	1
 License:	MPL v2.0
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-%{version}.tar.bz2
-# Source0-md5:	202f71313e53d9b92e7c578107541539
+#Source0:	http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-%{version}.tar.bz2
+Source0:	http://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz
+# Source0-md5:	8e42357e8687ae2004b1493f1fbc0f04
 Patch0:		copy-headers.patch
 Patch1:		system-virtualenv.patch
 Patch2:		include-configure-script.patch
@@ -63,7 +64,7 @@ Header files for JavaScript reference library.
 Pliki nagłówkowe do biblioteki JavaScript.
 
 %prep
-%setup -q -n mozjs-%{version}
+%setup -q -n firefox-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
diff --git a/x32.patch b/x32.patch
index 7d86f33..6fdb47c 100644
--- a/x32.patch
+++ b/x32.patch
@@ -10,20 +10,19 @@ diff -ur mozjs-60.1.0/build/moz.configure/init.configure mozjs-60.1.0-x32/build/
          endianness = 'little'
      elif cpu in ('s390', 's390x'):
          canonical_cpu = cpu
-diff -ur mozjs-60.1.0/js/src/jsmath.cpp mozjs-60.1.0-x32/js/src/jsmath.cpp
---- mozjs-60.1.0/js/src/jsmath.cpp	2018-06-19 00:23:59.000000000 +0200
-+++ mozjs-60.1.0-x32/js/src/jsmath.cpp	2019-03-31 11:02:09.300861938 +0200
+--- firefox-60.7.0/js/src/jsmath.cpp.orig	2019-05-24 22:04:38.196451155 +0200
++++ firefox-60.7.0/js/src/jsmath.cpp	2019-05-24 22:10:43.717804289 +0200
 @@ -58,7 +58,9 @@
  
  // Older glibc versions don't define SYS_getrandom, so we define it here if
  // it's not available. See bug 995069.
--# if defined(__x86_64__)
-+# if defined(__x86_64__) && defined(__ILP32__)
-+#  define GETRANDOM_NR (__X32_SYSCALL_BIT + 318)
-+# elif defined(__x86_64__)
- #  define GETRANDOM_NR 318
- # elif defined(__i386__)
- #  define GETRANDOM_NR 355
+-#if defined(__x86_64__)
++#if defined(__x86_64__) && defined(__ILP32__)
++#define GETRANDOM_NR (__X32_SYSCALL_BIT + 318)
++#elif defined(__x86_64__)
+ #define GETRANDOM_NR 318
+ #elif defined(__i386__)
+ #define GETRANDOM_NR 355
 diff -ur mozjs-60.1.0/python/mozbuild/mozbuild/configure/constants.py mozjs-60.1.0-x32/python/mozbuild/mozbuild/configure/constants.py
 --- mozjs-60.1.0/python/mozbuild/mozbuild/configure/constants.py	2018-06-19 00:24:03.000000000 +0200
 +++ mozjs-60.1.0-x32/python/mozbuild/mozbuild/configure/constants.py	2019-03-31 10:39:21.792681467 +0200