GNU bug report logs - #74756
[PATCH gnome-team 0/3] Update gjs to 1.82.1

Previous Next

To reply to this bug, email your comments to 74756 AT debbugs.gnu.org.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH gnome-team 0/3] Update gjs to 1.82.1
Date: Mon, 9 Dec 2024 21:11:59 +0100

Hi Guix,

after updating GNOME Shell to 46 in [1], I noticed that the tools
dealing with extensions do not work as supposed.  According to [2],
upstream expects gjs versions 1.80 or 1.82 for GNOME 46/47 respectively,
so let's update it.  Unfortunately, this also requires updates of icu4c
and mozjs, which I'd rather put in the hands of our mozilla team if
possible.

Cheers

[1] https://issues.guix.gnu.org/74622
[2] https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/47.1/elements/sdk/gjs.bst
[3] https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/46.7/elements/sdk/gjs.bst

Liliana Marie Prikler (3):
  gnu: Make icu4c 73.1 the default.
  gnu: mozjs: Update to 128.3.1.
  gnu: gjs: Update to 1.82.1.

 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        |  6 +-
 gnu/packages/gnuzilla.scm                     | 53 ++++++++--
 gnu/packages/icu4c.scm                        | 21 ++--
 gnu/packages/librewolf.scm                    |  2 +-
 .../patches/gjs-fix-closure-annotations.patch | 99 -------------------
 gnu/packages/tor-browsers.scm                 |  2 +-
 7 files changed, 61 insertions(+), 123 deletions(-)
 delete mode 100644 gnu/packages/patches/gjs-fix-closure-annotations.patch


base-commit: 5c00ceb3be6e855022090177a9b554ac876681a3
-- 
2.46.0

Message #8 received at 74756 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 74756 <at> debbugs.gnu.org
Subject: [PATCH gnome-team 1/3] gnu: Make icu4c 73.1 the default.
Date: Sun, 8 Dec 2024 12:19:47 +0100

* gnu/packages/icu4c.scm (icu4c): Update to 73.1.
[patches]: Adjust accordingly.
(icu4c-73): Delete variable.
(icu4c-71): New variable, containing the old icu4c.
* gnu/packages/librewolf.scm (librewolf)[inputs]: Adjust accordingly.
* gnu/packages/tor-browsers.scm (make-torbrowser): Likewise.
* gnu/packages/gnuzilla.scm (icecat-minimal, icedove-minimal): Likewise.
---
 gnu/packages/gnuzilla.scm     |  4 ++--
 gnu/packages/icu4c.scm        | 21 ++++++++++-----------
 gnu/packages/librewolf.scm    |  2 +-
 gnu/packages/tor-browsers.scm |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 8a6c558c50..a65b1fbb8b 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -744,7 +744,7 @@ (define-public icecat-minimal
            ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374).
            ffmpeg-5
            libvpx
-           icu4c-73
+           icu4c
            pixman
            pulseaudio
            mesa
@@ -1550,7 +1550,7 @@ (define-public icedove-minimal
            gtk+
            gtk+-2
            hunspell
-           icu4c-73
+           icu4c
            libcanberra
            libevent
            libffi
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 6f09fae65c..965da509ff 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -45,7 +45,7 @@ (define-module (gnu packages icu4c)
 (define-public icu4c
   (package
     (name "icu4c")
-    (version "71.1")
+    (version "73.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -55,7 +55,12 @@ (define-public icu4c
                     (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
                     "-src.tgz"))
               (sha256
-               (base32 "1gqywaqj9jmdwrng9lm6inyqmi5j2cz36db9dcqg3yk13zjyd9v7"))))
+               (base32 "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4"))
+              (patches
+               (append
+                (search-patches
+                 "icu4c-icu-22132-fix-vtimezone.patch"
+                 "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch")))))
     (build-system gnu-build-system)
     (native-inputs
      (append (list python-minimal)
@@ -109,11 +114,11 @@ (define-public icu4c
     (license x11)
     (home-page "http://site.icu-project.org/")))
 
-(define-public icu4c-73
+(define-public icu4c-71
   (package
     (inherit icu4c)
     (name "icu4c")
-    (version "73.1")
+    (version "71.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -124,13 +129,7 @@ (define-public icu4c-73
                     "-src.tgz"))
               (sha256
                (base32
-                "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4"))
-              (patches
-               (append
-                (search-patches
-                 "icu4c-icu-22132-fix-vtimezone.patch"
-                 "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch")
-                (origin-patches (package-source icu4c))))))))
+                "1gqywaqj9jmdwrng9lm6inyqmi5j2cz36db9dcqg3yk13zjyd9v7"))))))
 
 (define-public icu4c-70
   (package
diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm
index 6517c1953d..4a42f76f4a 100644
--- a/gnu/packages/librewolf.scm
+++ b/gnu/packages/librewolf.scm
@@ -657,7 +657,7 @@ (define-public librewolf
                   gtk+
                   gtk+-2
                   hunspell
-                  icu4c-73
+                  icu4c
                   jemalloc
                   libcanberra
                   libevent
diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index e517f9b214..30bdedd311 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -248,7 +248,7 @@ (define* (make-torbrowser #:key
            libffi
            ffmpeg
            libvpx
-           icu4c-73
+           icu4c
            pixman
            pulseaudio
            mesa
-- 
2.46.0

Message #11 received at 74756 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 74756 <at> debbugs.gnu.org
Subject: [PATCH gnome-team 3/3] gnu: gjs: Update to 1.82.1.
Date: Mon, 9 Dec 2024 20:26:20 +0100

* gnu/packages/gnome.scm (gjs): Update to 1.82.1.
* gnu/packages/patches/gjs-fix-closure-annotations.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        |  6 +-
 .../patches/gjs-fix-closure-annotations.patch | 99 -------------------
 3 files changed, 2 insertions(+), 104 deletions(-)
 delete mode 100644 gnu/packages/patches/gjs-fix-closure-annotations.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 30dca28a3b..34c82523ef 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1406,7 +1406,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghostscript-no-header-uuid.patch		\
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
   %D%/packages/patches/git-filter-repo-generate-doc.patch	\
-  %D%/packages/patches/gjs-fix-closure-annotations.patch	\
   %D%/packages/patches/gklib-suitesparse.patch			\
   %D%/packages/patches/glib-appinfo-watch.patch			\
   %D%/packages/patches/glib-skip-failing-test.patch		\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 292e7e87f5..af76610ad4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7867,7 +7867,7 @@ (define-public gnome-session
 (define-public gjs
   (package
     (name "gjs")
-    (version "1.76.3")
+    (version "1.82.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -7875,9 +7875,7 @@ (define-public gjs
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0knkbczic9874r2mnhc8yh9w63bmj574b7528ql0x3lf40nzcjx5"))
-              ;; TODO: Remove when updating to 1.82.0.
-              (patches (search-patches "gjs-fix-closure-annotations.patch"))
+                "0g39nl4x32x71c9gnwlrlv8jnpl2lnhmc7qpl7jy0vap6rbalfgv"))
               (modules '((guix build utils)))
               (snippet
                '(begin
diff --git a/gnu/packages/patches/gjs-fix-closure-annotations.patch b/gnu/packages/patches/gjs-fix-closure-annotations.patch
deleted file mode 100644
index 1b440ef9da..0000000000
--- a/gnu/packages/patches/gjs-fix-closure-annotations.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 1df5d72d8df383199dcd88cd1d16209617bf32ca Mon Sep 17 00:00:00 2001
-From: Philip Chimento <philip.chimento <at> gmail.com>
-Date: Sat, 27 Jul 2024 20:17:39 -0700
-Subject: [PATCH] GjsPrivate: Fix closure annotations
-
-Apparently the closure annotation can be omitted if the parameter is named
-"user_data". If it is needed because the parameter is not named
-"user_data" then the annotation should be on the callback argument and
-refer to the user data argument.
----
- libgjs-private/gjs-util.c | 10 +++++-----
- libgjs-private/gjs-util.h | 16 ++++++++--------
- 2 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/libgjs-private/gjs-util.c b/libgjs-private/gjs-util.c
-index b264aec1e..ae65287f5 100644
---- a/libgjs-private/gjs-util.c
-+++ b/libgjs-private/gjs-util.c
-@@ -235,7 +235,7 @@ void gjs_gtk_container_child_set_property(GObject* container, GObject* child,
-  * @store: a #GListStore
-  * @item: the new item
-  * @compare_func: (scope call): pairwise comparison function for sorting
-- * @user_data: (closure): user data for @compare_func
-+ * @user_data: user data for @compare_func
-  *
-  * Inserts @item into @store at a position to be determined by the
-  * @compare_func.
-@@ -258,7 +258,7 @@ unsigned int gjs_list_store_insert_sorted(GListStore *store, GObject *item,
-  * gjs_list_store_sort:
-  * @store: a #GListStore
-  * @compare_func: (scope call): pairwise comparison function for sorting
-- * @user_data: (closure): user data for @compare_func
-+ * @user_data: user data for @compare_func
-  *
-  * Sort the items in @store according to @compare_func.
-  */
-@@ -270,7 +270,7 @@ void gjs_list_store_sort(GListStore *store, GjsCompareDataFunc compare_func,
- /**
-  * gjs_gtk_custom_sorter_new:
-  * @sort_func: (nullable) (scope call): function to sort items
-- * @user_data: (closure): user data for @compare_func
-+ * @user_data: user data for @sort_func
-  * @destroy: destroy notify for @user_data
-  *
-  * Creates a new `GtkSorter` that works by calling @sort_func to compare items.
-@@ -305,7 +305,7 @@ GObject* gjs_gtk_custom_sorter_new(GjsCompareDataFunc sort_func,
-  * gjs_gtk_custom_sorter_set_sort_func:
-  * @sorter: a `GtkCustomSorter`
-  * @sort_func: (nullable) (scope call): function to sort items
-- * @user_data: (closure): user data to pass to @sort_func
-+ * @user_data: user data to pass to @sort_func
-  * @destroy: destroy notify for @user_data
-  *
-  * Sets (or unsets) the function used for sorting items.
-@@ -423,7 +423,7 @@ void gjs_log_set_writer_default() {
- /**
-  * gjs_log_set_writer_func:
-  * @func: (scope notified): callback with log data
-- * @user_data: (closure): user data for @func
-+ * @user_data: user data for @func
-  * @user_data_free: (destroy user_data_free): destroy for @user_data
-  *
-  * Sets a given function as the writer function for structured logging,
-diff --git a/libgjs-private/gjs-util.h b/libgjs-private/gjs-util.h
-index 7ee83e0d8..11b7c7cbc 100644
---- a/libgjs-private/gjs-util.h
-+++ b/libgjs-private/gjs-util.h
-@@ -124,11 +124,11 @@ typedef gboolean (*GjsBindingTransformFunc)(GBinding* binding,
-  * @target:
-  * @target_property:
-  * @flags:
-- * @to_callback: (scope notified) (nullable):
-- * @to_data: (closure to_callback):
-+ * @to_callback: (scope notified) (nullable) (closure to_data):
-+ * @to_data:
-  * @to_notify: (destroy to_data):
-- * @from_callback: (scope notified) (nullable):
-- * @from_data: (closure from_callback):
-+ * @from_callback: (scope notified) (nullable) (closure from_data):
-+ * @from_data:
-  * @from_notify: (destroy from_data):
-  *
-  * Returns: (transfer none):
-@@ -149,11 +149,11 @@ GBinding* gjs_g_object_bind_property_full(
-  * @target:
-  * @target_property:
-  * @flags:
-- * @to_callback: (scope notified) (nullable):
-- * @to_data: (closure to_callback):
-+ * @to_callback: (scope notified) (nullable) (closure to_data):
-+ * @to_data:
-  * @to_notify: (destroy to_data):
-- * @from_callback: (scope notified) (nullable):
-- * @from_data: (closure from_callback):
-+ * @from_callback: (scope notified) (nullable) (closure from_data):
-+ * @from_data:
-  * @from_notify: (destroy from_data):
-  */
- GJS_EXPORT
\ No newline at end of file
-- 
2.46.0

Message #14 received at 74756 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 74756 <at> debbugs.gnu.org
Subject: [PATCH gnome-team 2/3] gnu: mozjs: Update to 128.3.1.
Date: Mon, 9 Dec 2024 20:22:40 +0100

* gnu/packages/gnuzilla.scm (mozjs): Update to 128.3.1.
[#:phases]<configure>: Set HOME.
<adjust-tests>: Update accordingly.
[native-inputs]: Add rust-cbindgen.
(mozjs-102): New variable.
---
 gnu/packages/gnuzilla.scm | 49 +++++++++++++++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index a65b1fbb8b..567384a5a9 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.3.1")
     (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"))))
+                "1a3h7p7126pxzpidb1lqckvhfh1had805mai4l96mnc878phbx61"))))
     (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,7 +243,8 @@ (define-public mozjs
            pkg-config
            python-wrapper
            rust
-           `(,rust "cargo")))
+           `(,rust "cargo")
+           rust-cbindgen))
     (inputs
      (list icu4c readline zlib))
     (propagated-inputs
@@ -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" icu4c-71)))))
+
 (define-public mozjs-91
   (package
     (inherit mozjs)
-- 
2.46.0

Message #17 received at 74756 <at> debbugs.gnu.org (full text, mbox):

From: Mark H Weaver <mhw <at> netris.org>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 74756 <at> debbugs.gnu.org
Cc: nandre <at> riseup.net, jonathan.brielmaier <at> web.de, vivien <at> planete-kraus.eu,
 clement <at> lassieur.org, maxim.cournoyer <at> gmail.com
Subject: Re: [bug#74756] [PATCH gnome-team 1/3] gnu: Make icu4c 73.1 the
 default.
Date: Mon, 09 Dec 2024 17:07:48 -0500

Hi Liliana,

Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

> * gnu/packages/icu4c.scm (icu4c): Update to 73.1.
> [patches]: Adjust accordingly.
> (icu4c-73): Delete variable.
> (icu4c-71): New variable, containing the old icu4c.
> * gnu/packages/librewolf.scm (librewolf)[inputs]: Adjust accordingly.
> * gnu/packages/tor-browsers.scm (make-torbrowser): Likewise.
> * gnu/packages/gnuzilla.scm (icecat-minimal, icedove-minimal): Likewise.

[...]

> diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
> index 6f09fae65c..965da509ff 100644
> --- a/gnu/packages/icu4c.scm
> +++ b/gnu/packages/icu4c.scm
> @@ -45,7 +45,7 @@ (define-module (gnu packages icu4c)
>  (define-public icu4c
>    (package
>      (name "icu4c")
> -    (version "71.1")
> +    (version "73.1")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> @@ -55,7 +55,12 @@ (define-public icu4c
>                      (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
>                      "-src.tgz"))
>                (sha256
> -               (base32 "1gqywaqj9jmdwrng9lm6inyqmi5j2cz36db9dcqg3yk13zjyd9v7"))))
> +               (base32 "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4"))
> +              (patches
> +               (append
> +                (search-patches
> +                 "icu4c-icu-22132-fix-vtimezone.patch"
> +                 "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch")))))

The unary 'append' call above is vestigial and should probably be
dropped.  Otherwise, it looks good to me.

      Thanks!
        Mark

Message #20 received at 74756 <at> debbugs.gnu.org (full text, mbox):

From: André Batista <nandre <at> riseup.net>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 74756 <at> debbugs.gnu.org, vivien <at> planete-kraus.eu, maxim.cournoyer <at> gmail.com
Subject: Re: [bug#74756] [PATCH gnome-team 0/3] Update gjs to 1.82.1
Date: Tue, 10 Dec 2024 20:11:35 -0300

Hi Liliana,

seg 09 dez 2024 às 21:11:59 (1733789519), liliana.prikler <at> gmail.com enviou:
> Hi Guix,
> 
> after updating GNOME Shell to 46 in [1], I noticed that the tools
> dealing with extensions do not work as supposed.  According to [2],
> upstream expects gjs versions 1.80 or 1.82 for GNOME 46/47 respectively,
> so let's update it.  Unfortunately, this also requires updates of icu4c
> and mozjs, which I'd rather put in the hands of our mozilla team if
> possible.
> 

I'm not sure I understood your last sentence above: what do you mean
by "rather put in the hands of our mozilla team"? To build on a
separate branch? To review here the work you've already done? To fix
those FIXMEs that you've worked around for now?

The patches look good to me, but they trigger to many builds for me
to actually test them locally.

Oh and the icu4c one does not apply cleanly on master because there's
a icu4c-75 under what is currently icu4c-73.

Cheers!

Message #23 received at 74756 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: André Batista <nandre <at> riseup.net>
Cc: 74756 <at> debbugs.gnu.org, vivien <at> planete-kraus.eu, maxim.cournoyer <at> gmail.com
Subject: Re: [bug#74756] [PATCH gnome-team 0/3] Update gjs to 1.82.1
Date: Wed, 11 Dec 2024 19:30:25 +0100

Am Dienstag, dem 10.12.2024 um 20:11 -0300 schrieb André Batista:
> Hi Liliana,
> 
> seg 09 dez 2024 às 21:11:59 (1733789519),
> liliana.prikler <at> gmail.com enviou:
> > Hi Guix,
> > 
> > after updating GNOME Shell to 46 in [1], I noticed that the tools
> > dealing with extensions do not work as supposed.  According to [2],
> > upstream expects gjs versions 1.80 or 1.82 for GNOME 46/47
> > respectively, so let's update it.  Unfortunately, this also
> > requires updates of icu4c and mozjs, which I'd rather put in the
> > hands of our mozilla team if possible.
> > 
> 
> I'm not sure I understood your last sentence above: what do you mean
> by "rather put in the hands of our mozilla team"? To build on a
> separate branch? To review here the work you've already done? To fix
> those FIXMEs that you've worked around for now?
To put it bluntly, I've done the minimal work necessary to make gjs
itself build, but no QA whatsoever beyond that.  I suppose that folks
in the mozilla team have better insights to make this world rebuild not
a world breakage in disguise.

> Oh and the icu4c one does not apply cleanly on master because there's
> a icu4c-75 under what is currently icu4c-73.
Good to know, which invites a discussion if we shouldn't do an even
more recent version.  GJS to my knowledge only specifies minimal
requirements.

Cheers

Message #26 received at 74756 <at> debbugs.gnu.org (full text, mbox):

From: André Batista <nandre <at> riseup.net>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 74756 <at> debbugs.gnu.org, vivien <at> planete-kraus.eu, maxim.cournoyer <at> gmail.com
Subject: Re: [bug#74756] [PATCH gnome-team 0/3] Update gjs to 1.82.1
Date: Wed, 11 Dec 2024 20:28:42 -0300

qua 11 dez 2024 às 19:30:25 (1733956225), liliana.prikler <at> gmail.com enviou:
> Am Dienstag, dem 10.12.2024 um 20:11 -0300 schrieb André Batista:
> > 
> > I'm not sure I understood your last sentence above: what do you mean
> > by "rather put in the hands of our mozilla team"? To build on a
> > separate branch? To review here the work you've already done? To fix
> > those FIXMEs that you've worked around for now?
> To put it bluntly, I've done the minimal work necessary to make gjs
> itself build, but no QA whatsoever beyond that.  I suppose that folks
> in the mozilla team have better insights to make this world rebuild not
> a world breakage in disguise.

Sounds fair. Let's see if I can manage to take some of that from your
plate. It may take me a week or so, I'm guessing, but I'll try to
make a proper review if no one else beats me to it.

Also, if you plan on merging this before that, do tell.

> > Oh and the icu4c one does not apply cleanly on master because there's
> > a icu4c-75 under what is currently icu4c-73.
> Good to know, which invites a discussion if we shouldn't do an even
> more recent version.  GJS to my knowledge only specifies minimal
> requirements.

I'll try that. Sounds like it may avoid some other world rebuild in
the near future when requirements are upgraded.

Cheers

Message #29 received at 74756 <at> debbugs.gnu.org (full text, mbox):

From: André Batista <nandre <at> riseup.net>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 74756 <at> debbugs.gnu.org, vivien <at> planete-kraus.eu, maxim.cournoyer <at> gmail.com
Subject: Re: [bug#74756] [PATCH gnome-team 0/3] Update gjs to 1.82.1
Date: Thu, 20 Feb 2025 15:26:48 -0300

Hi,

qua 11 dez 2024 às 20:28:50 (1733959730), nandre <at> riseup.net enviou:
> qua 11 dez 2024 às 19:30:25 (1733956225), liliana.prikler <at> gmail.com enviou:
> > Am Dienstag, dem 10.12.2024 um 20:11 -0300 schrieb André Batista:
> > > 
> > > I'm not sure I understood your last sentence above: what do you mean
> > > by "rather put in the hands of our mozilla team"? To build on a
> > > separate branch? To review here the work you've already done? To fix
> > > those FIXMEs that you've worked around for now?
> > To put it bluntly, I've done the minimal work necessary to make gjs
> > itself build, but no QA whatsoever beyond that.  I suppose that folks
> > in the mozilla team have better insights to make this world rebuild not
> > a world breakage in disguise.
> 
> Sounds fair. Let's see if I can manage to take some of that from your
> plate. It may take me a week or so, I'm guessing, but I'll try to
> make a proper review if no one else beats me to it.

Ian Eure has added icu4c-73 to master on
cf842e9b20b89ecb08ac3456a91780ec07b5a201, though it's not the default one
yet.
 
> Also, if you plan on merging this before that, do tell.
> 
> > > Oh and the icu4c one does not apply cleanly on master because there's
> > > a icu4c-75 under what is currently icu4c-73.
> > Good to know, which invites a discussion if we shouldn't do an even
> > more recent version.  GJS to my knowledge only specifies minimal
> > requirements.
> 
> I'll try that. Sounds like it may avoid some other world rebuild in
> the near future when requirements are upgraded.
> 

I've sent #76421 adding mozjs-128, but keeping mozjs as is to avoid
rebuilding current gjs and gnome.  I've tried building it with icu4c-75,
but got unexpected errors on test phase.  Since v73 is the one bundled
with mozilla sources and it is enough for gnome, I gather it's best to
keep it that way.

Is that enough to help you get the gnome branch going forward?

Cheers!

Message #32 received at 74756 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: André Batista <nandre <at> riseup.net>
Cc: 74756 <at> debbugs.gnu.org, vivien <at> planete-kraus.eu, maxim.cournoyer <at> gmail.com
Subject: Re: [bug#74756] [PATCH gnome-team 0/3] Update gjs to 1.82.1
Date: Thu, 20 Feb 2025 20:23:20 +0100

Hi,

Am Donnerstag, dem 20.02.2025 um 15:26 -0300 schrieb André Batista:
> I've sent #76421 adding mozjs-128, but keeping mozjs as is to avoid
> rebuilding current gjs and gnome.  I've tried building it with icu4c-
> 75, but got unexpected errors on test phase.  Since v73 is the one
> bundled with mozilla sources and it is enough for gnome, I gather
> it's best to keep it that way.
> 
> Is that enough to help you get the gnome branch going forward?
mozjs-128/icu4c-73 suffice for gnome-team, but being packaged as
additional packages rather than having the default bumped is less than
ideal.  If gjs does not build with the patch applied, we could pin it
on the older version until gnome-team is merged.

WDYT?

Message #35 received at 74756 <at> debbugs.gnu.org (full text, mbox):

From: André Batista <nandre <at> riseup.net>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 74756 <at> debbugs.gnu.org, vivien <at> planete-kraus.eu, maxim.cournoyer <at> gmail.com
Subject: Re: [bug#74756] [PATCH gnome-team 0/3] Update gjs to 1.82.1
Date: Fri, 21 Feb 2025 14:31:50 -0300

qui 20 fev 2025 às 20:23:20 (1740093800), liliana.prikler <at> gmail.com enviou:
> Hi,
> 
> Am Donnerstag, dem 20.02.2025 um 15:26 -0300 schrieb André Batista:
> > I've sent #76421 adding mozjs-128, but keeping mozjs as is to avoid
> > rebuilding current gjs and gnome.  I've tried building it with icu4c-
> > 75, but got unexpected errors on test phase.  Since v73 is the one
> > bundled with mozilla sources and it is enough for gnome, I gather
> > it's best to keep it that way.
> > 
> > Is that enough to help you get the gnome branch going forward?
> mozjs-128/icu4c-73 suffice for gnome-team, but being packaged as
> additional packages rather than having the default bumped is less than
> ideal.  If gjs does not build with the patch applied, we could pin it
> on the older version until gnome-team is merged.
> 
> WDYT?

Current gjs on master indeed does not build with v128:

-------
(...)
Found pkg-config: YES (/gnu/store/a3lsdsalcmg5wnk67869af7wljprkbam-pkg-config-0.29.2/bin/pkg-config) 0.29.2
Run-time dependency glib-2.0 found: YES 2.78.0
Run-time dependency gthread-2.0 found: YES 2.78.0
Run-time dependency gobject-2.0 found: YES 2.78.0
Run-time dependency gio-2.0 found: YES 2.78.0
Run-time dependency libffi found: YES 3.4.4
Run-time dependency gobject-introspection-1.0 found: YES 1.78.1
Did not find CMake 'cmake'
Found CMake: NO
Run-time dependency mozjs-102 found: NO (tried pkgconfig)

../gjs-1.76.3/meson.build:131:15: ERROR: Dependency "mozjs-102" not found, tried pkgconfig
(...)
-------

on line 131, meson.build fixes mozjs to 102:

spidermonkey = dependency('mozjs-102')

$ guix refresh -l mozjs, says 95 packages would be recompiled when
updating mozjs, but grepping the gnu/packages dir shows only gjs
declaring mozjs as a direct dependency, so I'm guessing the other
packages directly or indirectly depend on gjs itself.

If so, I think it would be reasonable to rename current mozjs to
mozjs-102 and create an alias pointing mozjs to it for now.  Then,
when the gnome branch gets merged, we can change it to point to
v128.

What bothers me is that I don't know if we could then get rid of
v128's inheritance (as per #76421) without triggering a useless
rebuild, though I suppose so.

Message #38 received at 74756 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: André Batista <nandre <at> riseup.net>
Cc: 74756 <at> debbugs.gnu.org, vivien <at> planete-kraus.eu, maxim.cournoyer <at> gmail.com
Subject: Re: [bug#74756] [PATCH gnome-team 0/3] Update gjs to 1.82.1
Date: Fri, 21 Feb 2025 18:49:01 +0100

Am Freitag, dem 21.02.2025 um 14:31 -0300 schrieb André Batista:
> What bothers me is that I don't know if we could then get rid of
> v128's inheritance (as per #76421) without triggering a useless
> rebuild, though I suppose so.
I think we could write out the arguments, but 95 rebuilds are fine for
master.

Cheers

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.