[PATCH 0/7] Update GNOME Builder

Open

Details

3 participants

Liliana Marie Prikler
Ludovic Courtès
Vivien Kraus

Owner: unassigned

Submitted by: Vivien Kraus

Severity: normal

Vivien Kraus wrote on 4 Mar 21:04 +0100

Recipients:(address . guix-patches@gnu.org)

Message-ID:cover.1677960269.git.vivien@planete-kraus.eu

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

Vivien Kraus wrote on 4 Mar 19:28 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:6c3779a1781bed88e972f7f1e0bf326285d46d5c.1677960270.git.vivien@planete-kraus.eu

* gnu/packages/gtk.scm (gtksourceview): Update to 5.7.2.

---

gnu/packages/gtk.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)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

Vivien Kraus wrote on 4 Mar 20:24 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:76db300e020cd808f9bcc36ca33c98aca8910623.1677960270.git.vivien@planete-kraus.eu

* gnu/packages/gnome.scm (sysprof): Update to 3.46.0.

---

gnu/packages/gnome.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)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

Vivien Kraus wrote on 4 Mar 18:52 +0100

[PATCH 2/7] gnu: Add libpanel.

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:ff6eace56e8a8004f7b5020beead70ff271c6424.1677960270.git.vivien@planete-kraus.eu

* gnu/packages/gtk.scm (libpanel): New variable.

---

gnu/packages/gtk.scm | 34 ++++++++++++++++++++++++++++++++++

1 file changed, 34 insertions(+)

Toggle diff (44 lines)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

Vivien Kraus wrote on 4 Mar 19:33 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:a0838d73460c86b03b9784676b2a738439065f20.1677960270.git.vivien@planete-kraus.eu

* 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(-)

Toggle diff (28 lines)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

Vivien Kraus wrote on 4 Mar 19:13 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:4d3ba4583e05912d192dbf7d902923783d04cf41.1677960269.git.vivien@planete-kraus.eu

* 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

Toggle diff (70 lines)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

Vivien Kraus wrote on 4 Mar 19:30 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:ac59fb5bc327a979e6dad727efc8efa96b568e55.1677960270.git.vivien@planete-kraus.eu

* gnu/packages/gnome.scm (libpeas): Update to 1.34.0.

---

gnu/packages/gnome.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)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

Vivien Kraus wrote on 4 Mar 18:39 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:3753669aa7a656928eb8d1acc0cb4241b9d8427e.1677960270.git.vivien@planete-kraus.eu

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(-)

Toggle diff (202 lines)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

Liliana Marie Prikler wrote on 4 Mar 21:53 +0100

Recipients:

Message-ID:a4db493e7581b1522234fb45f2b7d292de32f393.camel@gmail.com

Am Samstag, dem 04.03.2023 um 18:39 +0100 schrieb Vivien Kraus:

Toggle quote (2 lines)

> 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.

Toggle quote (4 lines)

> * 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.

Toggle quote (2 lines)

> and replace

> devhelp-with-libsoup2 => devhelp, gtk+ => gtk, vte => vte-with-gtk-4.

Write out "Replace X with Y."

Toggle quote (1 lines)

> [propagated-inputs]: Add webkitgtk-next.

Do we really need to? (Why) Is a regular input not enough?

Cheers

Vivien Kraus wrote on 4 Mar 18:52 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:ff6eace56e8a8004f7b5020beead70ff271c6424.1677970718.git.vivien@planete-kraus.eu

* gnu/packages/gtk.scm (libpanel): New variable.

---

gnu/packages/gtk.scm | 34 ++++++++++++++++++++++++++++++++++

1 file changed, 34 insertions(+)

Toggle diff (44 lines)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

Vivien Kraus wrote on 4 Mar 19:13 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:4d3ba4583e05912d192dbf7d902923783d04cf41.1677970718.git.vivien@planete-kraus.eu

* 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

Toggle diff (70 lines)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

Vivien Kraus wrote on 4 Mar 23:58 +0100

[PATCH v2 0/8] Update GNOME Builder

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:cover.1677970718.git.vivien@planete-kraus.eu

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

Vivien Kraus wrote on 4 Mar 19:33 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:a0838d73460c86b03b9784676b2a738439065f20.1677970718.git.vivien@planete-kraus.eu

* 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(-)

Toggle diff (28 lines)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

Vivien Kraus wrote on 4 Mar 18:39 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:58310841c51b6b55bbfd4302532600d7461384a3.1677970718.git.vivien@planete-kraus.eu

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(-)

Toggle diff (93 lines)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

Vivien Kraus wrote on 4 Mar 23:19 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:fe808a922e23fe8e69cf68cabcababfa46fc250d.1677970718.git.vivien@planete-kraus.eu

* 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(-)

Toggle diff (190 lines)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

Vivien Kraus wrote on 4 Mar 19:30 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:ac59fb5bc327a979e6dad727efc8efa96b568e55.1677970718.git.vivien@planete-kraus.eu

* gnu/packages/gnome.scm (libpeas): Update to 1.34.0.

---

gnu/packages/gnome.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)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

Vivien Kraus wrote on 4 Mar 20:24 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:76db300e020cd808f9bcc36ca33c98aca8910623.1677970718.git.vivien@planete-kraus.eu

* gnu/packages/gnome.scm (sysprof): Update to 3.46.0.

---

gnu/packages/gnome.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)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

Vivien Kraus wrote on 4 Mar 19:28 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:6c3779a1781bed88e972f7f1e0bf326285d46d5c.1677970718.git.vivien@planete-kraus.eu

* gnu/packages/gtk.scm (gtksourceview): Update to 5.7.2.

---

gnu/packages/gtk.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)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

Vivien Kraus wrote on 4 Mar 19:13 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:96bce38007c173cb134a8c8a228ca108c04ef92a.1677997633.git.vivien@planete-kraus.eu

* 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

Toggle diff (70 lines)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

Vivien Kraus wrote on 4 Mar 23:19 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:5793c04e33f7a877fd9b0362a3e8ae1ae202cc86.1677997633.git.vivien@planete-kraus.eu

* 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(-)

Toggle diff (190 lines)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

Vivien Kraus wrote on 5 Mar 07:16 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:c6e5398e2befd48e89bc0e4dfa7086a6a403060f.1677997633.git.vivien@planete-kraus.eu

* 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(-)

Toggle diff (15 lines)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

Vivien Kraus wrote on 4 Mar 20:24 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:1960d6be11bcb2be0db9f6674f8367802222ae64.1677997633.git.vivien@planete-kraus.eu

* gnu/packages/gnome.scm (sysprof): Update to 3.46.0.

---

gnu/packages/gnome.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)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

Vivien Kraus wrote on 4 Mar 19:33 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:e0cad2fddbdc97d8221aaf9ac8a674922c8bcbbe.1677997633.git.vivien@planete-kraus.eu

* 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(-)

Toggle diff (28 lines)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

Vivien Kraus wrote on 5 Mar 07:08 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:7dea9e563df4e27f083dfe14c102b83ff0d81afa.1677997633.git.vivien@planete-kraus.eu

* 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(-)

Toggle diff (19 lines)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

Vivien Kraus wrote on 4 Mar 19:30 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:72811011d9a616a89950a1aada65ff6fa4f23eb4.1677997633.git.vivien@planete-kraus.eu

* gnu/packages/gnome.scm (libpeas): Update to 1.34.0.

---

gnu/packages/gnome.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)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

Vivien Kraus wrote on 5 Mar 07:04 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:1718960aa101b5415cb9527228bfeec8c49973a2.1677997633.git.vivien@planete-kraus.eu

* 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(-)

Toggle diff (23 lines)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

Vivien Kraus wrote on 4 Mar 19:28 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:c245a523bdffbbb6d9ec0abef712152b2113190f.1677997633.git.vivien@planete-kraus.eu

* gnu/packages/gtk.scm (gtksourceview): Update to 5.7.2.

---

gnu/packages/gtk.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)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

Vivien Kraus wrote on 4 Mar 18:52 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:ef09c87c046654eba446aace3b0a0b98de2ae4b1.1677997633.git.vivien@planete-kraus.eu

* gnu/packages/gtk.scm (libpanel): New variable.

---

gnu/packages/gtk.scm | 34 ++++++++++++++++++++++++++++++++++

1 file changed, 34 insertions(+)

Toggle diff (44 lines)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

Vivien Kraus wrote on 4 Mar 18:39 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:dce250fdbbf00ec44be39cacbef2203699ebb074.1677997633.git.vivien@planete-kraus.eu

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(-)

Toggle diff (93 lines)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

Vivien Kraus wrote on 5 Mar 07:27 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:cover.1677997633.git.vivien@planete-kraus.eu

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

Vivien Kraus wrote on 5 Mar 07:22 +0100

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

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:877a948c1dcb434db92d88183e12a688c491f48c.1677997633.git.vivien@planete-kraus.eu

* 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(-)

Toggle diff (22 lines)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

Liliana Marie Prikler wrote on 5 Mar 08:35 +0100

Re: [PATCH v3 00/12] Update GNOME Builder to 43.6

Recipients:

Message-ID:a42331009553cba8c421d9ba983021062a6e3e43.camel@gmail.com

Am Sonntag, dem 05.03.2023 um 07:27 +0100 schrieb Vivien Kraus:

Toggle quote (6 lines)> 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

Vivien Kraus wrote on 14 Mar 12:15 +0100

Recipients:

Message-ID:205337058a7b08d5921229f3dd67f257dc8ccf80.camel@planete-kraus.eu

Hi,

Le dimanche 05 mars 2023 à 08:35 +0100, Liliana Marie Prikler a écrit :

Toggle quote (9 lines)

> 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

Ludovic Courtès wrote on 16 Mar 22:56 +0100

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

Recipients:(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)

Message-ID:877cvg9x7n.fsf_-_@gnu.org

Hello,

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

Toggle quote (10 lines)> 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’.

Liliana Marie Prikler wrote on 17 Mar 06:22 +0100

Recipients:(name . Ludovic Courtès)(address . ludo@gnu.org)

Message-ID:9f796ce3245dfc9a63393dbec4ebfad114dff80c.camel@gmail.com

Am Donnerstag, dem 16.03.2023 um 22:56 +0100 schrieb Ludovic Courtès:

Toggle quote (8 lines)> 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.

Toggle quote (3 lines)

> 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

Vivien Kraus wrote on 17 Mar 06:51 +0100

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:8d5401cba21fcc305fc343e6a59e3a08ffd61de0.camel@planete-kraus.eu

Le vendredi 17 mars 2023 à 06:22 +0100, Liliana Marie Prikler a écrit :

Toggle quote (11 lines)> > 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

Ludovic Courtès wrote on 17 Mar 22:49 +0100

Recipients:(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)

Message-ID:87bkkrvyjx.fsf@gnu.org

Hi,

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

Toggle quote (6 lines)

> 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!

Toggle quote (5 lines)

> (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’.

Vivien Kraus wrote on 19 Mar 12:50 +0100

Recipients:(address . 61968@debbugs.gnu.org)

Message-ID:45df5dffe2026be84564ba794abb98ce24214f5a.camel@planete-kraus.eu

Le jeudi 16 mars 2023 à 22:56 +0100, Ludovic Courtès a écrit :

Toggle quote (6 lines)

> 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

Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 61968@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date