[bug#61968] [PATCH 0/7] Update GNOME Builder

[bug#61968] [PATCH 0/7] Update GNOME Builder

[Vivien Kraus via Guix-patches via]

Dear guix,

I think it is time to update GNOME Builder! Now, due to the new dependency on
editorconfig, I had to move it to (gnu packages text-editors).

What do you think?

Best regards,

Vivien

Vivien Kraus (7):
  gnu: glib-next: Update to 2.75.4
  gnu: Add libpanel.
  gnu: gtksourceview: Update to 5.7.2.
  gnu: libpeas: Update to 1.34.0.
  gnu: template-glib: Update to 3.36.1.
  gnu: sysprof: Update to 3.46.0.
  gnu: gnome-builder: Update to 43.6.

 gnu/local.mk                                  |  1 +
 gnu/packages/glib.scm                         | 13 +--
 gnu/packages/gnome.scm                        | 83 +----------------
 gnu/packages/gtk.scm                          | 38 +++++++-
 .../patches/glib-next-skip-failing-test.patch | 25 ++++++
 gnu/packages/text-editors.scm                 | 90 +++++++++++++++++++
 6 files changed, 164 insertions(+), 86 deletions(-)
 create mode 100644 gnu/packages/patches/glib-next-skip-failing-test.patch


base-commit: d6045055720bc0763f8a079d75b941b4898349a4
-- 
2.39.1

[bug#61968] [PATCH 7/7] gnu: gnome-builder: Update to 43.6.

[Vivien Kraus via Guix-patches via]

Gnome-builder requires editorconfig, and that makes a cycle because (gnu
packages text-editors) imports (gnu packages gnome) already.

* gnu/packages/gnome.scm (gnome-builder): Move to (gnu packages text-editors)
and update to 43.6.
[inputs]: Remove glade3, libdazzle, libhandy, libsoup-minimal-2, and replace
devhelp-with-libsoup2 => devhelp, gtk+ => gtk, vte => vte-with-gtk-4.
[propagated-inputs]: Add webkitgtk-next.
---
 gnu/packages/gnome.scm        | 75 -----------------------------
 gnu/packages/text-editors.scm | 90 +++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 75 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 142735ab91..a8cac5cacb 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13198,81 +13198,6 @@ (define-public sysprof-3.44
                             (("gtk-update-icon-cache") "true")
                             (("update-desktop-database") "true"))))))))))
 
-(define-public gnome-builder
-  (package
-    (name "gnome-builder")
-    (version "42.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "02k78mamp1yf9y6wixd864hdf9saw83wdw01f80lhnw60avm2kax"))))
-    (build-system meson-build-system)
-    (arguments
-     (list
-      #:glib-or-gtk? #t                 ;To wrap binaries and compile schemas
-      #:configure-flags #~(list "-Dnetwork_tests=false")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-meson
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "build-aux/meson/post_install.py"
-                (("gtk-update-icon-cache") "true")
-                (("update-desktop-database") "true"))
-              (substitute* "src/libide/meson.build"
-                (("/usr/lib")
-                 (string-append #$(this-package-input "python-pygobject")
-                                "/lib")))))
-          (add-before 'check 'pre-check
-            (lambda _
-              (system "Xvfb :1 &")
-              (setenv "DISPLAY" ":1"))))))
-    (inputs
-     (list cmark
-           clang
-           devhelp-with-libsoup2
-           flatpak
-           glade3
-           gspell
-           gtk+
-           json-glib
-           jsonrpc-glib
-           libdazzle
-           libgit2-glib
-           libhandy
-           libpeas
-           libportal
-           libsoup-minimal-2
-           llvm
-           libostree
-           python
-           python-pygobject
-           sysprof-3.44
-           template-glib
-           vte
-           webkitgtk-with-libsoup2))
-    (propagated-inputs
-     (list gtksourceview-4))            ;needed for settings
-    (native-inputs
-     (list desktop-file-utils           ;for desktop-file-validate
-           `(,glib "bin")
-           gettext-minimal
-           pkg-config
-           python                       ;for meson scripts
-           vala
-           xorg-server-for-tests))
-    (home-page "https://wiki.gnome.org/Apps/Builder")
-    (synopsis "Toolsmith for GNOME-based applications")
-    (description
-     "Builder aims to be an integrated development environment (IDE) for
-writing GNOME-based software.  It features fuzzy search, auto-completion,
-a mini code map, documentation browsing, Git integration, an integrated
-profiler via Sysprof, debugging support, and more.")
-    (license license:gpl3+)))
-
 (define-public komikku
   (package
     (name "komikku")
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index e05a58c447..6ddb483dd5 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -79,8 +79,10 @@ (define-module (gnu packages text-editors)
   #:use-module (gnu packages libbsd)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages lua)
+  #:use-module (gnu packages markup)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pcre)
+  #:use-module (gnu packages package-management)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -95,6 +97,7 @@ (define-module (gnu packages text-editors)
   #:use-module (gnu packages terminals)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages version-control)
+  #:use-module (gnu packages webkit)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg))
 
@@ -1413,3 +1416,90 @@ (define-public xnedit
      "XNEdit is a fast and classic X11 text editor, based on NEdit,
 with full unicode support and antialiased text rendering.")
     (license license:gpl2+)))
+
+(define-public gnome-builder
+  (package
+    (name "gnome-builder")
+    (version "43.6")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/" name "/"
+                                  (version-major version) "/"
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1abplccsxdm2sf9zi856g3axykanr7sm0s12wkxm5jb8v4yj2kwv"))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:glib-or-gtk? #t                 ;To wrap binaries and compile schemas
+      #:configure-flags #~(list "-Dnetwork_tests=false")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'skip-gtk-update-icon-cache
+            (lambda _
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false"))))
+          (add-after 'unpack 'patch-meson
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "build-aux/meson/post_install.py"
+                (("gtk-update-icon-cache") "true")
+                (("update-desktop-database") "true"))
+              (substitute* "src/libide/meson.build"
+                (("/usr/lib")
+                 (string-append #$(this-package-input "python-pygobject")
+                                "/lib")))))
+          (add-after 'unpack 'disable-failing-tests
+            (lambda* _
+              (substitute* "src/tests/meson.build"
+                (("test\\('test-text-iter'")
+                 "# test('test-text-iter'")
+                (("test\\('test-shortcuts'")
+                 "# test('test-shortcuts'"))))
+          (add-before 'check 'pre-check
+            (lambda _
+              (system "Xvfb :1 &")
+              (setenv "DISPLAY" ":1"))))))
+    (inputs
+     (list cmark
+           clang
+           d-spy
+           devhelp
+           editorconfig-core-c
+           flatpak
+           glib-next
+           gspell
+           gtk
+           json-glib
+           jsonrpc-glib
+           libadwaita
+           libgit2-glib
+           libpanel
+           libpeas
+           libportal
+           llvm
+           libostree
+           python
+           python-pygobject
+           sysprof
+           template-glib
+           vte-with-gtk-4))
+    (propagated-inputs
+     (list gtksourceview webkitgtk-next))
+    (native-inputs
+     (list desktop-file-utils           ;for desktop-file-validate
+           `(,glib-next "bin")
+           gettext-minimal
+           pkg-config
+           python                       ;for meson scripts
+           vala
+           xorg-server-for-tests))
+    (home-page "https://wiki.gnome.org/Apps/Builder")
+    (synopsis "Toolsmith for GNOME-based applications")
+    (description
+     "Builder aims to be an integrated development environment (IDE) for
+writing GNOME-based software.  It features fuzzy search, auto-completion,
+a mini code map, documentation browsing, Git integration, an integrated
+profiler via Sysprof, debugging support, and more.")
+    (license license:gpl3+)))
-- 
2.39.1

[bug#61968] [PATCH 7/7] gnu: gnome-builder: Update to 43.6.

[Liliana Marie Prikler]

Am Samstag, dem 04.03.2023 um 18:39 +0100 schrieb Vivien Kraus:
> Gnome-builder requires editorconfig, and that makes a cycle because
> (gnu packages text-editors) imports (gnu packages gnome) already.
Even if this change is induced by the update, I'd probably split this
into two patches: First move gnome-builder, then update it.  That way,
the individual diffs ought to be a little more manageable.

> * gnu/packages/gnome.scm (gnome-builder): Move to (gnu packages text-
> editors)
> and update to 43.6.
> [inputs]: Remove glade3, libdazzle, libhandy, libsoup-minimal-2,
Place a dot after this.
> and replace
> devhelp-with-libsoup2 => devhelp, gtk+ => gtk, vte => vte-with-gtk-4.
Write out "Replace X with Y."
> [propagated-inputs]: Add webkitgtk-next.
Do we really need to?  (Why) Is a regular input not enough?

Cheers

[bug#61968] [PATCH 2/7] gnu: Add libpanel.

[Vivien Kraus via Guix-patches via]

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

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 5101976fb9..c0143e7878 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -3039,3 +3039,37 @@ (define-public webp-pixbuf-loader
     (synopsis "WebP GdkPixbuf loader library")
     (description "Webp-pixbuf-loader is a WebP format loader of GdkPixbuf.")
     (license license:lgpl2.0+)))
+
+(define-public libpanel
+  (package
+    (name "libpanel")
+    (version "1.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnome/sources/libpanel/"
+                           (version-major+minor version)
+                           "/libpanel-" version ".tar.xz"))
+       (sha256
+        (base32 "1faa8wi3v12rmsb12njkp8f8034p737l0w4aqxky1j72ad15av8z"))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'disable-gtk-update-icon-cache
+            (lambda _
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false"))))
+          (add-after 'unpack 'set-fontconfig-home
+            (lambda _
+              (setenv "HOME" (getcwd)))))))
+    (inputs (list gtk glib-next libadwaita))
+    (native-inputs
+     (list pkg-config gobject-introspection (list glib "bin") vala gi-docgen))
+    (synopsis "Dock and panel widgets for GTK")
+    (description "Libpanel provides widgets for panels, docks, columns and grids of pages, as
+needed to implement IDEs.")
+    (home-page "https://gitlab.gnome.org/GNOME/libpanel")
+    (license license:lgpl3+)))
-- 
2.39.1

[bug#61968] [PATCH 1/7] gnu: glib-next: Update to 2.75.4

[Vivien Kraus via Guix-patches via]

* gnu/packages/patches/glib-next-skip-failing-test.patch: New file.
* gnu/packages/glib.scm (glib-next): override patches and update to 2.75.4.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/glib.scm                         |  7 ++++--
 .../patches/glib-next-skip-failing-test.patch | 25 +++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/glib-next-skip-failing-test.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 415955bd3f..98b18f1026 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1209,6 +1209,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/glib-appinfo-watch.patch			\
   %D%/packages/patches/glib-networking-gnutls-binding.patch	\
   %D%/packages/patches/glib-networking-32-bit-time.patch	\
+  %D%/packages/patches/glib-next-skip-failing-test.patch	\
   %D%/packages/patches/glib-skip-failing-test.patch		\
   %D%/packages/patches/glibc-CVE-2019-7309.patch		\
   %D%/packages/patches/glibc-CVE-2019-9169.patch		\
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index f85d5e3225..8f9c5dff18 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -387,7 +387,7 @@ (define-public glib-next
   (package
     (inherit glib)
     (name "glib")
-    (version "2.73.3")
+    (version "2.75.4")
     (source
      (origin
        (inherit (package-source glib))
@@ -399,7 +399,10 @@ (define-public glib-next
         '(substitute* "glib/tests/spawn-test.c"
            (("/bin/sh") "sh")))
        (sha256
-        (base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz"))))
+        (base32 "1lbadg7s8jn189g5wzj15nnvbf1vp68c0dx9pnys63iwiyxj9khn"))
+       (patches
+        (search-patches "glib-appinfo-watch.patch"
+                        "glib-next-skip-failing-test.patch"))))
     (arguments
      (substitute-keyword-arguments (package-arguments glib)
        ((#:test-options test-options ''())
diff --git a/gnu/packages/patches/glib-next-skip-failing-test.patch b/gnu/packages/patches/glib-next-skip-failing-test.patch
new file mode 100644
index 0000000000..e8cbebeb84
--- /dev/null
+++ b/gnu/packages/patches/glib-next-skip-failing-test.patch
@@ -0,0 +1,25 @@
+diff -r -u glib-2.75.4/gio/tests/meson.build glib-fixed/gio/tests/meson.build
+--- glib-2.75.4/gio/tests/meson.build	1970-01-01 01:00:01.000000000 +0100
++++ glib-fixed/gio/tests/meson.build	2023-03-04 19:10:23.727876252 +0100
+@@ -205,9 +205,6 @@
+       'extra_sources' : ['gdbus-tests.c'],
+       'dependencies' : [dbus1_dep],
+     },
+-    'gdbus-server-auth' : {
+-      'dependencies' : [dbus1_dep],
+-    },
+   }
+ else
+   # We can build a cut-down version of this test without libdbus
+@@ -260,11 +257,6 @@
+       'extra_sources': ['../gportalsupport.c', '../gsandbox.c'],
+       'suite': ['portal-support'],
+     },
+-    'portal-support-snap' : {
+-      'extra_sources': ['../gportalsupport.c', '../gsandbox.c', 'portal-support-utils.c'],
+-      'c_args': ['-DG_PORTAL_SUPPORT_TEST'],
+-      'suite': ['portal-support'],
+-    },
+     'portal-support-snap-classic' : {
+       'extra_sources': ['../gportalsupport.c', '../gsandbox.c', 'portal-support-utils.c'],
+       'c_args': ['-DG_PORTAL_SUPPORT_TEST'],
-- 
2.39.1

[bug#61968] [PATCH 3/7] gnu: gtksourceview: Update to 5.7.2.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtksourceview): Update to 5.7.2.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index c0143e7878..2456347b26 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -668,7 +668,7 @@ (define-public gtksourceview-2
 (define-public gtksourceview
   (package
     (name "gtksourceview")
-    (version "5.5.1")
+    (version "5.7.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/gtksourceview/"
@@ -676,7 +676,7 @@ (define-public gtksourceview
                                   "gtksourceview-" version ".tar.xz"))
               (sha256
                (base32
-                "068dqhacvs65gnmrryahm6qs0q050admlpqqi1gy8wgh2p6qrraa"))))
+                "13nyiraq967q7awfjdikqll9vsmqg1gyzqgmf5ysiy7kkl95z4mz"))))
     (build-system meson-build-system)
     (arguments
      '(#:phases
-- 
2.39.1

[bug#61968] [PATCH 4/7] gnu: libpeas: Update to 1.34.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libpeas): Update to 1.34.0.
---
 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 a13fbb2436..f316fdb702 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3168,7 +3168,7 @@ (define-public libnotify
 (define-public libpeas
   (package
     (name "libpeas")
-    (version "1.32.0")
+    (version "1.34.0")
     (source
      (origin
        (method url-fetch)
@@ -3177,7 +3177,7 @@ (define-public libpeas
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "03ixrhfkywcb409dd0hybyb6i291phwy8si4kc17g29fl07m49fn"))))
+         "1w3v9abgn7pbappjagp6jid0drr5cqqyrnh7h0zavddlv8azf1a3"))))
     (build-system meson-build-system)
     (arguments
      '(#:phases
-- 
2.39.1

[bug#61968] [PATCH 5/7] gnu: template-glib: Update to 3.36.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/glib.scm (template-glib): Update to 3.36.1.
[configure-flags]: rename enable_gtk_doc option to gtk_doc.
---
 gnu/packages/glib.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 8f9c5dff18..a9040fd6fe 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -1329,7 +1329,7 @@ (define perl-net-dbus-glib
 (define-public template-glib
   (package
     (name "template-glib")
-    (version "3.34.0")
+    (version "3.36.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -1337,10 +1337,10 @@ (define-public template-glib
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1z9xkin5fyfh071ma9y045jcw83hgx33dfbjraw6cxk0qdmfysr1"))))
+                "00x5yq1yidxxv6hmlvblpp2k0vf60s0xzyi0psplbmss70bpl5iv"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-D" "enable_gtk_doc=true")))
+     `(#:configure-flags '("-D" "gtk_doc=true")))
     (inputs
      `(("gettext" ,gettext-minimal)
        ("glib" ,glib)
-- 
2.39.1

[bug#61968] [PATCH 6/7] gnu: sysprof: Update to 3.46.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (sysprof): Update to 3.46.0.
---
 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 f316fdb702..142735ab91 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13120,7 +13120,7 @@ (define-public feedbackd
 (define-public sysprof
   (package
     (name "sysprof")
-    (version "3.45.1")
+    (version "3.46.0")
     (source
      (origin
        (method url-fetch)
@@ -13128,7 +13128,7 @@ (define-public sysprof
                            (version-major+minor version) "/"
                            "sysprof-" version ".tar.xz"))
        (sha256
-        (base32 "16nmr1qs7s2ylhwj58zj6b7in72nw7z72glaz746f2g7dbqs00k4"))))
+        (base32 "0wa0ps9y8cqzcp6g0qh2i114sw5sq7yd45sv0w5xva2hh5bhshry"))))
     (build-system meson-build-system)
     (arguments
      (list
-- 
2.39.1

[bug#61968] [PATCH v2 0/8] Update GNOME Builder

[Vivien Kraus via Guix-patches via]

This second try fixes the commit messages, moves gnome-builder in a separate
commit, and does not consider webkitgtk as a propagated input.

Vivien Kraus (8):
  gnu: glib-next: Update to 2.75.4
  gnu: Add libpanel.
  gnu: gtksourceview: Update to 5.7.2.
  gnu: libpeas: Update to 1.34.0.
  gnu: template-glib: Update to 3.36.1.
  gnu: sysprof: Update to 3.46.0.
  gnu: gnome-builder: Move to (gnu packages text-editors).
  gnu: gnome-builder: Update to 43.6.

 gnu/local.mk                                  |  1 +
 gnu/packages/glib.scm                         | 13 +--
 gnu/packages/gnome.scm                        | 83 +----------------
 gnu/packages/gtk.scm                          | 38 +++++++-
 .../patches/glib-next-skip-failing-test.patch | 25 ++++++
 gnu/packages/text-editors.scm                 | 89 +++++++++++++++++++
 6 files changed, 163 insertions(+), 86 deletions(-)
 create mode 100644 gnu/packages/patches/glib-next-skip-failing-test.patch


base-commit: d6045055720bc0763f8a079d75b941b4898349a4
-- 
2.39.1

[bug#61968] [PATCH v2 8/8] gnu: gnome-builder: Update to 43.6.

[Vivien Kraus via Guix-patches via]

Gnome-builder requires editorconfig, and that makes a cycle because (gnu
packages text-editors) imports (gnu packages gnome) already.

* gnu/packages/text-editors.scm (gnome-builder): Update to 43.6.
[inputs]: Remove glade3, libdazzle, libhandy, libsoup-minimal-2. Replace
devhelp-with-libsoup2 with devhelp, gtk+ with gtk, vte with
vte-with-gtk-4. Add webkitgtk-next.
[propagated-inputs]: Upgrade gtksourceview-4 to gtksourceview.
[patch-meson]: meson.build needs to be configured not to search for
gtk-update-icon-cache (in addition to not running it at the end of the build).
[disable-failing-tests]: New phase.
---
 gnu/packages/text-editors.scm | 37 +++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index a581a30edf..fe1da39494 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -1420,7 +1420,7 @@ (define-public xnedit
 (define-public gnome-builder
   (package
     (name "gnome-builder")
-    (version "42.1")
+    (version "43.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -1428,7 +1428,7 @@ (define-public gnome-builder
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "02k78mamp1yf9y6wixd864hdf9saw83wdw01f80lhnw60avm2kax"))))
+                "1abplccsxdm2sf9zi856g3axykanr7sm0s12wkxm5jb8v4yj2kwv"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -1438,6 +1438,9 @@ (define-public gnome-builder
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-meson
             (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false"))
               (substitute* "build-aux/meson/post_install.py"
                 (("gtk-update-icon-cache") "true")
                 (("update-desktop-database") "true"))
@@ -1445,6 +1448,13 @@ (define-public gnome-builder
                 (("/usr/lib")
                  (string-append #$(this-package-input "python-pygobject")
                                 "/lib")))))
+          (add-after 'unpack 'disable-failing-tests
+            (lambda* _
+              (substitute* "src/tests/meson.build"
+                (("test\\('test-text-iter'")
+                 "# test('test-text-iter'")
+                (("test\\('test-shortcuts'")
+                 "# test('test-shortcuts'"))))
           (add-before 'check 'pre-check
             (lambda _
               (system "Xvfb :1 &")
@@ -1452,32 +1462,33 @@ (define-public gnome-builder
     (inputs
      (list cmark
            clang
-           devhelp-with-libsoup2
+           d-spy
+           devhelp
+           editorconfig-core-c
            flatpak
-           glade3
+           glib-next
            gspell
-           gtk+
+           gtk
            json-glib
            jsonrpc-glib
-           libdazzle
+           libadwaita
            libgit2-glib
-           libhandy
+           libpanel
            libpeas
            libportal
-           libsoup-minimal-2
            llvm
            libostree
            python
            python-pygobject
-           sysprof-3.44
+           sysprof
            template-glib
-           vte
-           webkitgtk-with-libsoup2))
+           vte-with-gtk-4
+           webkitgtk-next))
     (propagated-inputs
-     (list gtksourceview-4))            ;needed for settings
+     (list gtksourceview))              ;needed for settings
     (native-inputs
      (list desktop-file-utils           ;for desktop-file-validate
-           `(,glib "bin")
+           `(,glib-next "bin")
            gettext-minimal
            pkg-config
            python                       ;for meson scripts
-- 
2.39.1

[bug#61968] [PATCH v2 2/8] gnu: Add libpanel.

[Vivien Kraus via Guix-patches via]

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

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 5101976fb9..c0143e7878 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -3039,3 +3039,37 @@ (define-public webp-pixbuf-loader
     (synopsis "WebP GdkPixbuf loader library")
     (description "Webp-pixbuf-loader is a WebP format loader of GdkPixbuf.")
     (license license:lgpl2.0+)))
+
+(define-public libpanel
+  (package
+    (name "libpanel")
+    (version "1.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnome/sources/libpanel/"
+                           (version-major+minor version)
+                           "/libpanel-" version ".tar.xz"))
+       (sha256
+        (base32 "1faa8wi3v12rmsb12njkp8f8034p737l0w4aqxky1j72ad15av8z"))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'disable-gtk-update-icon-cache
+            (lambda _
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false"))))
+          (add-after 'unpack 'set-fontconfig-home
+            (lambda _
+              (setenv "HOME" (getcwd)))))))
+    (inputs (list gtk glib-next libadwaita))
+    (native-inputs
+     (list pkg-config gobject-introspection (list glib "bin") vala gi-docgen))
+    (synopsis "Dock and panel widgets for GTK")
+    (description "Libpanel provides widgets for panels, docks, columns and grids of pages, as
+needed to implement IDEs.")
+    (home-page "https://gitlab.gnome.org/GNOME/libpanel")
+    (license license:lgpl3+)))
-- 
2.39.1

[bug#61968] [PATCH v2 1/8] gnu: glib-next: Update to 2.75.4

[Vivien Kraus via Guix-patches via]

* gnu/packages/patches/glib-next-skip-failing-test.patch: New file.
* gnu/packages/glib.scm (glib-next): override patches and update to 2.75.4.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/glib.scm                         |  7 ++++--
 .../patches/glib-next-skip-failing-test.patch | 25 +++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/glib-next-skip-failing-test.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 415955bd3f..98b18f1026 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1209,6 +1209,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/glib-appinfo-watch.patch			\
   %D%/packages/patches/glib-networking-gnutls-binding.patch	\
   %D%/packages/patches/glib-networking-32-bit-time.patch	\
+  %D%/packages/patches/glib-next-skip-failing-test.patch	\
   %D%/packages/patches/glib-skip-failing-test.patch		\
   %D%/packages/patches/glibc-CVE-2019-7309.patch		\
   %D%/packages/patches/glibc-CVE-2019-9169.patch		\
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index f85d5e3225..8f9c5dff18 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -387,7 +387,7 @@ (define-public glib-next
   (package
     (inherit glib)
     (name "glib")
-    (version "2.73.3")
+    (version "2.75.4")
     (source
      (origin
        (inherit (package-source glib))
@@ -399,7 +399,10 @@ (define-public glib-next
         '(substitute* "glib/tests/spawn-test.c"
            (("/bin/sh") "sh")))
        (sha256
-        (base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz"))))
+        (base32 "1lbadg7s8jn189g5wzj15nnvbf1vp68c0dx9pnys63iwiyxj9khn"))
+       (patches
+        (search-patches "glib-appinfo-watch.patch"
+                        "glib-next-skip-failing-test.patch"))))
     (arguments
      (substitute-keyword-arguments (package-arguments glib)
        ((#:test-options test-options ''())
diff --git a/gnu/packages/patches/glib-next-skip-failing-test.patch b/gnu/packages/patches/glib-next-skip-failing-test.patch
new file mode 100644
index 0000000000..e8cbebeb84
--- /dev/null
+++ b/gnu/packages/patches/glib-next-skip-failing-test.patch
@@ -0,0 +1,25 @@
+diff -r -u glib-2.75.4/gio/tests/meson.build glib-fixed/gio/tests/meson.build
+--- glib-2.75.4/gio/tests/meson.build	1970-01-01 01:00:01.000000000 +0100
++++ glib-fixed/gio/tests/meson.build	2023-03-04 19:10:23.727876252 +0100
+@@ -205,9 +205,6 @@
+       'extra_sources' : ['gdbus-tests.c'],
+       'dependencies' : [dbus1_dep],
+     },
+-    'gdbus-server-auth' : {
+-      'dependencies' : [dbus1_dep],
+-    },
+   }
+ else
+   # We can build a cut-down version of this test without libdbus
+@@ -260,11 +257,6 @@
+       'extra_sources': ['../gportalsupport.c', '../gsandbox.c'],
+       'suite': ['portal-support'],
+     },
+-    'portal-support-snap' : {
+-      'extra_sources': ['../gportalsupport.c', '../gsandbox.c', 'portal-support-utils.c'],
+-      'c_args': ['-DG_PORTAL_SUPPORT_TEST'],
+-      'suite': ['portal-support'],
+-    },
+     'portal-support-snap-classic' : {
+       'extra_sources': ['../gportalsupport.c', '../gsandbox.c', 'portal-support-utils.c'],
+       'c_args': ['-DG_PORTAL_SUPPORT_TEST'],
-- 
2.39.1

[bug#61968] [PATCH v2 3/8] gnu: gtksourceview: Update to 5.7.2.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtksourceview): Update to 5.7.2.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index c0143e7878..2456347b26 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -668,7 +668,7 @@ (define-public gtksourceview-2
 (define-public gtksourceview
   (package
     (name "gtksourceview")
-    (version "5.5.1")
+    (version "5.7.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/gtksourceview/"
@@ -676,7 +676,7 @@ (define-public gtksourceview
                                   "gtksourceview-" version ".tar.xz"))
               (sha256
                (base32
-                "068dqhacvs65gnmrryahm6qs0q050admlpqqi1gy8wgh2p6qrraa"))))
+                "13nyiraq967q7awfjdikqll9vsmqg1gyzqgmf5ysiy7kkl95z4mz"))))
     (build-system meson-build-system)
     (arguments
      '(#:phases
-- 
2.39.1

[bug#61968] [PATCH v2 4/8] gnu: libpeas: Update to 1.34.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libpeas): Update to 1.34.0.
---
 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 a13fbb2436..f316fdb702 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3168,7 +3168,7 @@ (define-public libnotify
 (define-public libpeas
   (package
     (name "libpeas")
-    (version "1.32.0")
+    (version "1.34.0")
     (source
      (origin
        (method url-fetch)
@@ -3177,7 +3177,7 @@ (define-public libpeas
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "03ixrhfkywcb409dd0hybyb6i291phwy8si4kc17g29fl07m49fn"))))
+         "1w3v9abgn7pbappjagp6jid0drr5cqqyrnh7h0zavddlv8azf1a3"))))
     (build-system meson-build-system)
     (arguments
      '(#:phases
-- 
2.39.1

[bug#61968] [PATCH v2 5/8] gnu: template-glib: Update to 3.36.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/glib.scm (template-glib): Update to 3.36.1.
[configure-flags]: rename enable_gtk_doc option to gtk_doc.
---
 gnu/packages/glib.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 8f9c5dff18..a9040fd6fe 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -1329,7 +1329,7 @@ (define perl-net-dbus-glib
 (define-public template-glib
   (package
     (name "template-glib")
-    (version "3.34.0")
+    (version "3.36.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -1337,10 +1337,10 @@ (define-public template-glib
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1z9xkin5fyfh071ma9y045jcw83hgx33dfbjraw6cxk0qdmfysr1"))))
+                "00x5yq1yidxxv6hmlvblpp2k0vf60s0xzyi0psplbmss70bpl5iv"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-D" "enable_gtk_doc=true")))
+     `(#:configure-flags '("-D" "gtk_doc=true")))
     (inputs
      `(("gettext" ,gettext-minimal)
        ("glib" ,glib)
-- 
2.39.1

[bug#61968] [PATCH v2 6/8] gnu: sysprof: Update to 3.46.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (sysprof): Update to 3.46.0.
---
 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 f316fdb702..142735ab91 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13120,7 +13120,7 @@ (define-public feedbackd
 (define-public sysprof
   (package
     (name "sysprof")
-    (version "3.45.1")
+    (version "3.46.0")
     (source
      (origin
        (method url-fetch)
@@ -13128,7 +13128,7 @@ (define-public sysprof
                            (version-major+minor version) "/"
                            "sysprof-" version ".tar.xz"))
        (sha256
-        (base32 "16nmr1qs7s2ylhwj58zj6b7in72nw7z72glaz746f2g7dbqs00k4"))))
+        (base32 "0wa0ps9y8cqzcp6g0qh2i114sw5sq7yd45sv0w5xva2hh5bhshry"))))
     (build-system meson-build-system)
     (arguments
      (list
-- 
2.39.1

[bug#61968] [PATCH v2 7/8] gnu: gnome-builder: Move to (gnu packages text-editors).

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (gnome-builder): Move to (gnu packages text-editors).
---
 gnu/packages/gnome.scm        | 75 ---------------------------------
 gnu/packages/text-editors.scm | 78 +++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 142735ab91..a8cac5cacb 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13198,81 +13198,6 @@ (define-public sysprof-3.44
                             (("gtk-update-icon-cache") "true")
                             (("update-desktop-database") "true"))))))))))
 
-(define-public gnome-builder
-  (package
-    (name "gnome-builder")
-    (version "42.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "02k78mamp1yf9y6wixd864hdf9saw83wdw01f80lhnw60avm2kax"))))
-    (build-system meson-build-system)
-    (arguments
-     (list
-      #:glib-or-gtk? #t                 ;To wrap binaries and compile schemas
-      #:configure-flags #~(list "-Dnetwork_tests=false")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-meson
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "build-aux/meson/post_install.py"
-                (("gtk-update-icon-cache") "true")
-                (("update-desktop-database") "true"))
-              (substitute* "src/libide/meson.build"
-                (("/usr/lib")
-                 (string-append #$(this-package-input "python-pygobject")
-                                "/lib")))))
-          (add-before 'check 'pre-check
-            (lambda _
-              (system "Xvfb :1 &")
-              (setenv "DISPLAY" ":1"))))))
-    (inputs
-     (list cmark
-           clang
-           devhelp-with-libsoup2
-           flatpak
-           glade3
-           gspell
-           gtk+
-           json-glib
-           jsonrpc-glib
-           libdazzle
-           libgit2-glib
-           libhandy
-           libpeas
-           libportal
-           libsoup-minimal-2
-           llvm
-           libostree
-           python
-           python-pygobject
-           sysprof-3.44
-           template-glib
-           vte
-           webkitgtk-with-libsoup2))
-    (propagated-inputs
-     (list gtksourceview-4))            ;needed for settings
-    (native-inputs
-     (list desktop-file-utils           ;for desktop-file-validate
-           `(,glib "bin")
-           gettext-minimal
-           pkg-config
-           python                       ;for meson scripts
-           vala
-           xorg-server-for-tests))
-    (home-page "https://wiki.gnome.org/Apps/Builder")
-    (synopsis "Toolsmith for GNOME-based applications")
-    (description
-     "Builder aims to be an integrated development environment (IDE) for
-writing GNOME-based software.  It features fuzzy search, auto-completion,
-a mini code map, documentation browsing, Git integration, an integrated
-profiler via Sysprof, debugging support, and more.")
-    (license license:gpl3+)))
-
 (define-public komikku
   (package
     (name "komikku")
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index e05a58c447..a581a30edf 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -79,8 +79,10 @@ (define-module (gnu packages text-editors)
   #:use-module (gnu packages libbsd)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages lua)
+  #:use-module (gnu packages markup)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pcre)
+  #:use-module (gnu packages package-management)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -95,6 +97,7 @@ (define-module (gnu packages text-editors)
   #:use-module (gnu packages terminals)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages version-control)
+  #:use-module (gnu packages webkit)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg))
 
@@ -1413,3 +1416,78 @@ (define-public xnedit
      "XNEdit is a fast and classic X11 text editor, based on NEdit,
 with full unicode support and antialiased text rendering.")
     (license license:gpl2+)))
+
+(define-public gnome-builder
+  (package
+    (name "gnome-builder")
+    (version "42.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/" name "/"
+                                  (version-major version) "/"
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "02k78mamp1yf9y6wixd864hdf9saw83wdw01f80lhnw60avm2kax"))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:glib-or-gtk? #t                 ;To wrap binaries and compile schemas
+      #:configure-flags #~(list "-Dnetwork_tests=false")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-meson
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "build-aux/meson/post_install.py"
+                (("gtk-update-icon-cache") "true")
+                (("update-desktop-database") "true"))
+              (substitute* "src/libide/meson.build"
+                (("/usr/lib")
+                 (string-append #$(this-package-input "python-pygobject")
+                                "/lib")))))
+          (add-before 'check 'pre-check
+            (lambda _
+              (system "Xvfb :1 &")
+              (setenv "DISPLAY" ":1"))))))
+    (inputs
+     (list cmark
+           clang
+           devhelp-with-libsoup2
+           flatpak
+           glade3
+           gspell
+           gtk+
+           json-glib
+           jsonrpc-glib
+           libdazzle
+           libgit2-glib
+           libhandy
+           libpeas
+           libportal
+           libsoup-minimal-2
+           llvm
+           libostree
+           python
+           python-pygobject
+           sysprof-3.44
+           template-glib
+           vte
+           webkitgtk-with-libsoup2))
+    (propagated-inputs
+     (list gtksourceview-4))            ;needed for settings
+    (native-inputs
+     (list desktop-file-utils           ;for desktop-file-validate
+           `(,glib "bin")
+           gettext-minimal
+           pkg-config
+           python                       ;for meson scripts
+           vala
+           xorg-server-for-tests))
+    (home-page "https://wiki.gnome.org/Apps/Builder")
+    (synopsis "Toolsmith for GNOME-based applications")
+    (description
+     "Builder aims to be an integrated development environment (IDE) for
+writing GNOME-based software.  It features fuzzy search, auto-completion,
+a mini code map, documentation browsing, Git integration, an integrated
+profiler via Sysprof, debugging support, and more.")
+    (license license:gpl3+)))
-- 
2.39.1

[bug#61968] [PATCH v3 00/12] Update GNOME Builder to 43.6

[Vivien Kraus via Guix-patches via]

Dear guix,

Thank you so much for the website at qa.guix.gnu.org. It told me that libpanel
description was not wrapped properly, and that a few packages unrelated to
GNOME Builder failed to build. I believe I got them working again.

Best regards, Vivien

Vivien Kraus (12):
  gnu: sbcl-cl-cffi-gtk: Use pango-next.
  gnu: glib-next: Update to 2.75.4
  gnu: Add libpanel.
  gnu: gnome-calculator: Use glib-next.
  gnu: gnome-text-editor: Use glib-next.
  gnu: textpieces: Use glib-next.
  gnu: gtksourceview: Update to 5.7.2.
  gnu: libpeas: Update to 1.34.0.
  gnu: template-glib: Update to 3.36.1.
  gnu: sysprof: Update to 3.46.0.
  gnu: gnome-builder: Move to (gnu packages text-editors).
  gnu: gnome-builder: Update to 43.6.

 gnu/local.mk                                  |  1 +
 gnu/packages/glib.scm                         | 13 ++-
 gnu/packages/gnome.scm                        | 92 ++----------------
 gnu/packages/gtk.scm                          | 38 +++++++-
 gnu/packages/lisp-xyz.scm                     |  2 +-
 .../patches/glib-next-skip-failing-test.patch | 25 +++++
 gnu/packages/text-editors.scm                 | 94 ++++++++++++++++++-
 7 files changed, 172 insertions(+), 93 deletions(-)
 create mode 100644 gnu/packages/patches/glib-next-skip-failing-test.patch


base-commit: d6045055720bc0763f8a079d75b941b4898349a4
-- 
2.39.1

[bug#61968] [PATCH v3 12/12] gnu: gnome-builder: Update to 43.6.

[Vivien Kraus via Guix-patches via]

Gnome-builder requires editorconfig, and that makes a cycle because (gnu
packages text-editors) imports (gnu packages gnome) already.

* gnu/packages/text-editors.scm (gnome-builder): Update to 43.6.
[inputs]: Remove glade3, libdazzle, libhandy, libsoup-minimal-2. Replace
devhelp-with-libsoup2 with devhelp, gtk+ with gtk, vte with
vte-with-gtk-4. Add webkitgtk-next.
[propagated-inputs]: Upgrade gtksourceview-4 to gtksourceview.
[patch-meson]: meson.build needs to be configured not to search for
gtk-update-icon-cache (in addition to not running it at the end of the build).
[disable-failing-tests]: New phase.
---
 gnu/packages/text-editors.scm | 37 +++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 07a9f904db..cd893f2ea7 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -1421,7 +1421,7 @@ (define-public xnedit
 (define-public gnome-builder
   (package
     (name "gnome-builder")
-    (version "42.1")
+    (version "43.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -1429,7 +1429,7 @@ (define-public gnome-builder
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "02k78mamp1yf9y6wixd864hdf9saw83wdw01f80lhnw60avm2kax"))))
+                "1abplccsxdm2sf9zi856g3axykanr7sm0s12wkxm5jb8v4yj2kwv"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -1439,6 +1439,9 @@ (define-public gnome-builder
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-meson
             (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false"))
               (substitute* "build-aux/meson/post_install.py"
                 (("gtk-update-icon-cache") "true")
                 (("update-desktop-database") "true"))
@@ -1446,6 +1449,13 @@ (define-public gnome-builder
                 (("/usr/lib")
                  (string-append #$(this-package-input "python-pygobject")
                                 "/lib")))))
+          (add-after 'unpack 'disable-failing-tests
+            (lambda* _
+              (substitute* "src/tests/meson.build"
+                (("test\\('test-text-iter'")
+                 "# test('test-text-iter'")
+                (("test\\('test-shortcuts'")
+                 "# test('test-shortcuts'"))))
           (add-before 'check 'pre-check
             (lambda _
               (system "Xvfb :1 &")
@@ -1453,32 +1463,33 @@ (define-public gnome-builder
     (inputs
      (list cmark
            clang
-           devhelp-with-libsoup2
+           d-spy
+           devhelp
+           editorconfig-core-c
            flatpak
-           glade3
+           glib-next
            gspell
-           gtk+
+           gtk
            json-glib
            jsonrpc-glib
-           libdazzle
+           libadwaita
            libgit2-glib
-           libhandy
+           libpanel
            libpeas
            libportal
-           libsoup-minimal-2
            llvm
            libostree
            python
            python-pygobject
-           sysprof-3.44
+           sysprof
            template-glib
-           vte
-           webkitgtk-with-libsoup2))
+           vte-with-gtk-4
+           webkitgtk-next))
     (propagated-inputs
-     (list gtksourceview-4))            ;needed for settings
+     (list gtksourceview))              ;needed for settings
     (native-inputs
      (list desktop-file-utils           ;for desktop-file-validate
-           `(,glib "bin")
+           `(,glib-next "bin")
            gettext-minimal
            pkg-config
            python                       ;for meson scripts
-- 
2.39.1

[bug#61968] [PATCH v3 03/12] gnu: Add libpanel.

[Vivien Kraus via Guix-patches via]

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

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 5101976fb9..ab21ed0bf9 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -3039,3 +3039,37 @@ (define-public webp-pixbuf-loader
     (synopsis "WebP GdkPixbuf loader library")
     (description "Webp-pixbuf-loader is a WebP format loader of GdkPixbuf.")
     (license license:lgpl2.0+)))
+
+(define-public libpanel
+  (package
+    (name "libpanel")
+    (version "1.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnome/sources/libpanel/"
+                           (version-major+minor version)
+                           "/libpanel-" version ".tar.xz"))
+       (sha256
+        (base32 "1faa8wi3v12rmsb12njkp8f8034p737l0w4aqxky1j72ad15av8z"))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'disable-gtk-update-icon-cache
+            (lambda _
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false"))))
+          (add-after 'unpack 'set-fontconfig-home
+            (lambda _
+              (setenv "HOME" (getcwd)))))))
+    (inputs (list gtk glib-next libadwaita))
+    (native-inputs
+     (list pkg-config gobject-introspection (list glib "bin") vala gi-docgen))
+    (synopsis "Dock and panel widgets for GTK")
+    (description "Libpanel provides widgets for panels, docks, columns and
+grids of pages, as needed to implement IDEs.")
+    (home-page "https://gitlab.gnome.org/GNOME/libpanel")
+    (license license:lgpl3+)))
-- 
2.39.1

[bug#61968] [PATCH v3 02/12] gnu: glib-next: Update to 2.75.4

[Vivien Kraus via Guix-patches via]

* gnu/packages/patches/glib-next-skip-failing-test.patch: New file.
* gnu/packages/glib.scm (glib-next): override patches and update to 2.75.4.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/glib.scm                         |  7 ++++--
 .../patches/glib-next-skip-failing-test.patch | 25 +++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/glib-next-skip-failing-test.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 415955bd3f..98b18f1026 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1209,6 +1209,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/glib-appinfo-watch.patch			\
   %D%/packages/patches/glib-networking-gnutls-binding.patch	\
   %D%/packages/patches/glib-networking-32-bit-time.patch	\
+  %D%/packages/patches/glib-next-skip-failing-test.patch	\
   %D%/packages/patches/glib-skip-failing-test.patch		\
   %D%/packages/patches/glibc-CVE-2019-7309.patch		\
   %D%/packages/patches/glibc-CVE-2019-9169.patch		\
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index f85d5e3225..8f9c5dff18 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -387,7 +387,7 @@ (define-public glib-next
   (package
     (inherit glib)
     (name "glib")
-    (version "2.73.3")
+    (version "2.75.4")
     (source
      (origin
        (inherit (package-source glib))
@@ -399,7 +399,10 @@ (define-public glib-next
         '(substitute* "glib/tests/spawn-test.c"
            (("/bin/sh") "sh")))
        (sha256
-        (base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz"))))
+        (base32 "1lbadg7s8jn189g5wzj15nnvbf1vp68c0dx9pnys63iwiyxj9khn"))
+       (patches
+        (search-patches "glib-appinfo-watch.patch"
+                        "glib-next-skip-failing-test.patch"))))
     (arguments
      (substitute-keyword-arguments (package-arguments glib)
        ((#:test-options test-options ''())
diff --git a/gnu/packages/patches/glib-next-skip-failing-test.patch b/gnu/packages/patches/glib-next-skip-failing-test.patch
new file mode 100644
index 0000000000..e8cbebeb84
--- /dev/null
+++ b/gnu/packages/patches/glib-next-skip-failing-test.patch
@@ -0,0 +1,25 @@
+diff -r -u glib-2.75.4/gio/tests/meson.build glib-fixed/gio/tests/meson.build
+--- glib-2.75.4/gio/tests/meson.build	1970-01-01 01:00:01.000000000 +0100
++++ glib-fixed/gio/tests/meson.build	2023-03-04 19:10:23.727876252 +0100
+@@ -205,9 +205,6 @@
+       'extra_sources' : ['gdbus-tests.c'],
+       'dependencies' : [dbus1_dep],
+     },
+-    'gdbus-server-auth' : {
+-      'dependencies' : [dbus1_dep],
+-    },
+   }
+ else
+   # We can build a cut-down version of this test without libdbus
+@@ -260,11 +257,6 @@
+       'extra_sources': ['../gportalsupport.c', '../gsandbox.c'],
+       'suite': ['portal-support'],
+     },
+-    'portal-support-snap' : {
+-      'extra_sources': ['../gportalsupport.c', '../gsandbox.c', 'portal-support-utils.c'],
+-      'c_args': ['-DG_PORTAL_SUPPORT_TEST'],
+-      'suite': ['portal-support'],
+-    },
+     'portal-support-snap-classic' : {
+       'extra_sources': ['../gportalsupport.c', '../gsandbox.c', 'portal-support-utils.c'],
+       'c_args': ['-DG_PORTAL_SUPPORT_TEST'],
-- 
2.39.1

[bug#61968] [PATCH v3 07/12] gnu: gtksourceview: Update to 5.7.2.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gtk.scm (gtksourceview): Update to 5.7.2.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index ab21ed0bf9..8346015338 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -668,7 +668,7 @@ (define-public gtksourceview-2
 (define-public gtksourceview
   (package
     (name "gtksourceview")
-    (version "5.5.1")
+    (version "5.7.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/gtksourceview/"
@@ -676,7 +676,7 @@ (define-public gtksourceview
                                   "gtksourceview-" version ".tar.xz"))
               (sha256
                (base32
-                "068dqhacvs65gnmrryahm6qs0q050admlpqqi1gy8wgh2p6qrraa"))))
+                "13nyiraq967q7awfjdikqll9vsmqg1gyzqgmf5ysiy7kkl95z4mz"))))
     (build-system meson-build-system)
     (arguments
      '(#:phases
-- 
2.39.1

[bug#61968] [PATCH v3 08/12] gnu: libpeas: Update to 1.34.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libpeas): Update to 1.34.0.
---
 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 58144de3bf..1c1ac71a58 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3168,7 +3168,7 @@ (define-public libnotify
 (define-public libpeas
   (package
     (name "libpeas")
-    (version "1.32.0")
+    (version "1.34.0")
     (source
      (origin
        (method url-fetch)
@@ -3177,7 +3177,7 @@ (define-public libpeas
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "03ixrhfkywcb409dd0hybyb6i291phwy8si4kc17g29fl07m49fn"))))
+         "1w3v9abgn7pbappjagp6jid0drr5cqqyrnh7h0zavddlv8azf1a3"))))
     (build-system meson-build-system)
     (arguments
      '(#:phases
-- 
2.39.1

[bug#61968] [PATCH v3 09/12] gnu: template-glib: Update to 3.36.1.

[Vivien Kraus via Guix-patches via]

* gnu/packages/glib.scm (template-glib): Update to 3.36.1.
[configure-flags]: rename enable_gtk_doc option to gtk_doc.
---
 gnu/packages/glib.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 8f9c5dff18..a9040fd6fe 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -1329,7 +1329,7 @@ (define perl-net-dbus-glib
 (define-public template-glib
   (package
     (name "template-glib")
-    (version "3.34.0")
+    (version "3.36.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -1337,10 +1337,10 @@ (define-public template-glib
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1z9xkin5fyfh071ma9y045jcw83hgx33dfbjraw6cxk0qdmfysr1"))))
+                "00x5yq1yidxxv6hmlvblpp2k0vf60s0xzyi0psplbmss70bpl5iv"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-D" "enable_gtk_doc=true")))
+     `(#:configure-flags '("-D" "gtk_doc=true")))
     (inputs
      `(("gettext" ,gettext-minimal)
        ("glib" ,glib)
-- 
2.39.1

[bug#61968] [PATCH v3 10/12] gnu: sysprof: Update to 3.46.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (sysprof): Update to 3.46.0.
---
 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 1c1ac71a58..7a92192cbf 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13121,7 +13121,7 @@ (define-public feedbackd
 (define-public sysprof
   (package
     (name "sysprof")
-    (version "3.45.1")
+    (version "3.46.0")
     (source
      (origin
        (method url-fetch)
@@ -13129,7 +13129,7 @@ (define-public sysprof
                            (version-major+minor version) "/"
                            "sysprof-" version ".tar.xz"))
        (sha256
-        (base32 "16nmr1qs7s2ylhwj58zj6b7in72nw7z72glaz746f2g7dbqs00k4"))))
+        (base32 "0wa0ps9y8cqzcp6g0qh2i114sw5sq7yd45sv0w5xva2hh5bhshry"))))
     (build-system meson-build-system)
     (arguments
      (list
-- 
2.39.1

[bug#61968] [PATCH v3 11/12] gnu: gnome-builder: Move to (gnu packages text-editors).

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (gnome-builder): Move to (gnu packages text-editors).
---
 gnu/packages/gnome.scm        | 75 ---------------------------------
 gnu/packages/text-editors.scm | 78 +++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7a92192cbf..ad3bd28ea6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13199,81 +13199,6 @@ (define-public sysprof-3.44
                             (("gtk-update-icon-cache") "true")
                             (("update-desktop-database") "true"))))))))))
 
-(define-public gnome-builder
-  (package
-    (name "gnome-builder")
-    (version "42.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "02k78mamp1yf9y6wixd864hdf9saw83wdw01f80lhnw60avm2kax"))))
-    (build-system meson-build-system)
-    (arguments
-     (list
-      #:glib-or-gtk? #t                 ;To wrap binaries and compile schemas
-      #:configure-flags #~(list "-Dnetwork_tests=false")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-meson
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "build-aux/meson/post_install.py"
-                (("gtk-update-icon-cache") "true")
-                (("update-desktop-database") "true"))
-              (substitute* "src/libide/meson.build"
-                (("/usr/lib")
-                 (string-append #$(this-package-input "python-pygobject")
-                                "/lib")))))
-          (add-before 'check 'pre-check
-            (lambda _
-              (system "Xvfb :1 &")
-              (setenv "DISPLAY" ":1"))))))
-    (inputs
-     (list cmark
-           clang
-           devhelp-with-libsoup2
-           flatpak
-           glade3
-           gspell
-           gtk+
-           json-glib
-           jsonrpc-glib
-           libdazzle
-           libgit2-glib
-           libhandy
-           libpeas
-           libportal
-           libsoup-minimal-2
-           llvm
-           libostree
-           python
-           python-pygobject
-           sysprof-3.44
-           template-glib
-           vte
-           webkitgtk-with-libsoup2))
-    (propagated-inputs
-     (list gtksourceview-4))            ;needed for settings
-    (native-inputs
-     (list desktop-file-utils           ;for desktop-file-validate
-           `(,glib "bin")
-           gettext-minimal
-           pkg-config
-           python                       ;for meson scripts
-           vala
-           xorg-server-for-tests))
-    (home-page "https://wiki.gnome.org/Apps/Builder")
-    (synopsis "Toolsmith for GNOME-based applications")
-    (description
-     "Builder aims to be an integrated development environment (IDE) for
-writing GNOME-based software.  It features fuzzy search, auto-completion,
-a mini code map, documentation browsing, Git integration, an integrated
-profiler via Sysprof, debugging support, and more.")
-    (license license:gpl3+)))
-
 (define-public komikku
   (package
     (name "komikku")
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 2c300467b5..07a9f904db 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -79,8 +79,10 @@ (define-module (gnu packages text-editors)
   #:use-module (gnu packages libbsd)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages lua)
+  #:use-module (gnu packages markup)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pcre)
+  #:use-module (gnu packages package-management)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -95,6 +97,7 @@ (define-module (gnu packages text-editors)
   #:use-module (gnu packages terminals)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages version-control)
+  #:use-module (gnu packages webkit)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg))
 
@@ -1414,3 +1417,78 @@ (define-public xnedit
      "XNEdit is a fast and classic X11 text editor, based on NEdit,
 with full unicode support and antialiased text rendering.")
     (license license:gpl2+)))
+
+(define-public gnome-builder
+  (package
+    (name "gnome-builder")
+    (version "42.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/" name "/"
+                                  (version-major version) "/"
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "02k78mamp1yf9y6wixd864hdf9saw83wdw01f80lhnw60avm2kax"))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:glib-or-gtk? #t                 ;To wrap binaries and compile schemas
+      #:configure-flags #~(list "-Dnetwork_tests=false")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-meson
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "build-aux/meson/post_install.py"
+                (("gtk-update-icon-cache") "true")
+                (("update-desktop-database") "true"))
+              (substitute* "src/libide/meson.build"
+                (("/usr/lib")
+                 (string-append #$(this-package-input "python-pygobject")
+                                "/lib")))))
+          (add-before 'check 'pre-check
+            (lambda _
+              (system "Xvfb :1 &")
+              (setenv "DISPLAY" ":1"))))))
+    (inputs
+     (list cmark
+           clang
+           devhelp-with-libsoup2
+           flatpak
+           glade3
+           gspell
+           gtk+
+           json-glib
+           jsonrpc-glib
+           libdazzle
+           libgit2-glib
+           libhandy
+           libpeas
+           libportal
+           libsoup-minimal-2
+           llvm
+           libostree
+           python
+           python-pygobject
+           sysprof-3.44
+           template-glib
+           vte
+           webkitgtk-with-libsoup2))
+    (propagated-inputs
+     (list gtksourceview-4))            ;needed for settings
+    (native-inputs
+     (list desktop-file-utils           ;for desktop-file-validate
+           `(,glib "bin")
+           gettext-minimal
+           pkg-config
+           python                       ;for meson scripts
+           vala
+           xorg-server-for-tests))
+    (home-page "https://wiki.gnome.org/Apps/Builder")
+    (synopsis "Toolsmith for GNOME-based applications")
+    (description
+     "Builder aims to be an integrated development environment (IDE) for
+writing GNOME-based software.  It features fuzzy search, auto-completion,
+a mini code map, documentation browsing, Git integration, an integrated
+profiler via Sysprof, debugging support, and more.")
+    (license license:gpl3+)))
-- 
2.39.1

[bug#61968] [PATCH v3 04/12] gnu: gnome-calculator: Use glib-next.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (gnome-calculator) [native-inputs, inputs]:
Gtksourceview 5 requires glib-next.
---
 gnu/packages/gnome.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a13fbb2436..77a4aee201 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10989,13 +10989,14 @@ (define-public gnome-calculator
              (setenv "HOME" (getcwd)))))))
     (native-inputs
      (list gettext-minimal
-           `(,glib "bin")               ;for glib-compile-schemas, gio-2.0.
+           `(,glib-next "bin")               ;for glib-compile-schemas, gio-2.0.
            itstool
            pkg-config
            python
            vala))
     (inputs
-     (list gsettings-desktop-schemas-next
+     (list glib-next
+           gsettings-desktop-schemas-next
            gtksourceview
            libadwaita
            libgee
-- 
2.39.1

[bug#61968] [PATCH v3 05/12] gnu: gnome-text-editor: Use glib-next.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (gnome-text-editor) [native-inputs, inputs]:
gtksourceview@5 requires glib-next. Replace glib with glib-next.
---
 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 77a4aee201..58144de3bf 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5707,10 +5707,10 @@ (define-public gnome-text-editor
                          gettext-minimal
                          desktop-file-utils
                          appstream-glib
-                         `(,glib "bin")
+                         `(,glib-next "bin")
                          `(,gtk "bin")
                          itstool))
-    (inputs (list gtk gtksourceview libadwaita enchant))
+    (inputs (list glib-next gtk gtksourceview libadwaita enchant))
     (home-page "https://gitlab.gnome.org/GNOME/gnome-text-editor")
     (synopsis "GNOME text editor")
     (description
-- 
2.39.1

[bug#61968] [PATCH v3 01/12] gnu: sbcl-cl-cffi-gtk: Use pango-next.

[Vivien Kraus via Guix-patches via]

* gnu/packages/lisp-xyz.scm (sbcl-cl-cffi-gtk) [inputs]: Replace pango with
pango-next.
---
 gnu/packages/lisp-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index a8792dee52..e9e567d0f6 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -4592,7 +4592,7 @@ (define-public sbcl-cl-cffi-gtk
          ("glib" ,glib)
          ("gtk" ,gtk+)
          ("iterate" ,sbcl-iterate)
-         ("pango" ,pango)
+         ("pango" ,pango-next)
          ("trivial-features" ,sbcl-trivial-features)
          ("trivial-garbage" ,sbcl-trivial-garbage)))
       (arguments
-- 
2.39.1

[bug#61968] [PATCH v3 06/12] gnu: textpieces: Use glib-next.

[Vivien Kraus via Guix-patches via]

* gnu/packages/text-editors.scm (textpieces) [native-inputs, inputs]:
gtksourceview@5 requires glib-next. Replace glib with glib-next. Replace glib
with glib-next.
---
 gnu/packages/text-editors.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index e05a58c447..2c300467b5 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -956,12 +956,13 @@ (define-public textpieces
            blueprint-compiler
            desktop-file-utils
            gettext-minimal
-           `(,glib "bin")
+           `(,glib-next "bin")
            `(,gtk "bin")
            pkg-config
            vala))
     (inputs
-     (list gtk
+     (list glib-next
+           gtk
            gtksourceview
            json-glib
            libadwaita
-- 
2.39.1

[bug#61968] [PATCH v3 00/12] Update GNOME Builder to 43.6

[Liliana Marie Prikler]

Am Sonntag, dem 05.03.2023 um 07:27 +0100 schrieb Vivien Kraus:
> Dear guix,
> 
> Thank you so much for the website at qa.guix.gnu.org. It told me that
> libpanel description was not wrapped properly, and that a few
> packages unrelated to GNOME Builder failed to build. I believe I got
> them working again.
It still reports some build errors (are those cached by chance?), but
more importantly, there are new profile collisions.  I think you'd have
to build a version of gtk that propagates glib-next and propagate that
from gtksourceview-5 to make things really work.

Having typed that, I need to wash my hands.

Cheers

[bug#61968] [PATCH v3 00/12] Update GNOME Builder to 43.6

[Vivien Kraus via Guix-patches via]

Hi,

Le dimanche 05 mars 2023 à 08:35 +0100, Liliana Marie Prikler a écrit :
> It still reports some build errors (are those cached by chance?), but
> more importantly, there are new profile collisions.  I think you'd
> have
> to build a version of gtk that propagates glib-next and propagate
> that
> from gtksourceview-5 to make things really work.
> 
> Having typed that, I need to wash my hands.

I think I’ll pass, and wait for an update of glib to land in guix.

Thank you anyway!

Vivien

[bug#61968] [PATCH 0/7] Update GNOME Builder

[Ludovic Courtès]

Hello,

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

> Am Sonntag, dem 05.03.2023 um 07:27 +0100 schrieb Vivien Kraus:
>> Dear guix,
>> 
>> Thank you so much for the website at qa.guix.gnu.org. It told me that
>> libpanel description was not wrapped properly, and that a few
>> packages unrelated to GNOME Builder failed to build. I believe I got
>> them working again.
> It still reports some build errors (are those cached by chance?), but
> more importantly, there are new profile collisions.

We don’t see at <https://qa.guix.gnu.org/issue/61968> which package
those lint warnings relate to.

If those warnings are not for ‘gnome-builder’ itself, then that’s
probably fine in that one can still install ‘gnome-builder’ in their
profile.

Vivien, could you check?

qa.guix can be quite demanding at times.  :-)

Thanks,
Ludo’.

[bug#61968] [PATCH 0/7] Update GNOME Builder

[Liliana Marie Prikler]

Am Donnerstag, dem 16.03.2023 um 22:56 +0100 schrieb Ludovic Courtès:
> Hello,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> skribis:
> > It still reports some build errors (are those cached by chance?),
> > but more importantly, there are new profile collisions.
> 
> We don’t see at <https://qa.guix.gnu.org/issue/61968> which package
> those lint warnings relate to.
True, but gnome-builder is not the only package changed here, gnome-
text-editor and gnome-calculator are too.

> If those warnings are not for ‘gnome-builder’ itself, then that’s
> probably fine in that one can still install ‘gnome-builder’ in their
> profile.
It turns out that both gnome-text-editor and gnome-calculator fail to
find the improperly propagated glib-next.  Speaking of which, a stable
glib 2.76.0 has been released, that we should probably use everywhere,
but that'd require a lot of rebuilds.  Should we do a gnome-team
branch, so that we can do this in one nice swoop?

(Apropos gnome-team, there isn't a formal gnome team yet, but I think
one should be formed covering gnome.scm, gnome-xyz.scm and
gstreamer.scm, perhaps glib-or-gtk-build-system and meson-build-system
as well.)

Cheers

[bug#61968] [PATCH 0/7] Update GNOME Builder

[Vivien Kraus via Guix-patches via]

Le vendredi 17 mars 2023 à 06:22 +0100, Liliana Marie Prikler a écrit :
> > If those warnings are not for ‘gnome-builder’ itself, then that’s
> > probably fine in that one can still install ‘gnome-builder’ in
> > their
> > profile.
> It turns out that both gnome-text-editor and gnome-calculator fail to
> find the improperly propagated glib-next.  Speaking of which, a
> stable
> glib 2.76.0 has been released, that we should probably use
> everywhere,
> but that'd require a lot of rebuilds.  Should we do a gnome-team
> branch, so that we can do this in one nice swoop?
Yes, please! I can help for the easy things and for testing. GNOME 44
is around the corner, it would be a good strategy to start looking at
it now to know what problems lie ahead ;)

Best regards,

Vivien

[bug#61968] [PATCH 0/7] Update GNOME Builder

[Ludovic Courtès]

Hi,

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

> It turns out that both gnome-text-editor and gnome-calculator fail to
> find the improperly propagated glib-next.  Speaking of which, a stable
> glib 2.76.0 has been released, that we should probably use everywhere,
> but that'd require a lot of rebuilds.  Should we do a gnome-team
> branch, so that we can do this in one nice swoop?

Sounds like a good idea!

> (Apropos gnome-team, there isn't a formal gnome team yet, but I think
> one should be formed covering gnome.scm, gnome-xyz.scm and
> gstreamer.scm, perhaps glib-or-gtk-build-system and meson-build-system
> as well.)

Yeah, agreed.

Thanks,
Ludo’.

[bug#61968] [PATCH 0/7] Update GNOME Builder

[Vivien Kraus via Guix-patches via]

Le jeudi 16 mars 2023 à 22:56 +0100, Ludovic Courtès a écrit :
> If those warnings are not for ‘gnome-builder’ itself, then that’s
> probably fine in that one can still install ‘gnome-builder’ in their
> profile.
> 
> Vivien, could you check?

Unfortunately, it does not work:

guix install: error: profile contains conflicting entries for glib
guix install: error:   first entry: glib@2.75.4
/gnu/store/49ah85w38vnz7y2i3hqzpq5rlp9v9nhl-glib-2.75.4
guix install: error:    ... propagated from gtksourceview@5.7.2
guix install: error:    ... propagated from gnome-builder@43.6
guix install: error:   second entry: glib@2.70.2
/gnu/store/z6c305j8xvhvizvnyp5961gssmw3zjr2-glib-2.70.2
guix install: error:    ... propagated from fluidsynth@2.2.4
hint: Try upgrading both `gnome-builder' and `fluidsynth', or remove
one of them from the profile.

Vivien

[bug#61968] [PATCH gnome-team v4 0/8] Update GNOME Builder to 44.2.

[Vivien Kraus via Guix-patches via]

Dear guix,

Did you think I forgot this issue?  I did not!

A few of these updates also qualify for GNOME 44.6; no need to update them.

GNOME Builder starts, but unfortunately flatpak is broken on my side.
However, it can build out of flatpak.

What do you think?

Best regards,

Vivien

Vivien Kraus (8):
  gnu: libxmlb: Update to 0.3.14.
  gnu: appstream: Update to 0.16.4.
  gnu: Add libdex.
  gnu: libpanel: Update to 1.2.0.
  gnu: jsonrpc-glib: Update to 3.44.0.
  gnu: libpeas: Update to 1.36.0.
  gnu: sysprof: Update to 3.48.0.
  gnu: gnome-builder: Update to 44.2.

 gnu/local.mk                                  |   1 +
 gnu/packages/freedesktop.scm                  |  12 +-
 gnu/packages/glib.scm                         |  35 ++++++
 gnu/packages/gnome.scm                        | 117 +++++++++++-------
 gnu/packages/gtk.scm                          |  32 +++--
 .../appstream-force-reload-stemmer.patch      |  89 +++++++++++++
 gnu/packages/xml.scm                          |   6 +-
 7 files changed, 227 insertions(+), 65 deletions(-)
 create mode 100644 gnu/packages/patches/appstream-force-reload-stemmer.patch


base-commit: 72e886328c14c832b2ed71c400069b63852ee18d
-- 
2.41.0

[bug#61968] [PATCH gnome-team v4 1/8] gnu: libxmlb: Update to 0.3.14.

[Vivien Kraus via Guix-patches via]

* gnu/packages/xml.scm (libxmlb): Update to 0.3.14.
[propagated-inputs]: Add xz, as liblzma is present in Requires.private.

Change-Id: I7189b47d879561ffd1902079d20054a287ffaf20
---
 gnu/packages/xml.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 01e48fda57..c6ddae50ae 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -88,7 +88,7 @@ (define-module (gnu packages xml)
 (define-public libxmlb
   (package
     (name "libxmlb")
-    (version "0.3.12")
+    (version "0.3.14")
     (source
      (origin
        (method git-fetch)
@@ -98,7 +98,7 @@ (define-public libxmlb
          (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0v9s2k5saxrs0ssjyg1zxaibybikvaw7fip6sy0b8ixzax9r5y0c"))))
+        (base32 "0qcp881s559wc73db91vjccrv0d3zva87l5jdp5w0ygzz6bmg5cn"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t))
@@ -107,7 +107,7 @@ (define-public libxmlb
     (inputs
      (list appstream-glib glib))
     (propagated-inputs
-     (list `(,zstd "lib")))             ; in Requires.private of xmlb.pc
+     (list xz `(,zstd "lib")))             ; in Requires.private of xmlb.pc
     (synopsis "Library to help create and query binary XML blobs")
     (description "Libxmlb library takes XML source, and converts it to a
 structured binary representation with a deduplicated string table; where the
-- 
2.41.0

[bug#61968] [PATCH gnome-team v4 2/8] gnu: appstream: Update to 0.16.4.

[Vivien Kraus via Guix-patches via]

* gnu/packages/patches/appstream-load-stemmer-early.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/freedesktop.scm (appstream): Update to 0.16.4.
[patches]: Use it here.
[#:configure-flags]: Disable systemd integration.
[#:phases]<disable-failing-tests>: Remove.

Change-Id: Iddd6ce5887247df46f670c49f9efc66772c82ff0
---
 gnu/local.mk                                  |  1 +
 gnu/packages/freedesktop.scm                  | 12 ++-
 .../appstream-force-reload-stemmer.patch      | 89 +++++++++++++++++++
 3 files changed, 95 insertions(+), 7 deletions(-)
 create mode 100644 gnu/packages/patches/appstream-force-reload-stemmer.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 254804d055..4d9f4bf26f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -917,6 +917,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch	\
   %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch	\
   %D%/packages/patches/aoflagger-use-system-provided-pybind11.patch \
+  %D%/packages/patches/appstream-force-reload-stemmer.patch	\
   %D%/packages/patches/apr-fix-atomics.patch			\
   %D%/packages/patches/apr-skip-getservbyname-test.patch	\
   %D%/packages/patches/ark-skip-xar-test.patch			\
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index d920afe1e7..0dc2b1a243 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -139,7 +139,7 @@ (define-module (gnu packages freedesktop)
 (define-public appstream
   (package
     (name "appstream")
-    (version "0.15.6")
+    (version "0.16.4")
     (source
      (origin
        (method url-fetch)
@@ -148,11 +148,14 @@ (define-public appstream
                        "appstream/releases/"
                        "AppStream-" version ".tar.xz"))
        (sha256
-        (base32 "03pirmc5r4izl6mzff879g7pk1nxq03kgpr2yvnnqnlb6r0ckmi3"))))
+        (base32 "1val1b3dggn9g33q2r9q7wsl75a64x4lcvswvkcjjbvakkbj5xyl"))
+       (patches
+        (search-patches "appstream-force-reload-stemmer.patch"))))
     (build-system meson-build-system)
     (arguments
      (list
       #:glib-or-gtk? #t
+      #:configure-flags #~'("-Dsystemd=false")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-libstemmer
@@ -162,11 +165,6 @@ (define-public appstream
               (substitute* "meson.build"
                 (("/usr/include")
                  (dirname libstemmer.h))))))
-          (add-after 'unpack 'disable-failing-tests
-            (lambda _
-              (substitute* "tests/test-pool.c"
-                (("[ \t]*g_test_add_func \\(\"/AppStream/PoolRead?.*;")
-                 ""))))
           (add-before 'check 'check-setup
             (lambda _
               (setenv "HOME" (getcwd)))))))
diff --git a/gnu/packages/patches/appstream-force-reload-stemmer.patch b/gnu/packages/patches/appstream-force-reload-stemmer.patch
new file mode 100644
index 0000000000..a2cf84c8b1
--- /dev/null
+++ b/gnu/packages/patches/appstream-force-reload-stemmer.patch
@@ -0,0 +1,89 @@
+From 32182d7a7a67d0d204cd0a37bd211bfd0177bc27 Mon Sep 17 00:00:00 2001
+Message-ID: <32182d7a7a67d0d204cd0a37bd211bfd0177bc27.1700093066.git.vivien@planete-kraus.eu>
+From: Matthias Klumpp <matthias@tenstral.net>
+Date: Thu, 16 Nov 2023 00:59:15 +0100
+Subject: [PATCH] stemmer: Resolve potential issue where stemmer may never be
+ initialized
+
+If the initial locale was equal to the current stemming language, we may
+never have initialized the stemmer (which could lead to crashes or
+stemming being disabled).
+
+So we force the reload to always happen on initialization.
+CC: #558
+---
+ src/as-stemmer.c | 33 +++++++++++++++++++++------------
+ 1 file changed, 21 insertions(+), 12 deletions(-)
+
+diff --git a/src/as-stemmer.c b/src/as-stemmer.c
+index 63d45267..16ebd09b 100644
+--- a/src/as-stemmer.c
++++ b/src/as-stemmer.c
+@@ -47,6 +47,8 @@ G_DEFINE_TYPE (AsStemmer, as_stemmer, G_TYPE_OBJECT)
+ 
+ static gpointer as_stemmer_object = NULL;
+ 
++static void as_stemmer_reload_internal (AsStemmer *stemmer, const gchar *locale, gboolean force);
++
+ /**
+  * as_stemmer_finalize:
+  **/
+@@ -76,21 +78,14 @@ as_stemmer_init (AsStemmer *stemmer)
+ 
+ 	/* we don't use the locale in XML, so it can be POSIX */
+ 	locale = as_get_current_locale_posix ();
+-	stemmer->current_lang = as_utils_locale_to_language (locale);
+ 
+-	as_stemmer_reload (stemmer, stemmer->current_lang);
++	/* force a reload for initialization */
++	as_stemmer_reload_internal (stemmer, locale, TRUE);
+ #endif
+ }
+ 
+-/**
+- * as_stemmer_reload:
+- * @stemmer: A #AsStemmer
+- * @locale: The stemming language as POSIX locale.
+- *
+- * Allows realoading the #AsStemmer with a different language.
+- */
+-void
+-as_stemmer_reload (AsStemmer *stemmer, const gchar *locale)
++static void
++as_stemmer_reload_internal (AsStemmer *stemmer, const gchar *locale, gboolean force)
+ {
+ #ifdef HAVE_STEMMING
+ 	g_autofree gchar *lang = NULL;
+@@ -99,7 +94,7 @@ as_stemmer_reload (AsStemmer *stemmer, const gchar *locale)
+ 	/* check if we need to reload */
+ 	lang = as_utils_locale_to_language (locale);
+ 	locker = g_mutex_locker_new (&stemmer->mutex);
+-	if (as_str_equal0 (lang, stemmer->current_lang)) {
++	if (!force && as_str_equal0 (lang, stemmer->current_lang)) {
+ 		g_mutex_locker_free (locker);
+ 		return;
+ 	}
+@@ -119,6 +114,20 @@ as_stemmer_reload (AsStemmer *stemmer, const gchar *locale)
+ #endif
+ }
+ 
++/**
++ * as_stemmer_reload:
++ * @stemmer: A #AsStemmer
++ * @locale: The stemming language as POSIX locale.
++ *
++ * Allows realoading the #AsStemmer with a different language.
++ * Does nothing if the stemmer is already using the selected language.
++ */
++void
++as_stemmer_reload (AsStemmer *stemmer, const gchar *locale)
++{
++	as_stemmer_reload_internal (stemmer, locale, FALSE);
++}
++
+ /**
+  * as_stemmer_stem:
+  * @stemmer: A #AsStemmer
+-- 
+2.41.0
+
-- 
2.41.0

[bug#61968] [PATCH gnome-team v4 2/8] gnu: appstream: Update to 0.16.4.

[Liliana Marie Prikler]

Am Donnerstag, dem 16.11.2023 um 00:12 +0100 schrieb Vivien Kraus:
> * gnu/packages/patches/appstream-load-stemmer-early.patch: New patch.
> * gnu/local.mk (dist_patch_DATA): Register it here.
> * gnu/packages/freedesktop.scm (appstream): Update to 0.16.4.
> [patches]: Use it here.
> [#:configure-flags]: Disable systemd integration.
> [#:phases]<disable-failing-tests>: Remove.
> 
> Change-Id: Iddd6ce5887247df46f670c49f9efc66772c82ff0
Hi, I pushed a patch that does the update, but disables the stemmer
test (it was required for libadwaita).  You'll have to rebase this on
gnome-team.

Cheers

[bug#61968] [PATCH gnome-team v4 3/8] gnu: Add libdex.

[Vivien Kraus via Guix-patches via]

* gnu/packages/glib.scm (libdex): New variable.

Change-Id: I834e45aff5e933e3e30276bb11030f84718ce72f
---
 gnu/packages/glib.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 2e3c5f0e8b..6e7996e686 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -1515,3 +1515,38 @@ (define-public dbus-test-runner
     (description "A small little utility to run a couple of executables under a
 new DBus session for testing.")
     (license license:gpl3)))
+
+(define-public libdex
+  (package
+    (name "libdex")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnome/sources/" name "/"
+                           (version-major+minor version) "/"
+                           name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0fj4bggygdxgfsdrhc3zg1y2065g0skpz1l2bqwl0jqn9m3zbdc1"))))
+    (build-system meson-build-system)
+    (arguments
+     (list #:configure-flags #~'("-D" "docs=true")))
+    (native-inputs
+     (list gobject-introspection
+           gi-docgen
+           pkg-config
+           vala))
+    (inputs
+     (list glib
+           libsoup))
+    (home-page "https://gitlab.gnome.org/GNOME/libdex")
+    (synopsis "Library for future-based programming with glib")
+    (description
+     "Dex provides Future-based programming for GLib-based applications.
+
+It both integrates with and brings new features for application and library
+authors who want to manage concurrent code.
+
+Dex also provides Fibers which allow writing synchronous looking code in C
+that uses asynchronous and future-based APIs.")
+    (license license:lgpl2.1+)))
-- 
2.41.0

[bug#61968] [PATCH gnome-team v4 4/8] gnu: libpanel: Update to 1.2.0.

[Vivien Kraus via Guix-patches via]

The fontconfig issue was apparently HOME that was not set.  The build system
required the documentation command to fail on any warning.

* gnu/packages/gtk.scm (libpanel): Update to 1.2.0.
[#:configure-flags]: Remove.
[#:phases]: Reindent.
<set-home>: New phase.
[native-inputs]: Reindent.  Add gi-docgen.

Change-Id: I2a11e9c3e8b480e5ebc9b4e3e4763804c9c6a28c
---
 gnu/packages/gtk.scm | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 21a12689b7..bad7665d83 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -2930,7 +2930,7 @@ (define-public webp-pixbuf-loader
 (define-public libpanel
   (package
     (name "libpanel")
-    (version "1.0.2")
+    (version "1.2.0")
     (source
      (origin
        (method git-fetch)
@@ -2939,20 +2939,26 @@ (define-public libpanel
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "10lkysbwg9w0lm1hj7lw4g7y9j8b88kmq07nfgx0r6f319znj12v"))))
+        (base32 "0wal073anl6iviyljyr8pw0m7av4ik6azpmrwzxw4snp95ib27aq"))))
     (build-system meson-build-system)
     (arguments
-     (list #:configure-flags #~(list "-Ddocs=disabled")  ;fontconfig issue
-           #:phases #~(modify-phases %standard-phases
-                        (add-after 'unpack 'disable-gtk-update-icon-cache
-                          (lambda _
-                            (substitute* "meson.build"
-                              (("gtk_update_icon_cache: true")
-                               "gtk_update_icon_cache: false")))))))
-    (native-inputs (list `(,glib "bin")
-                         gobject-introspection
-                         pkg-config
-                         vala))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'disable-gtk-update-icon-cache
+            (lambda _
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false"))))
+          (add-before 'build 'set-home
+            (lambda _
+              (setenv "HOME" (getcwd)))))))
+    (native-inputs
+     (list gi-docgen
+           `(,glib "bin")
+           gobject-introspection
+           pkg-config
+           vala))
     (inputs (list glib gtk libadwaita))
     (home-page "https://gitlab.gnome.org/GNOME/libpanel")
     (synopsis "Dock and panel library for GTK 4")
-- 
2.41.0

[bug#61968] [PATCH gnome-team v4 5/8] gnu: jsonrpc-glib: Update to 3.44.0.

[Vivien Kraus via Guix-patches via]

The API documentation can be built with a special configure flag, if we add
gi-docgen to the native inputs.

* gnu/packages/gnome.scm (jsonrpc-glib): Update to 3.44.0.
[#:configure-flags]: Add -Denable_gtk_doc=true.
[native-inputs]: Add gi-docgen.

Change-Id: Ifff092dfbc16dd70ca40524a625e67aca75aec2e
---
 gnu/packages/gnome.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2958da2cd9..edbdc7b153 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12889,7 +12889,7 @@ (define-public parlatype
 (define-public jsonrpc-glib
   (package
     (name "jsonrpc-glib")
-    (version "3.42.0")
+    (version "3.44.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -12897,13 +12897,17 @@ (define-public jsonrpc-glib
                                    name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0sr71110gwbv08qwjh410fnhq6v5swn849y4gm314am8gjjqj692"))))
+                "01nfsny3612c6l5q7qaazjpbzin0h357xblc81sm3k6ha016lh39"))))
     (build-system meson-build-system)
+    (arguments
+     (list
+      #:configure-flags #~(list "-Denable_gtk_doc=true")))
     (inputs
      (list glib
            json-glib))
     (native-inputs
-     (list `(,glib "bin") ; for glib-genmarshal, etc.
+     (list gi-docgen
+           `(,glib "bin") ; for glib-genmarshal, etc.
            gobject-introspection
            pkg-config
            vala))
-- 
2.41.0

[bug#61968] [PATCH gnome-team v4 6/8] gnu: libpeas: Update to 1.36.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libpeas): Update to 1.36.0.
[arguments]: Convert to G-Expressions.
[#:configure-flags]: Add -Dvapi=true and -Dgtk_doc=true.
[native-inputs]: Add gi-docgen and vala.
[propagated-inputs]: Add glib.

Change-Id: I04f726d14662b5db17e3724ca482dc8402cee67b
---
 gnu/packages/gnome.scm | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index edbdc7b153..9f30e634f4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3078,7 +3078,7 @@ (define-public libnotify
 (define-public libpeas
   (package
     (name "libpeas")
-    (version "1.32.0")
+    (version "1.36.0")
     (source
      (origin
        (method url-fetch)
@@ -3087,21 +3087,23 @@ (define-public libpeas
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "03ixrhfkywcb409dd0hybyb6i291phwy8si4kc17g29fl07m49fn"))))
+         "0k3v4c9xs7pxpckkagl9ba70nlxl2n23w6ixc8bqd3ndrk1bjz19"))))
     (build-system meson-build-system)
     (arguments
-     '(#: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))))))))
+     (list
+      #:configure-flags #~'("-Dvapi=true" "-Dgtk_doc=true")
+      #: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+
            glade3
@@ -3110,12 +3112,14 @@ (define-public libpeas
     (native-inputs
      (list pkg-config
            gettext-minimal
+           gi-docgen
            `(,glib "bin")
            gobject-introspection
-           xorg-server-for-tests))
+           xorg-server-for-tests
+           vala))
     (propagated-inputs
      ;; The .pc file "Requires" gobject-introspection.
-     (list gobject-introspection))
+     (list glib gobject-introspection))
     (home-page "https://wiki.gnome.org/Projects/Libpeas")
     (synopsis "GObject plugin system")
     (description
-- 
2.41.0

[bug#61968] [PATCH gnome-team v4 7/8] gnu: sysprof: Update to 3.48.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (sysprof): Update to 3.48.0.
[#:configure-flags]: Add -Dhelp=true.
[propagated-inputs]: Add glib, json-glib and libadwaita.

Change-Id: I0810ce009f01c53ca08cc7e3a6bea702f0a6c252
---
 gnu/packages/gnome.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9f30e634f4..beb514300e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12988,7 +12988,7 @@ (define-public feedbackd
 (define-public sysprof
   (package
     (name "sysprof")
-    (version "3.45.1")
+    (version "3.48.0")
     (source
      (origin
        (method url-fetch)
@@ -12996,12 +12996,13 @@ (define-public sysprof
                            (version-major+minor version) "/"
                            "sysprof-" version ".tar.xz"))
        (sha256
-        (base32 "16nmr1qs7s2ylhwj58zj6b7in72nw7z72glaz746f2g7dbqs00k4"))))
+        (base32 "0s11jwkvdbnq2jyz26mwy47wcxfsbawg53zlackvabygcqd0in87"))))
     (build-system meson-build-system)
     (arguments
      (list
       #:configure-flags
-      #~(list (string-append "-Dsystemdunitdir=" #$output "/share/systemd"))
+      #~(list (string-append "-Dsystemdunitdir=" #$output "/share/systemd")
+              "-Dhelp=true")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'disable-post-install
@@ -13012,7 +13013,8 @@ (define-public sysprof
                 (("update_desktop_database: true")
                  "update_desktop_database: false")))))))
     (propagated-inputs
-     (list polkit))
+     ;; Listed in sysprof-4.pc or sysprof-ui-5.pc
+     (list glib json-glib libadwaita polkit))
     (inputs
      (list glib
            gtk
-- 
2.41.0

[bug#61968] [PATCH gnome-team v4 8/8] gnu: gnome-builder: Update to 44.2.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (gnome-builder): Update to 44.2.
[#:configure-flags]: Add -Ddocs=true.
[#:phases]<patch-meson>: Also disable gtk-update-icon-cache in meson.build.
Disable test-shortcuts.
<set-home>: New phase.
<pre-check>: Only enable it when tests? is true.
<wrap-typelib>: New phase.
[inputs]: Add d-spy, editorconfig-core-c, libdex, libpanel.  Replace gtk+ with
gtk, libhandy with libadwaita, libsoup-minimal-2 with libsoup, sysprof-3.44
with sysprof, vte with vte-with-gtk-4 and webkitgtk-with-libsoup2 with
webkitgtk.  Remove glade3.
[propagated-inputs]: Replace gtksourceview-4 with gtksourceview.
[native-inputs]: Add gi-docgen.

Change-Id: I3ac149b76813e28d523fd67050efb0744771a296
---
 gnu/packages/gnome.scm | 61 +++++++++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index beb514300e..f2c2530e33 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13071,7 +13071,7 @@ (define-public sysprof-3.44
 (define-public gnome-builder
   (package
     (name "gnome-builder")
-    (version "42.1")
+    (version "44.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -13079,57 +13079,80 @@ (define-public gnome-builder
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "02k78mamp1yf9y6wixd864hdf9saw83wdw01f80lhnw60avm2kax"))))
+                "1c192xzjv5hsbp1p3wil595810k49kgmf5a7lwf260izip3qk9ng"))))
     (build-system meson-build-system)
     (arguments
      (list
       #:glib-or-gtk? #t                 ;To wrap binaries and compile schemas
-      #:configure-flags #~(list "-Dnetwork_tests=false")
+      #:configure-flags #~(list "-Dnetwork_tests=false" "-Ddocs=true")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-meson
             (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false"))
               (substitute* "build-aux/meson/post_install.py"
+                ;; The post_install script does not seem to respect the
+                ;; previous setting regarding gtk-update-icon-cache.
                 (("gtk-update-icon-cache") "true")
                 (("update-desktop-database") "true"))
-              (substitute* "src/libide/meson.build"
-                (("/usr/lib")
-                 (string-append #$(this-package-input "python-pygobject")
-                                "/lib")))))
-          (add-before 'check 'pre-check
+              ;; This test is failing for unclear reasons.
+              (substitute* "src/tests/meson.build"
+                (("test\\('test-shortcuts'")
+                 "# test('test-shortcuts'"))))
+          (add-before 'build 'set-home
             (lambda _
-              (system "Xvfb :1 &")
-              (setenv "DISPLAY" ":1"))))))
+              ;; Required for documentation.
+              (setenv "HOME" (getcwd))))
+          (add-before 'check 'pre-check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (system "Xvfb :1 &")
+                (setenv "DISPLAY" ":1"))))
+         (add-after 'glib-or-gtk-wrap 'wrap-typelib
+           (lambda* (#:key outputs #:allow-other-keys)
+             (wrap-program (search-input-file outputs "bin/gnome-builder")
+               `("GI_TYPELIB_PATH" suffix (,(getenv "GI_TYPELIB_PATH")))))))))
     (inputs
-     (list cmark
+     (list bash-minimal                 ;for wrap-program
+           cmark
            clang
            devhelp-with-libsoup2
+           d-spy
+           ;; Cyclic modular dependency
+           (module-ref
+            (resolve-interface
+             '(gnu packages text-editors))
+            'editorconfig-core-c)
            flatpak
-           glade3
            gspell
-           gtk+
+           gtk
            json-glib
            jsonrpc-glib
+           libadwaita
            libdazzle
+           libdex
            libgit2-glib
-           libhandy
+           libpanel
            libpeas
            libportal
-           libsoup-minimal-2
+           libsoup
            llvm
            libostree
            python
            python-pygobject
-           sysprof-3.44
+           sysprof
            template-glib
-           vte
-           webkitgtk-with-libsoup2))
+           vte-with-gtk-4
+           webkitgtk))
     (propagated-inputs
-     (list gtksourceview-4))            ;needed for settings
+     (list gtksourceview))              ;needed for settings
     (native-inputs
      (list desktop-file-utils           ;for desktop-file-validate
            `(,glib "bin")
            gettext-minimal
+           gi-docgen
            pkg-config
            python                       ;for meson scripts
            vala
-- 
2.41.0

[bug#61968] [PATCH gnome-team v4 0/8] Update GNOME Builder to 44.2.

[Liliana Marie Prikler]

Am Donnerstag, dem 16.11.2023 um 21:33 +0100 schrieb Vivien Kraus:
> Dear guix,
> 
> Did you think I forgot this issue?  I did not!
> 
> A few of these updates also qualify for GNOME 44.6; no need to update
> them.
> 
> GNOME Builder starts, but unfortunately flatpak is broken on my side.
> However, it can build out of flatpak.
What does "build out of flatpak" mean here?

> What do you think?
> 
> Best regards,
Thanks for keeping up the work.  I will have to wait for CI, but
assuming it lights green, I'm looking forward to push this series.

Cheers

[bug#61968] [PATCH gnome-team v4 0/8] Update GNOME Builder to 44.2.

[Vivien Kraus via Guix-patches via]

Le jeudi 16 novembre 2023 à 22:04 +0100, Liliana Marie Prikler a
écrit :
> > GNOME Builder starts, but unfortunately flatpak is broken on my
> > side.
> > However, it can build out of flatpak.
> What does "build out of flatpak" mean here?
Now I realize it may not mean anything, sorry.

I wanted to say, you can switch your compilation target. By default, it
tries to build with flatpak. For that, it requires a SDK and runtime
that it tries to install through flatpak.

Unfortunately, flatpak fails to do anything on my computer, throwing:

    error: open(O_TMPFILE): Permission denied

To be fair, I did some experimental activities with my flatpak
installation, when trying to build guix packages as flatpaks.  It did
not turn very successful, and things must be deeply broken now on my
computer.  I should investigate, but let’s say I’m not in the mood
right now.

Anyway, regarding gnome-builder, you can switch your compilation target
to “Default”, and then your project compiles with the dependencies that
are available on the system.  Thus, “out of flatpak”.

Vivien

[bug#61968] [PATCH gnome-team v4 0/8] Update GNOME Builder to 44.2.

[Jack Hill]

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

On Thu, 16 Nov 2023, Vivien Kraus via Guix-patches via wrote:

> Le jeudi 16 novembre 2023 à 22:04 +0100, Liliana Marie Prikler a
> écrit :
>>> GNOME Builder starts, but unfortunately flatpak is broken on my
>>> side.
>>> However, it can build out of flatpak.
>> What does "build out of flatpak" mean here?
> Now I realize it may not mean anything, sorry.
>
> I wanted to say, you can switch your compilation target. By default, it
> tries to build with flatpak. For that, it requires a SDK and runtime
> that it tries to install through flatpak.
>
> Unfortunately, flatpak fails to do anything on my computer, throwing:
>
>    error: open(O_TMPFILE): Permission denied
>
> To be fair, I did some experimental activities with my flatpak
> installation, when trying to build guix packages as flatpaks.  It did
> not turn very successful, and things must be deeply broken now on my
> computer.  I should investigate, but let’s say I’m not in the mood
> right now.

It may not work anyway by default for folks who install Builder since I 
assume Builder tries to use SDKs that are only available in a repository 
that doesn't follow the FSDG.

Sorry to hear your experiment didn't work out; that sounds like a really 
neat idea!

> Anyway, regarding gnome-builder, you can switch your compilation target
> to “Default”, and then your project compiles with the dependencies that
> are available on the system.  Thus, “out of flatpak”.

I'd be OK with having a builder without flatpak support. Too bad there 
isn't a "build with Guix" backend. Maybe one day!

Best,
Jack

[bug#61968] [PATCH gnome-team v4 0/8] Update GNOME Builder to 44.2.

[Vivien Kraus via Guix-patches via]

Le jeudi 16 novembre 2023 à 17:35 -0500, Jack Hill a écrit :
> It may not work anyway by default for folks who install Builder since
> I 
> assume Builder tries to use SDKs that are only available in a
> repository 
> that doesn't follow the FSDG.
One day, we will have our own versions of the common SDKs, reproducibly
built only on Guix packages.

(not today though!)

Vivien

[bug#61968] [PATCH gnome-team v4 0/8] Update GNOME Builder to 44.2.

[Liliana Marie Prikler]

Am Donnerstag, dem 16.11.2023 um 23:40 +0100 schrieb Vivien Kraus:
> Le jeudi 16 novembre 2023 à 17:35 -0500, Jack Hill a écrit :
> > It may not work anyway by default for folks who install Builder
> > since I assume Builder tries to use SDKs that are only available in
> > a repository that doesn't follow the FSDG.
> One day, we will have our own versions of the common SDKs,
> reproducibly built only on Guix packages.
> 
> (not today though!)
Speaking about today, since today we would just run into errors, can we
make "build without flatpak" the default? :)

Or better yet, disable whatever feature brings in the "build with
flatpak" option, as it's currently broken?

Cheers

[bug#61968] [PATCH gnome-team v4 0/8] Update GNOME Builder to 44.2.

[Vivien Kraus via Guix-patches via]

Le vendredi 17 novembre 2023 à 06:20 +0100, Liliana Marie Prikler a
écrit :
> Speaking about today, since today we would just run into errors, can
> we
> make "build without flatpak" the default? :)
> 
> Or better yet, disable whatever feature brings in the "build with
> flatpak" option, as it's currently broken?

I’m not sure how to do that. I guess the answer is in how the project
uses the "IdeConfigManager" class, but it’s hard to track where it adds
entries.

Vivien

[bug#61968] [PATCH gnome-team v5 0/6] Update GNOME Builder

[Vivien Kraus via Guix-patches via]

Dear guix,

Here is a rebased version of the patch series.

Best regards,

Vivien

Vivien Kraus (6):
  gnu: Add libdex.
  gnu: libpanel: Update to 1.2.0.
  gnu: jsonrpc-glib: Update to 3.44.0.
  gnu: libpeas: Update to 1.36.0.
  gnu: sysprof: Update to 3.48.0.
  gnu: gnome-builder: Update to 44.2.

 gnu/packages/glib.scm  |  35 ++++++++++++
 gnu/packages/gnome.scm | 117 ++++++++++++++++++++++++++---------------
 gnu/packages/gtk.scm   |  32 ++++++-----
 3 files changed, 129 insertions(+), 55 deletions(-)


base-commit: 1cc3b7e80f60a2a5a6a1400ed0b025efeae7a523
-- 
2.41.0

[bug#61968] [PATCH gnome-team v5 1/6] gnu: Add libdex.

[Vivien Kraus via Guix-patches via]

* gnu/packages/glib.scm (libdex): New variable.

Change-Id: I834e45aff5e933e3e30276bb11030f84718ce72f
---
 gnu/packages/glib.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index ee44f8f403..b01b948fc6 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -1520,3 +1520,38 @@ (define-public dbus-test-runner
     (description "A small little utility to run a couple of executables under a
 new DBus session for testing.")
     (license license:gpl3)))
+
+(define-public libdex
+  (package
+    (name "libdex")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnome/sources/" name "/"
+                           (version-major+minor version) "/"
+                           name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0fj4bggygdxgfsdrhc3zg1y2065g0skpz1l2bqwl0jqn9m3zbdc1"))))
+    (build-system meson-build-system)
+    (arguments
+     (list #:configure-flags #~'("-D" "docs=true")))
+    (native-inputs
+     (list gobject-introspection
+           gi-docgen
+           pkg-config
+           vala))
+    (inputs
+     (list glib
+           libsoup))
+    (home-page "https://gitlab.gnome.org/GNOME/libdex")
+    (synopsis "Library for future-based programming with glib")
+    (description
+     "Dex provides Future-based programming for GLib-based applications.
+
+It both integrates with and brings new features for application and library
+authors who want to manage concurrent code.
+
+Dex also provides Fibers which allow writing synchronous looking code in C
+that uses asynchronous and future-based APIs.")
+    (license license:lgpl2.1+)))
-- 
2.41.0

[bug#61968] [PATCH gnome-team v5 2/6] gnu: libpanel: Update to 1.2.0.

[Vivien Kraus via Guix-patches via]

The fontconfig issue was apparently HOME that was not set.  The build system
required the documentation command to fail on any warning.

* gnu/packages/gtk.scm (libpanel): Update to 1.2.0.
[#:configure-flags]: Remove.
[#:phases]: Reindent.
<set-home>: New phase.
[native-inputs]: Reindent.  Add gi-docgen.

Change-Id: I2a11e9c3e8b480e5ebc9b4e3e4763804c9c6a28c
---
 gnu/packages/gtk.scm | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 67611efaae..b5246c8b3b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -2928,7 +2928,7 @@ (define-public webp-pixbuf-loader
 (define-public libpanel
   (package
     (name "libpanel")
-    (version "1.0.2")
+    (version "1.2.0")
     (source
      (origin
        (method git-fetch)
@@ -2937,20 +2937,26 @@ (define-public libpanel
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "10lkysbwg9w0lm1hj7lw4g7y9j8b88kmq07nfgx0r6f319znj12v"))))
+        (base32 "0wal073anl6iviyljyr8pw0m7av4ik6azpmrwzxw4snp95ib27aq"))))
     (build-system meson-build-system)
     (arguments
-     (list #:configure-flags #~(list "-Ddocs=disabled")  ;fontconfig issue
-           #:phases #~(modify-phases %standard-phases
-                        (add-after 'unpack 'disable-gtk-update-icon-cache
-                          (lambda _
-                            (substitute* "meson.build"
-                              (("gtk_update_icon_cache: true")
-                               "gtk_update_icon_cache: false")))))))
-    (native-inputs (list `(,glib "bin")
-                         gobject-introspection
-                         pkg-config
-                         vala))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'disable-gtk-update-icon-cache
+            (lambda _
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false"))))
+          (add-before 'build 'set-home
+            (lambda _
+              (setenv "HOME" (getcwd)))))))
+    (native-inputs
+     (list gi-docgen
+           `(,glib "bin")
+           gobject-introspection
+           pkg-config
+           vala))
     (inputs (list glib gtk libadwaita))
     (home-page "https://gitlab.gnome.org/GNOME/libpanel")
     (synopsis "Dock and panel library for GTK 4")
-- 
2.41.0

[bug#61968] [PATCH gnome-team v5 3/6] gnu: jsonrpc-glib: Update to 3.44.0.

[Vivien Kraus via Guix-patches via]

The API documentation can be built with a special configure flag, if we add
gi-docgen to the native inputs.

* gnu/packages/gnome.scm (jsonrpc-glib): Update to 3.44.0.
[#:configure-flags]: Add -Denable_gtk_doc=true.
[native-inputs]: Add gi-docgen.

Change-Id: Ifff092dfbc16dd70ca40524a625e67aca75aec2e
---
 gnu/packages/gnome.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ab485cffb1..e735a214f3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12897,7 +12897,7 @@ (define-public parlatype
 (define-public jsonrpc-glib
   (package
     (name "jsonrpc-glib")
-    (version "3.42.0")
+    (version "3.44.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -12905,13 +12905,17 @@ (define-public jsonrpc-glib
                                    name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0sr71110gwbv08qwjh410fnhq6v5swn849y4gm314am8gjjqj692"))))
+                "01nfsny3612c6l5q7qaazjpbzin0h357xblc81sm3k6ha016lh39"))))
     (build-system meson-build-system)
+    (arguments
+     (list
+      #:configure-flags #~(list "-Denable_gtk_doc=true")))
     (inputs
      (list glib
            json-glib))
     (native-inputs
-     (list `(,glib "bin") ; for glib-genmarshal, etc.
+     (list gi-docgen
+           `(,glib "bin") ; for glib-genmarshal, etc.
            gobject-introspection
            pkg-config
            vala))
-- 
2.41.0

[bug#61968] [PATCH gnome-team v5 4/6] gnu: libpeas: Update to 1.36.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (libpeas): Update to 1.36.0.
[arguments]: Convert to G-Expressions.
[#:configure-flags]: Add -Dvapi=true and -Dgtk_doc=true.
[native-inputs]: Add gi-docgen and vala.
[propagated-inputs]: Add glib.

Change-Id: I04f726d14662b5db17e3724ca482dc8402cee67b
---
 gnu/packages/gnome.scm | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e735a214f3..0c3e61c652 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3078,7 +3078,7 @@ (define-public libnotify
 (define-public libpeas
   (package
     (name "libpeas")
-    (version "1.32.0")
+    (version "1.36.0")
     (source
      (origin
        (method url-fetch)
@@ -3087,21 +3087,23 @@ (define-public libpeas
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "03ixrhfkywcb409dd0hybyb6i291phwy8si4kc17g29fl07m49fn"))))
+         "0k3v4c9xs7pxpckkagl9ba70nlxl2n23w6ixc8bqd3ndrk1bjz19"))))
     (build-system meson-build-system)
     (arguments
-     '(#: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))))))))
+     (list
+      #:configure-flags #~'("-Dvapi=true" "-Dgtk_doc=true")
+      #: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+
            glade3
@@ -3110,12 +3112,14 @@ (define-public libpeas
     (native-inputs
      (list pkg-config
            gettext-minimal
+           gi-docgen
            `(,glib "bin")
            gobject-introspection
-           xorg-server-for-tests))
+           xorg-server-for-tests
+           vala))
     (propagated-inputs
      ;; The .pc file "Requires" gobject-introspection.
-     (list gobject-introspection))
+     (list glib gobject-introspection))
     (home-page "https://wiki.gnome.org/Projects/Libpeas")
     (synopsis "GObject plugin system")
     (description
-- 
2.41.0

[bug#61968] [PATCH gnome-team v5 5/6] gnu: sysprof: Update to 3.48.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (sysprof): Update to 3.48.0.
[#:configure-flags]: Add -Dhelp=true.
[propagated-inputs]: Add glib, json-glib and libadwaita.

Change-Id: I0810ce009f01c53ca08cc7e3a6bea702f0a6c252
---
 gnu/packages/gnome.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0c3e61c652..bc3f6359b5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12996,7 +12996,7 @@ (define-public feedbackd
 (define-public sysprof
   (package
     (name "sysprof")
-    (version "3.45.1")
+    (version "3.48.0")
     (source
      (origin
        (method url-fetch)
@@ -13004,12 +13004,13 @@ (define-public sysprof
                            (version-major+minor version) "/"
                            "sysprof-" version ".tar.xz"))
        (sha256
-        (base32 "16nmr1qs7s2ylhwj58zj6b7in72nw7z72glaz746f2g7dbqs00k4"))))
+        (base32 "0s11jwkvdbnq2jyz26mwy47wcxfsbawg53zlackvabygcqd0in87"))))
     (build-system meson-build-system)
     (arguments
      (list
       #:configure-flags
-      #~(list (string-append "-Dsystemdunitdir=" #$output "/share/systemd"))
+      #~(list (string-append "-Dsystemdunitdir=" #$output "/share/systemd")
+              "-Dhelp=true")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'disable-post-install
@@ -13020,7 +13021,8 @@ (define-public sysprof
                 (("update_desktop_database: true")
                  "update_desktop_database: false")))))))
     (propagated-inputs
-     (list polkit))
+     ;; Listed in sysprof-4.pc or sysprof-ui-5.pc
+     (list glib json-glib libadwaita polkit))
     (inputs
      (list glib
            gtk
-- 
2.41.0

[bug#61968] [PATCH gnome-team v5 6/6] gnu: gnome-builder: Update to 44.2.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (gnome-builder): Update to 44.2.
[#:configure-flags]: Add -Ddocs=true.
[#:phases]<patch-meson>: Also disable gtk-update-icon-cache in meson.build.
Disable test-shortcuts.
<set-home>: New phase.
<pre-check>: Only enable it when tests? is true.
<wrap-typelib>: New phase.
[inputs]: Add d-spy, editorconfig-core-c, libdex, libpanel.  Replace gtk+ with
gtk, libhandy with libadwaita, libsoup-minimal-2 with libsoup, sysprof-3.44
with sysprof, vte with vte-with-gtk-4 and webkitgtk-with-libsoup2 with
webkitgtk.  Remove glade3.
[propagated-inputs]: Replace gtksourceview-4 with gtksourceview.
[native-inputs]: Add gi-docgen.

Change-Id: I3ac149b76813e28d523fd67050efb0744771a296
---
 gnu/packages/gnome.scm | 61 +++++++++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index bc3f6359b5..194a443484 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13079,7 +13079,7 @@ (define-public sysprof-3.44
 (define-public gnome-builder
   (package
     (name "gnome-builder")
-    (version "42.1")
+    (version "44.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -13087,57 +13087,80 @@ (define-public gnome-builder
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "02k78mamp1yf9y6wixd864hdf9saw83wdw01f80lhnw60avm2kax"))))
+                "1c192xzjv5hsbp1p3wil595810k49kgmf5a7lwf260izip3qk9ng"))))
     (build-system meson-build-system)
     (arguments
      (list
       #:glib-or-gtk? #t                 ;To wrap binaries and compile schemas
-      #:configure-flags #~(list "-Dnetwork_tests=false")
+      #:configure-flags #~(list "-Dnetwork_tests=false" "-Ddocs=true")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-meson
             (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false"))
               (substitute* "build-aux/meson/post_install.py"
+                ;; The post_install script does not seem to respect the
+                ;; previous setting regarding gtk-update-icon-cache.
                 (("gtk-update-icon-cache") "true")
                 (("update-desktop-database") "true"))
-              (substitute* "src/libide/meson.build"
-                (("/usr/lib")
-                 (string-append #$(this-package-input "python-pygobject")
-                                "/lib")))))
-          (add-before 'check 'pre-check
+              ;; This test is failing for unclear reasons.
+              (substitute* "src/tests/meson.build"
+                (("test\\('test-shortcuts'")
+                 "# test('test-shortcuts'"))))
+          (add-before 'build 'set-home
             (lambda _
-              (system "Xvfb :1 &")
-              (setenv "DISPLAY" ":1"))))))
+              ;; Required for documentation.
+              (setenv "HOME" (getcwd))))
+          (add-before 'check 'pre-check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (system "Xvfb :1 &")
+                (setenv "DISPLAY" ":1"))))
+         (add-after 'glib-or-gtk-wrap 'wrap-typelib
+           (lambda* (#:key outputs #:allow-other-keys)
+             (wrap-program (search-input-file outputs "bin/gnome-builder")
+               `("GI_TYPELIB_PATH" suffix (,(getenv "GI_TYPELIB_PATH")))))))))
     (inputs
-     (list cmark
+     (list bash-minimal                 ;for wrap-program
+           cmark
            clang
            devhelp-with-libsoup2
+           d-spy
+           ;; Cyclic modular dependency
+           (module-ref
+            (resolve-interface
+             '(gnu packages text-editors))
+            'editorconfig-core-c)
            flatpak
-           glade3
            gspell
-           gtk+
+           gtk
            json-glib
            jsonrpc-glib
+           libadwaita
            libdazzle
+           libdex
            libgit2-glib
-           libhandy
+           libpanel
            libpeas
            libportal
-           libsoup-minimal-2
+           libsoup
            llvm
            libostree
            python
            python-pygobject
-           sysprof-3.44
+           sysprof
            template-glib
-           vte
-           webkitgtk-with-libsoup2))
+           vte-with-gtk-4
+           webkitgtk))
     (propagated-inputs
-     (list gtksourceview-4))            ;needed for settings
+     (list gtksourceview))              ;needed for settings
     (native-inputs
      (list desktop-file-utils           ;for desktop-file-validate
            `(,glib "bin")
            gettext-minimal
+           gi-docgen
            pkg-config
            python                       ;for meson scripts
            vala
-- 
2.41.0

bug#61968: [PATCH gnome-team v5 6/6] gnu: gnome-builder: Update to 44.2.

[Liliana Marie Prikler]

Am Donnerstag, dem 16.11.2023 um 20:49 +0100 schrieb Vivien Kraus:
> * gnu/packages/gnome.scm (gnome-builder): Update to 44.2.
> [#:configure-flags]: Add -Ddocs=true.
> [#:phases]<patch-meson>: Also disable gtk-update-icon-cache in
> meson.build.
> Disable test-shortcuts.
> <set-home>: New phase.
> <pre-check>: Only enable it when tests? is true.
> <wrap-typelib>: New phase.
> [inputs]: Add d-spy, editorconfig-core-c, libdex, libpanel.  Replace
> gtk+ with
> gtk, libhandy with libadwaita, libsoup-minimal-2 with libsoup,
> sysprof-3.44
> with sysprof, vte with vte-with-gtk-4 and webkitgtk-with-libsoup2
> with
> webkitgtk.  Remove glade3.
> [propagated-inputs]: Replace gtksourceview-4 with gtksourceview.
> [native-inputs]: Add gi-docgen.
> 
> Change-Id: I3ac149b76813e28d523fd67050efb0744771a296
Pushed.

Thanks

[bug#61968] [PATCH gnome-team v5 0/6] Update GNOME Builder

[Liliana Marie Prikler]

Am Montag, dem 20.11.2023 um 18:22 +0100 schrieb Vivien Kraus:
> Dear guix,
> 
> Here is a rebased version of the patch series.
> 
> Best regards,
> 
> Vivien
> 
> Vivien Kraus (6):
>   gnu: Add libdex.
>   gnu: libpanel: Update to 1.2.0.
>   gnu: jsonrpc-glib: Update to 3.44.0.
>   gnu: libpeas: Update to 1.36.0.
>   gnu: sysprof: Update to 3.48.0.
>   gnu: gnome-builder: Update to 44.2.
LGTM.  Can you also do v4 2/8 in a separate series?  (Stemmer support
is currently broken IIUC and that patch would fix it.)

Cheers

[bug#61968] [PATCH gnome-team v5 0/6] Update GNOME Builder

[Liliana Marie Prikler]

Am Montag, dem 20.11.2023 um 20:45 +0100 schrieb Liliana Marie Prikler:
> Am Montag, dem 20.11.2023 um 18:22 +0100 schrieb Vivien Kraus:
> > Dear guix,
> > 
> > Here is a rebased version of the patch series.
> > 
> > Best regards,
> > 
> > Vivien
> > 
> > Vivien Kraus (6):
> >   gnu: Add libdex.
> >   gnu: libpanel: Update to 1.2.0.
> >   gnu: jsonrpc-glib: Update to 3.44.0.
> >   gnu: libpeas: Update to 1.36.0.
> >   gnu: sysprof: Update to 3.48.0.
> >   gnu: gnome-builder: Update to 44.2.
> LGTM.  Can you also do v4 2/8 in a separate series?  (Stemmer support
> is currently broken IIUC and that patch would fix it.)
Nvm, turns out you had already.