[bug#63499] [PATCH gnome-team 0/3] To GTK and beyond

[bug#63499] [PATCH gnome-team 0/3] To GTK and beyond

[Liliana Marie Prikler]

Hi Guix,

with this series, GTK 4.10, Gtksourceview and everything up to WebkitGTK ought
to build fine.  This means we can finally start working on the actual gnome-*
packages soon :)

Cheers

Liliana Marie Prikler (3):
  gnu: gst-plugins-base: Fix build.
  gnu: gtk: Update to 4.10.3.
  gnu: gtksourceview: Fix build.

 gnu/local.mk                                  |  1 +
 gnu/packages/gstreamer.scm                    |  3 ++-
 gnu/packages/gtk.scm                          | 14 +++++++++---
 .../gst-plugins-base-fix-broken-test.patch    | 22 +++++++++++++++++++
 4 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 gnu/packages/patches/gst-plugins-base-fix-broken-test.patch


base-commit: 09dd600159801b3b8fd6b95bf69e648f9e37d959
-- 
2.39.2

[bug#63499] [PATCH gnome-team 1/3] gnu: gst-plugins-base: Fix build.

[Liliana Marie Prikler]

* gnu/packages/patches/gst-plugins-base-fix-broken-test.patch: New file.
* gnu/packages/gstreamer.scm (gst-plugins-base)[patches]: Use it here.
* gnu/local.mk (dist_patch_DATA): Register it here.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/gstreamer.scm                    |  3 ++-
 .../gst-plugins-base-fix-broken-test.patch    | 22 +++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/gst-plugins-base-fix-broken-test.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 43d6077943..0ff787e8f3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1316,6 +1316,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/guile-present-coding.patch		\
   %D%/packages/patches/guile-rsvg-pkgconfig.patch		\
   %D%/packages/patches/guile-emacs-fix-configure.patch		\
+  %D%/packages/patches/gst-plugins-base-fix-broken-test.patch		\
   %D%/packages/patches/gtk2-fix-builder-test.patch		\
   %D%/packages/patches/gtk2-harden-list-store.patch		\
   %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch	\
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 8971c11479..f7e5b397fd 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -550,7 +550,8 @@ (define-public gst-plugins-base
                           name "-" version ".tar.xz"))
       (sha256
        (base32
-        "0jcxcx4mgfjvfb3ixibwhx8j330mq3ap469w7hapm6z79q614rgb"))))
+        "0jcxcx4mgfjvfb3ixibwhx8j330mq3ap469w7hapm6z79q614rgb"))
+      (patches (search-patches "gst-plugins-base-fix-broken-test.patch"))))
     (build-system meson-build-system)
     (propagated-inputs
      (list glib                     ;required by gstreamer-sdp-1.0.pc
diff --git a/gnu/packages/patches/gst-plugins-base-fix-broken-test.patch b/gnu/packages/patches/gst-plugins-base-fix-broken-test.patch
new file mode 100644
index 0000000000..2785983d8d
--- /dev/null
+++ b/gnu/packages/patches/gst-plugins-base-fix-broken-test.patch
@@ -0,0 +1,22 @@
+Index: gst-plugins-base-1.22.1/tests/check/libs/allocators.c
+===================================================================
+--- gst-plugins-base-1.22.1.orig/tests/check/libs/allocators.c
++++ gst-plugins-base-1.22.1/tests/check/libs/allocators.c
+@@ -80,7 +80,7 @@ GST_START_TEST (test_fdmem)
+ 
+   alloc = gst_fd_allocator_new ();
+   fail_unless (alloc);
+-  mem = gst_fd_allocator_alloc (alloc, fd, 10, GST_FD_MEMORY_FLAG_KEEP_MAPPED);
++  mem = gst_fd_allocator_alloc (alloc, fd, 10, GST_FD_MEMORY_FLAG_KEEP_MAPPED | GST_FD_MEMORY_FLAG_DONT_CLOSE);
+ 
+   fail_unless (gst_memory_map (mem, &info, GST_MAP_READ));
+   fail_unless (info.data[5] == '5');
+@@ -95,7 +95,7 @@ GST_START_TEST (test_fdmem)
+   gst_memory_unmap (mem, &info);
+ 
+   gst_memory_unref (mem);
+-  fail_unless (g_close (fd, NULL) == 0);
++  fail_unless (g_close (fd, NULL));
+   gst_object_unref (alloc);
+ }
+ 
-- 
2.39.2

[bug#63499] [PATCH gnome-team 1/3] gnu: gst-plugins-base: Fix build.

[Maxim Cournoyer]

Hi Liliana,

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

> * gnu/packages/patches/gst-plugins-base-fix-broken-test.patch: New file.
> * gnu/packages/gstreamer.scm (gst-plugins-base)[patches]: Use it here.
> * gnu/local.mk (dist_patch_DATA): Register it here.
> ---
>  gnu/local.mk                                  |  1 +
>  gnu/packages/gstreamer.scm                    |  3 ++-
>  .../gst-plugins-base-fix-broken-test.patch    | 22 +++++++++++++++++++
>  3 files changed, 25 insertions(+), 1 deletion(-)
>  create mode 100644 gnu/packages/patches/gst-plugins-base-fix-broken-test.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 43d6077943..0ff787e8f3 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -1316,6 +1316,7 @@ dist_patch_DATA =						\
>    %D%/packages/patches/guile-present-coding.patch		\
>    %D%/packages/patches/guile-rsvg-pkgconfig.patch		\
>    %D%/packages/patches/guile-emacs-fix-configure.patch		\
> +  %D%/packages/patches/gst-plugins-base-fix-broken-test.patch		\
>    %D%/packages/patches/gtk2-fix-builder-test.patch		\
>    %D%/packages/patches/gtk2-harden-list-store.patch		\
>    %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch	\
> diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
> index 8971c11479..f7e5b397fd 100644
> --- a/gnu/packages/gstreamer.scm
> +++ b/gnu/packages/gstreamer.scm
> @@ -550,7 +550,8 @@ (define-public gst-plugins-base
>                            name "-" version ".tar.xz"))
>        (sha256
>         (base32
> -        "0jcxcx4mgfjvfb3ixibwhx8j330mq3ap469w7hapm6z79q614rgb"))))
> +        "0jcxcx4mgfjvfb3ixibwhx8j330mq3ap469w7hapm6z79q614rgb"))
> +      (patches (search-patches "gst-plugins-base-fix-broken-test.patch"))))
>      (build-system meson-build-system)
>      (propagated-inputs
>       (list glib                     ;required by gstreamer-sdp-1.0.pc
> diff --git a/gnu/packages/patches/gst-plugins-base-fix-broken-test.patch b/gnu/packages/patches/gst-plugins-base-fix-broken-test.patch
> new file mode 100644
> index 0000000000..2785983d8d
> --- /dev/null
> +++ b/gnu/packages/patches/gst-plugins-base-fix-broken-test.patch
> @@ -0,0 +1,22 @@
> +Index: gst-plugins-base-1.22.1/tests/check/libs/allocators.c
> +===================================================================
> +--- gst-plugins-base-1.22.1.orig/tests/check/libs/allocators.c
> ++++ gst-plugins-base-1.22.1/tests/check/libs/allocators.c
> +@@ -80,7 +80,7 @@ GST_START_TEST (test_fdmem)
> + 
> +   alloc = gst_fd_allocator_new ();
> +   fail_unless (alloc);
> +-  mem = gst_fd_allocator_alloc (alloc, fd, 10, GST_FD_MEMORY_FLAG_KEEP_MAPPED);
> ++  mem = gst_fd_allocator_alloc (alloc, fd, 10, GST_FD_MEMORY_FLAG_KEEP_MAPPED | GST_FD_MEMORY_FLAG_DONT_CLOSE);
> + 
> +   fail_unless (gst_memory_map (mem, &info, GST_MAP_READ));
> +   fail_unless (info.data[5] == '5');
> +@@ -95,7 +95,7 @@ GST_START_TEST (test_fdmem)
> +   gst_memory_unmap (mem, &info);
> + 
> +   gst_memory_unref (mem);
> +-  fail_unless (g_close (fd, NULL) == 0);
> ++  fail_unless (g_close (fd, NULL));
> +   gst_object_unref (alloc);
> + }
> + 

The patch should be annotated with metadata concerning its origin, with
a link to track the status upstream (not yet released upstream patch?
custom patch?).  If it wasn't reported to upstream, it should be.

Thanks!

Maxim

[bug#63499] [PATCH gnome-team 1/3] gnu: gst-plugins-base: Fix build.

[Liliana Marie Prikler]

Am Montag, dem 15.05.2023 um 09:46 -0400 schrieb Maxim Cournoyer:
> Hi Liliana,
> 
> [...]
> 
> The patch should be annotated with metadata concerning its origin,
> with a link to track the status upstream (not yet released upstream
> patch? custom patch?).  If it wasn't reported to upstream, it should
> be.
Independently discovered and fixed in [1].  For clarity, I will prefer
that one or wait for 1.22.3.

Cheers


[1]
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4381

[bug#63499] [PATCH gnome-team 2/3] gnu: gtk: Update to 4.10.3.

[Liliana Marie Prikler]

* gnu/packages/gtk.scm (gtk): Update to 4.10.3.
[source]: Unbundle gi-docgen.
[native-inputs]: Add gi-docgen.
[arguments]<#:test-options>: Add “--no-suite=failing” and “--no-suite=flaky”.
---
 gnu/packages/gtk.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 9d628d243c..de45eb3870 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1109,7 +1109,7 @@ (define-public gtk+
 (define-public gtk
   (package
     (name "gtk")
-    (version "4.8.1")
+    (version "4.10.3")
     (source
      (origin
        (method url-fetch)
@@ -1117,9 +1117,11 @@ (define-public gtk
                            (version-major+minor version)  "/"
                            name "-" version ".tar.xz"))
        (sha256
-        (base32 "1za2nyqqs2lrbss61gfw17qba2f0w6a119m1xk4d0fx2k3gdis2w"))
+        (base32 "1aff06l9v40j16s4s0qvdbj8cs54qxnh41d7w2v7wdwyswd48ia5"))
        (patches
-        (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))))
+        (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))
+       (modules '((guix build utils)))
+       (snippet #~(begin (delete-file-recursively "subprojects/gi-docgen")))))
     (build-system meson-build-system)
     (outputs '("out" "bin" "doc"))
     (arguments
@@ -1143,6 +1145,8 @@ (define-public gtk
                             ;; Use the same test options as upstream uses for
                             ;; their CI.
                             "--suite=gtk"
+                            "--no-suite=failing"
+                            "--no-suite=flaky"
                             "--no-suite=gsk-compare-broadway")
       #:phases
       #~(modify-phases %standard-phases
@@ -1249,6 +1253,7 @@ (define-public gtk
            cups                         ;for CUPS print-backend
            ffmpeg                       ;for ffmpeg media-backend
            fribidi
+           gi-docgen
            gstreamer                    ;for gstreamer media-backend
            gst-plugins-bad              ;provides gstreamer-player
            gst-plugins-base             ;provides gstreamer-gl
-- 
2.39.2

[bug#63499] [PATCH gnome-team 2/3] gnu: gtk: Update to 4.10.3.

[Maxim Cournoyer]

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

> * gnu/packages/gtk.scm (gtk): Update to 4.10.3.
> [source]: Unbundle gi-docgen.
> [native-inputs]: Add gi-docgen.
> [arguments]<#:test-options>: Add “--no-suite=failing” and “--no-suite=flaky”.

LGTM.

-- 
Thanks,
Maxim

[bug#63499] [PATCH gnome-team 3/3] gnu: gtksourceview: Fix build.

[Liliana Marie Prikler]

* gnu/packages/gtk.scm (gtksourceview)[#:phases]<pre-check>: Set “GDK_BACKEND”
and “GTK_A11Y”.
---
 gnu/packages/gtk.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index de45eb3870..7d76610293 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -616,6 +616,9 @@ (define-public gtksourceview
                ;; Tests require a running X server.
                (system (string-append Xvfb " :1 &"))
                (setenv "DISPLAY" ":1")
+               ;; For GTK
+               (setenv "GDK_BACKEND" "x11")
+               (setenv "GTK_A11Y" "none")
                ;; For the missing /etc/machine-id.
                (setenv "DBUS_FATAL_WARNINGS" "0")))))))
     (native-inputs
-- 
2.39.2

[bug#63499] [PATCH gnome-team 3/3] gnu: gtksourceview: Fix build.

[Maxim Cournoyer]

Hello,

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

> * gnu/packages/gtk.scm (gtksourceview)[#:phases]<pre-check>: Set “GDK_BACKEND”
> and “GTK_A11Y”.
> ---
>  gnu/packages/gtk.scm | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> index de45eb3870..7d76610293 100644
> --- a/gnu/packages/gtk.scm
> +++ b/gnu/packages/gtk.scm
> @@ -616,6 +616,9 @@ (define-public gtksourceview
>                 ;; Tests require a running X server.
>                 (system (string-append Xvfb " :1 &"))
>                 (setenv "DISPLAY" ":1")
> +               ;; For GTK

Nitpick: Add a full stop (period) for standalone comments.  Perhaps
expound how these environment variables are useful to set ('For GTK'
leaves me wondering, as 'gtksourceview' already seems GTK-focused).

> +               (setenv "GDK_BACKEND" "x11")
> +               (setenv "GTK_A11Y" "none")
>                 ;; For the missing /etc/machine-id.
>                 (setenv "DBUS_FATAL_WARNINGS" "0")))))))
>      (native-inputs

Otherwise, LGTM.

-- 
Thanks,
Maxim

[bug#63499] [PATCH gnome-team 3/3] gnu: gtksourceview: Fix build.

[Liliana Marie Prikler]

Am Montag, dem 15.05.2023 um 09:49 -0400 schrieb Maxim Cournoyer:
> Hello,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > * gnu/packages/gtk.scm (gtksourceview)[#:phases]<pre-check>: Set
> > “GDK_BACKEND”
> > and “GTK_A11Y”.
> > ---
> >  gnu/packages/gtk.scm | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> > index de45eb3870..7d76610293 100644
> > --- a/gnu/packages/gtk.scm
> > +++ b/gnu/packages/gtk.scm
> > @@ -616,6 +616,9 @@ (define-public gtksourceview
> >                 ;; Tests require a running X server.
> >                 (system (string-append Xvfb " :1 &"))
> >                 (setenv "DISPLAY" ":1")
> > +               ;; For GTK
> 
> Nitpick: Add a full stop (period) for standalone comments.  Perhaps
> expound how these environment variables are useful to set ('For GTK'
> leaves me wondering, as 'gtksourceview' already seems GTK-focused).
Full disclosure, I don't quite understand what's wrong here myself, but
with the upgrade to GTK 4.10, tests fail
- due to GDK_BACKEND not being said for ??? reason
- due to GTK_A11Y because GTK tries to spawn dbus and fails to connect.

> 
If there's a better wording for that, I'm all ears :)

[bug#63499] [PATCH gnome-team 3/3] gnu: gtksourceview: Fix build.

[Maxim Cournoyer]

Hi,

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

> Am Montag, dem 15.05.2023 um 09:49 -0400 schrieb Maxim Cournoyer:
>> Hello,
>> 
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> 
>> > * gnu/packages/gtk.scm (gtksourceview)[#:phases]<pre-check>: Set
>> > “GDK_BACKEND”
>> > and “GTK_A11Y”.
>> > ---
>> >  gnu/packages/gtk.scm | 3 +++
>> >  1 file changed, 3 insertions(+)
>> > 
>> > diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
>> > index de45eb3870..7d76610293 100644
>> > --- a/gnu/packages/gtk.scm
>> > +++ b/gnu/packages/gtk.scm
>> > @@ -616,6 +616,9 @@ (define-public gtksourceview
>> >                 ;; Tests require a running X server.
>> >                 (system (string-append Xvfb " :1 &"))
>> >                 (setenv "DISPLAY" ":1")
>> > +               ;; For GTK
>> 
>> Nitpick: Add a full stop (period) for standalone comments.  Perhaps
>> expound how these environment variables are useful to set ('For GTK'
>> leaves me wondering, as 'gtksourceview' already seems GTK-focused).
> Full disclosure, I don't quite understand what's wrong here myself, but
> with the upgrade to GTK 4.10, tests fail
> - due to GDK_BACKEND not being said for ??? reason
> - due to GTK_A11Y because GTK tries to spawn dbus and fails to connect.
>
>> 
> If there's a better wording for that, I'm all ears :)

Perhaps above setenv "GTK_BACKEND" mention "XXX: To avoid failures in
tests." and then above GTK_A11Y mention "Otherwise, GTK tries to spawn
D-Bus and fails to connect."

This captures everything you know; I think it's an improvement.

-- 
Thanks,
Maxim

bug#63499: [PATCH gnome-team 3/3] gnu: gtksourceview: Fix build.

[Liliana Marie Prikler]

Am Montag, dem 15.05.2023 um 15:44 -0400 schrieb Maxim Cournoyer:
> Hi,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > Am Montag, dem 15.05.2023 um 09:49 -0400 schrieb Maxim Cournoyer:
> > > Hello,
> > > 
> > > Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> > > 
> > > > * gnu/packages/gtk.scm (gtksourceview)[#:phases]<pre-check>:
> > > > Set
> > > > “GDK_BACKEND”
> > > > and “GTK_A11Y”.
> > > > ---
> > > >  gnu/packages/gtk.scm | 3 +++
> > > >  1 file changed, 3 insertions(+)
> > > > 
> > > > diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> > > > index de45eb3870..7d76610293 100644
> > > > --- a/gnu/packages/gtk.scm
> > > > +++ b/gnu/packages/gtk.scm
> > > > @@ -616,6 +616,9 @@ (define-public gtksourceview
> > > >                 ;; Tests require a running X server.
> > > >                 (system (string-append Xvfb " :1 &"))
> > > >                 (setenv "DISPLAY" ":1")
> > > > +               ;; For GTK
> > > 
> > > Nitpick: Add a full stop (period) for standalone comments. 
> > > Perhaps
> > > expound how these environment variables are useful to set ('For
> > > GTK'
> > > leaves me wondering, as 'gtksourceview' already seems GTK-
> > > focused).
> > Full disclosure, I don't quite understand what's wrong here myself,
> > but
> > with the upgrade to GTK 4.10, tests fail
> > - due to GDK_BACKEND not being said for ??? reason
> > - due to GTK_A11Y because GTK tries to spawn dbus and fails to
> > connect.
> > 
> > > 
> > If there's a better wording for that, I'm all ears :)
> 
> Perhaps above setenv "GTK_BACKEND" mention "XXX: To avoid failures in
> tests." and then above GTK_A11Y mention "Otherwise, GTK tries to
> spawn D-Bus and fails to connect."
> 
> This captures everything you know; I think it's an improvement.
Reworded a little and pushed with GStreamer 1.22.3.

Cheers