From patchwork Wed Feb 19 19:40:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 38850 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 743B627BBE9; Wed, 19 Feb 2025 19:42:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 34CD127BBE2 for ; Wed, 19 Feb 2025 19:42:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkpxP-0001LL-N5; Wed, 19 Feb 2025 14:42:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tkpxM-0001Kj-5w for guix-patches@gnu.org; Wed, 19 Feb 2025 14:42:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tkpxL-0005GR-T0 for guix-patches@gnu.org; Wed, 19 Feb 2025 14:42:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=tMcKktab9OmDkh4jWIK5hGgKKm07ICQPchVS6/k739c=; b=Otc/9WCNr1hfKEWTo7yaO6DofubqxCAL/gs/4Dg/6BPA3e1GXjOig3jq+4mMARtoBB/YbGwaV8CwmXnoLHbG1zrmlAAy5U4R2rTX0KBiGcdw8PnlI5XG0sy5YmIPCzygCG5fkN/G5x6U5YOs7wzSIOeHh8tcTSpxWhy6V92tidA7IsfIzwYgUyBRu1IeVzeHxNLY0TXv3H6KeoLk7EEIDRq9jhEQZFEVShwdclE5lhu7YfpffJ+LX8MPP/d2NOH4ihM5ITF/NmR9F0rj4WutV3/aG6jQRFVcna0O7RoPJfQcW00C/TKAL3FSxdJ8+8q2casRk+exLPY2lUlqhityfw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tkpxK-000564-62; Wed, 19 Feb 2025 14:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76421] [PATCH] gnu: mozjs: Update to 128.7.0. Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, clement@lassieur.org, ian@retrospec.tv, jonathan.brielmaier@web.de, mhw@netris.org, guix-patches@gnu.org Resent-Date: Wed, 19 Feb 2025 19:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76421 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76421@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista , Liliana Marie Prikler , liliana.prikler@gmail.com, clement@lassieur.org, ian@retrospec.tv, jonathan.brielmaier@web.de, mhw@netris.org X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, clement@lassieur.org, ian@retrospec.tv, jonathan.brielmaier@web.de, mhw@netris.org Received: via spool by submit@debbugs.gnu.org id=B.173999411619557 (code B ref -1); Wed, 19 Feb 2025 19:42:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Feb 2025 19:41:56 +0000 Received: from localhost ([127.0.0.1]:52142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tkpxD-00055L-Ok for submit@debbugs.gnu.org; Wed, 19 Feb 2025 14:41:56 -0500 Received: from lists.gnu.org ([2001:470:142::17]:40982) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tkpxB-00054R-AU for submit@debbugs.gnu.org; Wed, 19 Feb 2025 14:41:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tkpx2-0001Iz-EJ for guix-patches@gnu.org; Wed, 19 Feb 2025 14:41:45 -0500 Received: from mx1.riseup.net ([198.252.153.129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tkpwz-0005FE-VT for guix-patches@gnu.org; Wed, 19 Feb 2025 14:41:44 -0500 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4Yymwl6YDMzDqtB; Wed, 19 Feb 2025 19:41:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1739994099; bh=0wIhQhtexQYcuFxow82HQUEjpRaTpjO8qV+CtKWpW+o=; h=From:To:Cc:Subject:Date:From; b=fauEk5XmH41s35tjfzYjaksYOR855xNFZ5EKVSX6fmC7RxROQzWuThnkjPfMBDfD1 n9SFYLV9Gc4gLGU2EXLog41SF1NQOX2B8AxJ0w0IhXB8s7qZU9BlatLupvfr7WMrQW S9w67wwElVW/AQNk/8bL7zVsiaC7DVBlvMBAVehY= X-Riseup-User-ID: E1654370C932170AC28AE9A79113631A22598944894AB382E01D9E762F371B2B Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4Yymwk6b4kzFvRy; Wed, 19 Feb 2025 19:41:26 +0000 (UTC) From: =?utf-8?b?QW5kcsOp?= Batista Date: Wed, 19 Feb 2025 16:40:22 -0300 Message-ID: <20250219194030.2505-1-nandre@riseup.net> MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.129; envelope-from=nandre@riseup.net; helo=mx1.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnuzilla.scm (mozjs): Update to 128.7.0. [#:phases]: Set HOME. : Update accordingly. [native-inputs]: Add rust-cbindgen. [inputs]: Use icu4c-73. (mozjs-102): New variable. (mozjs-91) [inputs]: Adjust accordingly. * gnu/packages/gnome.scm (gjs) [propagated-inputs]: Keep using mozjs-102. Change-Id: I231144295f3567a091a9292b4dc4168e9c7d49f7 Co-Authored-By: Liliana Marie Prikler --- gnu/packages/gnome.scm | 2 +- gnu/packages/gnuzilla.scm | 53 ++++++++++++++++++++++++++++++++++----- 2 files changed, 48 insertions(+), 7 deletions(-) base-commit: 93551174af7a96d61f22f013ad1b9935106bf040 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1e8d813682..ecc55073cd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7864,7 +7864,7 @@ (define-public gjs xorg-server-for-tests)) (propagated-inputs ;; These are all in the Requires.private field of gjs-1.0.pc. - (list cairo gobject-introspection mozjs)) + (list cairo gobject-introspection mozjs-102)) (inputs (list gtk+ readline)) (synopsis "Javascript bindings for GNOME") diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 49c8e8a7fd..a9df89af95 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -104,7 +104,7 @@ (define-module (gnu packages gnuzilla) (define-public mozjs (package (name "mozjs") - (version "102.2.0") + (version "128.7.0") (source (origin (method url-fetch) ;; TODO: Switch to IceCat source once available on ftp.gnu.org. @@ -113,7 +113,7 @@ (define-public mozjs version "esr.source.tar.xz")) (sha256 (base32 - "1zwpgis7py1bf8p88pz3mpai6a02qrdb8ww2fa9kxxdl9b8r2k81")))) + "1xwl6z8ax3dw5hjb5lwpl5641rmlizmfqs3xg74cnczsvm7bz9z0")))) (build-system gnu-build-system) (arguments (list @@ -161,6 +161,8 @@ (define-public mozjs ;; but not the root directory either. (mkdir "run-configure-from-here") (chdir "run-configure-from-here") + ;; Configure script writes to $HOME. + (setenv "HOME" (getcwd)) (setenv "SHELL" (which "sh")) (setenv "CONFIG_SHELL" (which "sh")) (setenv "AUTOCONF" (which "autoconf")) @@ -198,7 +200,29 @@ (define-public mozjs ;; FIXME: got "en-US-posix", expected "en-US-POSIX". (delete-file "non262/Intl/available-locales-supported.js") ;; FIXME: got "en-US", expected "en-US-POSIX" - (delete-file "non262/Intl/available-locales-resolved.js")))) + (delete-file "non262/Intl/available-locales-resolved.js") + + ;;; Since 115: + ;; Mismatching array lengths + (delete-file "non262/Intl/supportedValuesOf-timeZones-canonical.js") + ;; FIXME: got "America/Santa_Isabel", expected "America/Tijuana": + ;; America/Santa_Isabel -> America/Tijuana + (delete-file "non262/Intl/DateTimeFormat/timeZone_backward_links.js") + ;; TODO: tzdata 2024a expected – find a way to regenerate + ;; these generated tests + (delete-file "non262/Intl/DateTimeFormat/timeZone_version.js") + + ;; FIXME: got "\uD840\uDDF2", expected "\u5047" + (delete-file "non262/Intl/Collator/implicithan.js") + ;; FIXME: got "\uD840\uDDF2", expected "\u3467" + (delete-file "non262/Intl/Collator/big5han-gb2312han.js") + + ;; Since 128: + ;; FIXME: got (void 0), expected "GMT" + (delete-file "non262/Intl/DateTimeFormat/formatRange-timeZoneName-matches-format.js") + ;; FIXME: got 7, expected 9: parts count mismatch + (delete-file "non262/Intl/DateTimeFormat/formatRange-timeZone-offset.js") + (delete-file "non262/Intl/DateTimeFormat/formatRange-timeZoneName.js")))) (add-before 'check 'pre-check (lambda _ (setenv "JSTESTS_EXTRA_ARGS" @@ -219,9 +243,10 @@ (define-public mozjs pkg-config python-wrapper rust - `(,rust "cargo"))) + `(,rust "cargo") + rust-cbindgen)) (inputs - (list icu4c readline zlib)) + (list icu4c-73 readline zlib)) (propagated-inputs (list nspr)) ; in the Requires.private field of mozjs-*.pc (home-page @@ -231,6 +256,22 @@ (define-public mozjs in C/C++.") (license license:mpl2.0))) ; and others for some files +(define-public mozjs-102 + (package + (inherit mozjs) + (name "mozjs") + (version "102.2.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ftp.mozilla.org/pub/firefox" + "/releases/" version "esr/source/firefox-" + version "esr.source.tar.xz")) + (sha256 + (base32 + "1zwpgis7py1bf8p88pz3mpai6a02qrdb8ww2fa9kxxdl9b8r2k81")))) + (inputs (modify-inputs (package-inputs mozjs) + (replace "icu4c-73" icu4c))))) + (define-public mozjs-91 (package (inherit mozjs) @@ -260,7 +301,7 @@ (define-public mozjs-91 (delete-file "non262/Intl/DateTimeFormat/tz-environment-variable.js")))))))) (inputs (modify-inputs (package-inputs mozjs) - (replace "icu4c" icu4c-69))))) + (replace "icu4c-73" icu4c-69))))) (define-public mozjs-78 (package