[bug#32364] [PATCH] gnu: Add mozjs-52.

[bug#32364] [PATCH] gnu: Add mozjs-52.

[Ricardo Wurmus]

* gnu/packages/gnuzilla.scm (mozjs-52): New variable.
---
 gnu/packages/gnuzilla.scm | 56 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index ba60d1372..79d05bdaa 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,6 +32,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages autotools)
@@ -252,6 +254,60 @@ in C/C++.")
        ("icu4c" ,icu4c)
        ("zlib" ,zlib)))))
 
+(define-public mozjs-52
+  ;; No releases yet at <https://archive.mozilla.org/pub/spidermonkey/releases/>.
+  ;; While we could take a snapshot of the complete mozilla-esr52 repository at
+  ;; <https://treeherder.mozilla.org/#/jobs?repo=mozilla-esr52&filter-searchStr=sm-tc>,
+  ;; we take the Debian version instead, because it is easier to work with.
+  (let ((commit "6507e63cc416fd7a3269e390efe712f8b56f374a")
+        (revision "1"))
+    (package (inherit mozjs-38)
+      (version (git-version "52.0-0." revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://salsa.debian.org/gnome-team/mozjs52.git")
+                      (commit commit)))
+                (file-name (git-file-name "mozjs" version))
+                (sha256
+                 (base32
+                  "1ny0s53r8wn4byys87h784xrq1xg767akmfm6gqrbvrz57mlm3q2"))))
+      (arguments
+       `(#:tests? #f ; depends on repository metadata
+         #:configure-flags
+         '("--enable-ctypes"
+           "--enable-optimize"
+           "--enable-pie"
+           "--enable-readline"
+           "--enable-shared-js"
+           "--enable-system-ffi"
+           "--with-system-icu"
+           "--with-system-nspr"
+           "--with-system-zlib"
+
+           ;; Intl API requires bundled ICU.
+           "--without-intl-api")
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'chdir
+             (lambda _ (chdir "js/src") #t))
+           (replace 'configure
+             (lambda* (#:key inputs outputs configure-flags #:allow-other-keys)
+               ;; The configure script does not accept environment variables
+               ;; as arguments.
+               (let ((out (assoc-ref outputs "out")))
+                 (setenv "SHELL" (which "sh"))
+                 (setenv "CONFIG_SHELL" (which "sh"))
+                 (setenv "AUTOCONF" (string-append (assoc-ref inputs "autoconf")
+                                                   "/bin/autoconf"))
+                 (apply invoke "./configure"
+                        (cons (string-append "--prefix=" out)
+                              configure-flags))))))))
+      (native-inputs
+       `(("autoconf" ,autoconf-2.13)
+         ("automake" ,automake)
+         ,@(package-native-inputs mozjs-38))))))
+
 (define-public nspr
   (package
     (name "nspr")
-- 
2.18.0

[bug#32364] [PATCH] gnu: Add mozjs-52.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1145 bytes --]

On Fri, Aug 03, 2018 at 06:15:42PM +0200, Ricardo Wurmus wrote:
> +  ;; No releases yet at <https://archive.mozilla.org/pub/spidermonkey/releases/>.
> +  ;; While we could take a snapshot of the complete mozilla-esr52 repository at
> +  ;; <https://treeherder.mozilla.org/#/jobs?repo=mozilla-esr52&filter-searchStr=sm-tc>,
> +  ;; we take the Debian version instead, because it is easier to work with.
> +  (let ((commit "6507e63cc416fd7a3269e390efe712f8b56f374a")
> +        (revision "1"))
> +    (package (inherit mozjs-38)

Do the other ones have their name listed? I had to build 'mozjs@52'
instead of 'mozjs-52'

> +      (version (git-version "52.0-0." revision commit))
> +      (source (origin
> +                (method git-fetch)
> +                (uri (git-reference


This built with no problems on aarch64 and the package looks good. It
also built with '--system=armhf-linux' on my aarch64 board.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#32364] [PATCH] gnu: Add mozjs-52.

[Kei Kebreau]

[-- Attachment #1: Type: text/plain, Size: 1139 bytes --]

Efraim Flashner <efraim@flashner.co.il> writes:

> On Fri, Aug 03, 2018 at 06:15:42PM +0200, Ricardo Wurmus wrote:
>> + ;; No releases yet at
>> <https://archive.mozilla.org/pub/spidermonkey/releases/>.
>> + ;; While we could take a snapshot of the complete mozilla-esr52
>> repository at
>> + ;;
>> <https://treeherder.mozilla.org/#/jobs?repo=mozilla-esr52&filter-searchStr=sm-tc>,
>> +  ;; we take the Debian version instead, because it is easier to work with.
>> +  (let ((commit "6507e63cc416fd7a3269e390efe712f8b56f374a")
>> +        (revision "1"))
>> +    (package (inherit mozjs-38)
>
> Do the other ones have their name listed? I had to build 'mozjs@52'
> instead of 'mozjs-52'
>

I mangaged to build this with just 'mozjs'.

>> +      (version (git-version "52.0-0." revision commit))
>> +      (source (origin
>> +                (method git-fetch)
>> +                (uri (git-reference
>
>
> This built with no problems on aarch64 and the package looks good. It
> also built with '--system=armhf-linux' on my aarch64 board.

I built this successfully for x86_64-linux, i686-linux, and armhf-linux
on a x86_64-linux computer.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

bug#32364: [PATCH] gnu: Add mozjs-52.

[Ricardo Wurmus]

Kei Kebreau <kkebreau@posteo.net> writes:

> Efraim Flashner <efraim@flashner.co.il> writes:
>
>> On Fri, Aug 03, 2018 at 06:15:42PM +0200, Ricardo Wurmus wrote:
>>> + ;; No releases yet at
>>> <https://archive.mozilla.org/pub/spidermonkey/releases/>.
>>> + ;; While we could take a snapshot of the complete mozilla-esr52
>>> repository at
>>> + ;;
>>> <https://treeherder.mozilla.org/#/jobs?repo=mozilla-esr52&filter-searchStr=sm-tc>,
>>> +  ;; we take the Debian version instead, because it is easier to work with.
>>> +  (let ((commit "6507e63cc416fd7a3269e390efe712f8b56f374a")
>>> +        (revision "1"))
>>> +    (package (inherit mozjs-38)
>>
>> Do the other ones have their name listed? I had to build 'mozjs@52'
>> instead of 'mozjs-52'
>>
>
> I mangaged to build this with just 'mozjs'.
>
>>> +      (version (git-version "52.0-0." revision commit))
>>> +      (source (origin
>>> +                (method git-fetch)
>>> +                (uri (git-reference
>>
>>
>> This built with no problems on aarch64 and the package looks good. It
>> also built with '--system=armhf-linux' on my aarch64 board.
>
> I built this successfully for x86_64-linux, i686-linux, and armhf-linux
> on a x86_64-linux computer.

Thank you both for testing the patch.

I pushed a slightly modified version of this patch to
wip-gnome-upgrades, which is supposed to be merged into core-updates
soon.

The patch that I sent here results in a package that cannot be used with
GJS (it segfaults).  I had to apply a patch that is included in the
Debian copy of the source code.

--
Ricardo