[bug#75167] [PATCH gnome-team 0/6] Update GNOME Builder to 47.2

[bug#75167] [PATCH gnome-team 0/6] Update GNOME Builder to 47.2

[Liliana Marie Prikler]

Hi folks,

this series updates GNOME Builder to 47.2 (yes, that's 47.2, because
I only found out that the issue affecting 46 builds also affects 47
after updating everything else).  This is a WebkitGTK rebuilder courtesy
of libdex getting bumped, so build carefully and don't overload your
machines with work :)

Cheers

Liliana Marie Prikler (6):
  gnu: Add libpeas-2.
  gnu: jsonrpc-glib: Update to 3.44.1.
  gnu: libdex: Update to 0.8.1.
  gnu: gom: Update to 0.5.3.
  gnu: Add libspelling.
  gnu: gnome-builder: Update to 47.2.

 gnu/packages/glib.scm  |   4 +-
 gnu/packages/gnome.scm | 122 ++++++++++++++++++++++++++++++++++++-----
 2 files changed, 109 insertions(+), 17 deletions(-)


base-commit: 149e1d071c87df5cd67e81a8d2eceedf9ec58f40
-- 
2.46.0

[bug#75167] [PATCH gnome-team 1/6] gnu: Add libpeas-2.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (libpeas-2): New variable.
---
 gnu/packages/gnome.scm | 60 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 38d5043ef71..26ebd02e74c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3173,6 +3173,66 @@ (define-public libnotify
 some form of information without getting in the user's way.")
     (license license:lgpl2.1+)))
 
+(define-public libpeas-2
+  (package
+    (name "libpeas")
+    (version "2.0.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnome/sources/" name "/"
+                           (version-major+minor version)  "/"
+                           name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "1pg6km41bp9ayr6z9pi40nc6mkw2ccdxkcdsvl9lxd9isxrjyvrp"))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:configure-flags #~'("-Dvapi=true" "-Dgtk_doc=true"
+                            ;; XXX: fails to find lua-lgi
+                            "-Dlua51=false")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'start-xserver
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((disp ":1"))
+                (setenv "DISPLAY" disp)
+                (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache")
+                (setenv "XDG_CONFIG_HOME" "/tmp")
+                ;; Tests require a running X server.
+                (system (format #f "~a ~a &"
+                                (search-input-file inputs "bin/Xvfb")
+                                disp))))))))
+    (inputs
+     (list gtk
+           gjs
+           glade3
+           ;; lua-5.1
+           ;; lua5.1-lgi
+           python
+           python-pygobject))
+    (native-inputs
+     (list pkg-config
+           gettext-minimal
+           gi-docgen
+           `(,glib "bin")
+           gobject-introspection
+           xorg-server-for-tests
+           vala))
+    (propagated-inputs
+     ;; The .pc file "Requires" gobject-introspection.
+     (list glib gobject-introspection))
+    (home-page "https://wiki.gnome.org/Projects/Libpeas")
+    (synopsis "GObject plugin system")
+    (description
+     "Libpeas is a gobject-based plugin engine, targeted at giving every
+application the chance to assume its own extensibility.  It also has a set of
+features including, but not limited to: multiple extension points; on-demand
+(lazy) programming language support for C, Python and JS; simplicity of the
+API.")
+    (license license:lgpl2.0+)))
+
 (define-public libpeas
   (package
     (name "libpeas")
-- 
2.46.0

[bug#75167] [PATCH gnome-team 1/6] gnu: Add libpeas-2.

[Maxim Cournoyer]

Hi Liliana,

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

> * gnu/packages/gnome.scm (libpeas-2): New variable.

[...]

> +(define-public libpeas-2
> +  (package

[...]

> +     "Libpeas is a gobject-based plugin engine, targeted at giving every
> +application the chance to assume its own extensibility.  It also has a set of
> +features including, but not limited to: multiple extension points; on-demand
> +(lazy) programming language support for C, Python and JS; simplicity of the
> +API.")
> +    (license license:lgpl2.0+)))
> +
>  (define-public libpeas
>    (package
>      (name "libpeas")

Is a new package really required?  Could we instead more simply update
libpeas directly to version 2?  If the older libpeas need to be
maintained, I think inheriting from the older version would make sense
to avoid duplicated fields.

-- 
Thanks,
Maxim

[bug#75167] [PATCH gnome-team 2/6] gnu: jsonrpc-glib: Update to 3.44.1.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (jsonrpc-glib): Update to 3.44.1.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 26ebd02e74c..731de27bd92 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13435,7 +13435,7 @@ (define-public parlatype
 (define-public jsonrpc-glib
   (package
     (name "jsonrpc-glib")
-    (version "3.44.0")
+    (version "3.44.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -13443,7 +13443,7 @@ (define-public jsonrpc-glib
                                    name "-" version ".tar.xz"))
               (sha256
                (base32
-                "01nfsny3612c6l5q7qaazjpbzin0h357xblc81sm3k6ha016lh39"))))
+                "1prhpdw4nrbcb00vvjhgc0w04ifaz2x5jbhhwnplcml0kizd2q8k"))))
     (build-system meson-build-system)
     (arguments
      (list
-- 
2.46.0

[bug#75167] [PATCH gnome-team 3/6] gnu: libdex: Update to 0.8.1.

[Liliana Marie Prikler]

* gnu/packages/glib.scm (libdex): Update to 0.8.1.
---
 gnu/packages/glib.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 3ffdb269333..7a233e60f48 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -1564,7 +1564,7 @@ (define-public dbus-test-runner
 (define-public libdex
   (package
     (name "libdex")
-    (version "0.4.1")
+    (version "0.8.1")
     (source
      (origin
        (method url-fetch)
@@ -1572,7 +1572,7 @@ (define-public libdex
                            (version-major+minor version) "/"
                            name "-" version ".tar.xz"))
        (sha256
-        (base32 "0fj4bggygdxgfsdrhc3zg1y2065g0skpz1l2bqwl0jqn9m3zbdc1"))))
+        (base32 "183qsc46n0pf3whlamfrbckbsxzfnmj54hvhdxpvvaj37snpam4m"))))
     (build-system meson-build-system)
     (arguments
      (list #:configure-flags #~'("-D" "docs=true")))
-- 
2.46.0

[bug#75167] [PATCH gnome-team 4/6] gnu: gom: Update to 0.5.3.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (gom): Update to 0.5.3.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 731de27bd92..fea67718c37 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6586,7 +6586,7 @@ (define-public libchamplain
 (define-public gom
   (package
     (name "gom")
-    (version "0.4")
+    (version "0.5.3")
     (source
      (origin
        (method url-fetch)
@@ -6595,7 +6595,7 @@ (define-public gom
                            "gom-" version ".tar.xz"))
        (sha256
         (base32
-         "17ca07hpg7dqxjn0jpqim3xqcmplk2a87wbwrrlq3dd3m8381l38"))))
+         "0xq1s933bxlzp3sqnm03id8apqwlc4v7ka7pxlklssywzc4hk786"))))
     (build-system meson-build-system)
     (arguments
      (list
-- 
2.46.0

[bug#75167] [PATCH gnome-team 5/6] gnu: Add libspelling.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (libspelling): New variable.
---
 gnu/packages/gnome.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fea67718c37..f3568350f79 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13612,6 +13612,40 @@ (define-public sysprof-3.44
                             (("gtk-update-icon-cache") "true")
                             (("update-desktop-database") "true"))))))))))
 
+(define-public libspelling
+  (package
+    (name "libspelling")
+    (version "0.4.5")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.gnome.org/GNOME/libspelling")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32 "030s821sb9rsr1ysl79x7id1bsin9idy8z7p85qr9cvw1w3f2s7r"))))
+    (build-system meson-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'check 'setup-home
+                 (lambda _
+                   ;; Tests require a writable HOME.
+                   (setenv "HOME" (getcwd)))))))
+    (inputs (list enchant gtk gtksourceview sysprof))
+    (native-inputs
+     (list gobject-introspection
+           gi-docgen
+           pkg-config
+           vala
+           ;; For testing
+           aspell aspell-dict-en))
+    (home-page "https://gitlab.gnome.org/GNOME/libspelling/")
+    (synopsis "Spell-checking library for GTK 4")
+    (description "This package provides a spell-checker for
+GtkTextView widgets.")
+    (license license:lgpl2.1+)))
+
 (define-public gnome-builder
   (package
     (name "gnome-builder")
-- 
2.46.0

[bug#75167] [PATCH gnome-team 5/6] gnu: Add libspelling.

[Maxim Cournoyer]

Hello,

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

> * gnu/packages/gnome.scm (libspelling): New variable.
> ---
>  gnu/packages/gnome.scm | 34 ++++++++++++++++++++++++++++++++++
>  1 file changed, 34 insertions(+)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index fea67718c37..f3568350f79 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -13612,6 +13612,40 @@ (define-public sysprof-3.44
>                              (("gtk-update-icon-cache") "true")
>                              (("update-desktop-database") "true"))))))))))
>  
> +(define-public libspelling
> +  (package
> +    (name "libspelling")
> +    (version "0.4.5")
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://gitlab.gnome.org/GNOME/libspelling")
> +                    (commit version)))
> +              (file-name (git-file-name name version))
> +              (sha256
> +               (base32 "030s821sb9rsr1ysl79x7id1bsin9idy8z7p85qr9cvw1w3f2s7r"))))
> +    (build-system meson-build-system)
> +    (arguments
> +     (list #:phases
> +           #~(modify-phases %standard-phases
> +               (add-before 'check 'setup-home
> +                 (lambda _
> +                   ;; Tests require a writable HOME.
> +                   (setenv "HOME" (getcwd)))))))
> +    (inputs (list enchant gtk gtksourceview sysprof))
> +    (native-inputs
> +     (list gobject-introspection
> +           gi-docgen
> +           pkg-config
> +           vala

Please sort.

> +           ;; For testing

Please properly punctuate line comments (here, by adding trailing '.').

> +           aspell aspell-dict-en))
> +    (home-page "https://gitlab.gnome.org/GNOME/libspelling/")
> +    (synopsis "Spell-checking library for GTK 4")
> +    (description "This package provides a spell-checker for
> +GtkTextView widgets.")
> +    (license license:lgpl2.1+)))

Other than these two nitpicks, LGTM.

-- 
Thanks,
Maxim

[bug#75167] [PATCH gnome-team 6/6] gnu: gnome-builder: Update to 47.2.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (gnome-builder): Update to 47.2.
[#:phases]: Drop ‘patch-source’:
[inputs]: Add gom and libspelling.  Replace libpeas with libpeas-2.
[native-inputs]: Add gcc-14.
---
 gnu/packages/gnome.scm | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f3568350f79..95318a85312 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13649,7 +13649,7 @@ (define-public libspelling
 (define-public gnome-builder
   (package
     (name "gnome-builder")
-    (version "44.2")
+    (version "47.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -13657,7 +13657,7 @@ (define-public gnome-builder
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1c192xzjv5hsbp1p3wil595810k49kgmf5a7lwf260izip3qk9ng"))))
+                "15dlm6zvq54djx6h1z3jg21fw4v21dwh7i9db9k367nd8wybk1s6"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -13665,14 +13665,6 @@ (define-public gnome-builder
       #:configure-flags #~(list "-Dnetwork_tests=false" "-Ddocs=true")
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-source
-            (lambda _
-              ;; With Gnome 4.14, GtkStackPage has an autoptr already, so it'd
-              ;; get redefined.  Drop this phase when updating gnome-builder to
-              ;; 46.0 or newer.  See also
-              ;; <https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/7aaaecefc2ea8a37eaeae8b4d726d119d4eb8fa3>
-              (substitute* "src/libide/tweaks/ide-tweaks-window.c"
-                (("G_DEFINE_AUTOPTR_CLEANUP_FUNC \\(GtkStackPage, .*\\)") ""))))
           (add-after 'unpack 'patch-meson
             (lambda* (#:key inputs #:allow-other-keys)
               (substitute* "meson.build"
@@ -13714,6 +13706,7 @@ (define-public gnome-builder
            flatpak
            gspell
            gtk
+           gom
            json-glib
            jsonrpc-glib
            libadwaita
@@ -13721,9 +13714,10 @@ (define-public gnome-builder
            libdex
            libgit2-glib
            libpanel
-           libpeas
+           libpeas-2
            libportal
            libsoup
+           libspelling
            llvm
            libostree
            python
@@ -13738,6 +13732,10 @@ (define-public gnome-builder
      (list desktop-file-utils           ;for desktop-file-validate
            `(,glib "bin")
            gettext-minimal
+           ;; GCC 14 seems to be required to not end up in a compilation
+           ;; failure.
+           ;; See <https://gitlab.gnome.org/GNOME/gnome-builder/-/issues/2176>.
+           gcc-14
            gi-docgen
            pkg-config
            python                       ;for meson scripts
-- 
2.46.0

[bug#75167] [PATCH gnome-team 6/6] gnu: gnome-builder: Update to 47.2.

[Maxim Cournoyer]

Hello,

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

> * gnu/packages/gnome.scm (gnome-builder): Update to 47.2.
> [#:phases]: Drop ‘patch-source’:
> [inputs]: Add gom and libspelling.  Replace libpeas with libpeas-2.
> [native-inputs]: Add gcc-14.

[...]

>             gspell
>             gtk
> +           gom

Not added in alphabetical order.

>             json-glib
>             jsonrpc-glib
>             libadwaita
> @@ -13721,9 +13714,10 @@ (define-public gnome-builder
>             libdex
>             libgit2-glib
>             libpanel
> -           libpeas
> +           libpeas-2
>             libportal
>             libsoup
> +           libspelling
>             llvm
>             libostree
>             python
> @@ -13738,6 +13732,10 @@ (define-public gnome-builder
>       (list desktop-file-utils           ;for desktop-file-validate
>             `(,glib "bin")
>             gettext-minimal
> +           ;; GCC 14 seems to be required to not end up in a compilation
> +           ;; failure.
> +           ;; See <https://gitlab.gnome.org/GNOME/gnome-builder/-/issues/2176>.
> +           gcc-14

Alternatively, there's this small patch:
https://gitlab.gnome.org/-/project/426/uploads/3595cbe09fb9dd41d558a317251ca356/gdkrgba.patch;
perhaps could be applied in a substitute phase.  Not sure what is best here,
I'll leave it to your judgement.

-- 
Thanks,
Maxim

[bug#75167] [PATCH gnome-team 0/6] Update GNOME Builder to 47.2

[Maxim Cournoyer]

Hello,

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

> Hi folks,
>
> this series updates GNOME Builder to 47.2 (yes, that's 47.2, because
> I only found out that the issue affecting 46 builds also affects 47
> after updating everything else).  This is a WebkitGTK rebuilder courtesy
> of libdex getting bumped, so build carefully and don't overload your
> machines with work :)

Thank you!  I've posted some comments; feel free to adjust accordingly and push.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>

-- 
Thanks,
Maxim

bug#75167: [PATCH gnome-team 0/6] Update GNOME Builder to 47.2

[Liliana Marie Prikler]

Am Sonntag, dem 29.12.2024 um 13:38 +0900 schrieb Maxim Cournoyer:
> Hello,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > Hi folks,
> > 
> > this series updates GNOME Builder to 47.2 (yes, that's 47.2,
> > because I only found out that the issue affecting 46 builds also
> > affects 47 after updating everything else).  This is a WebkitGTK
> > rebuilder courtesy of libdex getting bumped, so build carefully and
> > don't overload your machines with work :)
> 
> Thank you!  I've posted some comments; feel free to adjust
> accordingly and push.
Pushed with according adjustments.

For libpeas, the pkg-config is versioned, causing other dependents to
break if we bump – thus, I'm simply using inherit.

Cheers

[bug#75167] [PATCH gnome-team 0/6] Update GNOME Builder to 47.2

[Maxim Cournoyer]

Hi Liliana,

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

> Am Sonntag, dem 29.12.2024 um 13:38 +0900 schrieb Maxim Cournoyer:
>> Hello,
>> 
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> 
>> > Hi folks,
>> > 
>> > this series updates GNOME Builder to 47.2 (yes, that's 47.2,
>> > because I only found out that the issue affecting 46 builds also
>> > affects 47 after updating everything else).  This is a WebkitGTK
>> > rebuilder courtesy of libdex getting bumped, so build carefully and
>> > don't overload your machines with work :)
>> 
>> Thank you!  I've posted some comments; feel free to adjust
>> accordingly and push.
> Pushed with according adjustments.
>
> For libpeas, the pkg-config is versioned, causing other dependents to
> break if we bump – thus, I'm simply using inherit.

Understood, makes sense.  And thank you for implementing my suggestion.

-- 
Thanks,
Maxim