diff mbox series

[bug#73128,gnome-team,v2,12/13] gnu: mutter: Update to 46.4.

Message ID 008194655511998d494309f05c75c6043dadc0af.1726213021.git.liliana.prikler@gmail.com
State New
Headers show
Series [bug#73128,gnome-team,v2,01/13] gnu: orca: Update to 46.2. | expand

Commit Message

Liliana Marie Prikler Sept. 13, 2024, 7:37 a.m. UTC 
* gnu/packages/gnome.scm (mutter): Update to 46.4.
[#:configure-flags]: Update accordingly.
[native-inputs]: Replace wayland-protocols with wayland-protocols-next.
Add libei.
[inputs]: Add linux-libre-headers-6.1.
---
 gnu/packages/gnome.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Comments

Maxim Cournoyer Sept. 13, 2024, 3:01 p.m. UTC | #1 
Hi,

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

[...]

>             libxrandr
>             libxtst
> +           linux-libre-headers-6.1      ; for dma_buf_export_sync_file
>             pipewire

This reminds me, we should do something about
https://issues.guix.gnu.org/72119.
Liliana Marie Prikler Sept. 13, 2024, 3:31 p.m. UTC | #2 
Am Samstag, dem 14.09.2024 um 00:01 +0900 schrieb Maxim Cournoyer:
> Hi,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> [...]
> 
> >             libxrandr
> >             libxtst
> > +           linux-libre-headers-6.1      ; for
> > dma_buf_export_sync_file
> >             pipewire
> 
> This reminds me, we should do something about
> https://issues.guix.gnu.org/72119.
Not sure if that's related, but it seems you need a Linux 6 kernel for
GNOME now.  I haven't seen a switch to disable it – we would need a
patch for that.

Cheers
Maxim Cournoyer Sept. 14, 2024, 1:27 p.m. UTC | #3 
Hi Liliana,

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

> Am Samstag, dem 14.09.2024 um 00:01 +0900 schrieb Maxim Cournoyer:
>> Hi,
>> 
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> 
>> [...]
>> 
>> >             libxrandr
>> >             libxtst
>> > +           linux-libre-headers-6.1      ; for
>> > dma_buf_export_sync_file
>> >             pipewire
>> 
>> This reminds me, we should do something about
>> https://issues.guix.gnu.org/72119.
> Not sure if that's related, but it seems you need a Linux 6 kernel for
> GNOME now.  I haven't seen a switch to disable it – we would need a
> patch for that.

I propose we rename current 'linux-libre-headers' to
'linux-libre-headers/pinned', making 'linux-libre-headers' track latest
from there.

Then, we'd bump linux-libre-headers/pinned to latest in a
world-rebuilding branch.

Does that sound like a plan?
Liliana Marie Prikler Sept. 14, 2024, 1:54 p.m. UTC | #4 
Am Samstag, dem 14.09.2024 um 22:27 +0900 schrieb Maxim Cournoyer:
> Hi Liliana,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > Am Samstag, dem 14.09.2024 um 00:01 +0900 schrieb Maxim Cournoyer:
> > > Hi,
> > > 
> > > Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> > > 
> > > [...]
> > > 
> > > >             libxrandr
> > > >             libxtst
> > > > +           linux-libre-headers-6.1      ; for
> > > > dma_buf_export_sync_file
> > > >             pipewire
> > > 
> > > This reminds me, we should do something about
> > > https://issues.guix.gnu.org/72119.
> > Not sure if that's related, but it seems you need a Linux 6 kernel
> > for GNOME now.  I haven't seen a switch to disable it – we would
> > need a patch for that.
> 
> I propose we rename current 'linux-libre-headers' to
> 'linux-libre-headers/pinned', making 'linux-libre-headers' track
> latest from there.
> 
> Then, we'd bump linux-libre-headers/pinned to latest in a
> world-rebuilding branch.
> 
> Does that sound like a plan?
SGTM, but I'm not sure whether that's something for gnome-team.  We
might want to discuss this within a wider area.

Cheers
Maxim Cournoyer Sept. 14, 2024, 2:41 p.m. UTC | #5 
Hi Liliana,

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

> Am Samstag, dem 14.09.2024 um 22:27 +0900 schrieb Maxim Cournoyer:
>> Hi Liliana,
>> 
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> 
>> > Am Samstag, dem 14.09.2024 um 00:01 +0900 schrieb Maxim Cournoyer:
>> > > Hi,
>> > > 
>> > > Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> > > 
>> > > [...]
>> > > 
>> > > >             libxrandr
>> > > >             libxtst
>> > > > +           linux-libre-headers-6.1      ; for
>> > > > dma_buf_export_sync_file
>> > > >             pipewire
>> > > 
>> > > This reminds me, we should do something about
>> > > https://issues.guix.gnu.org/72119.
>> > Not sure if that's related, but it seems you need a Linux 6 kernel
>> > for GNOME now.  I haven't seen a switch to disable it – we would
>> > need a patch for that.
>> 
>> I propose we rename current 'linux-libre-headers' to
>> 'linux-libre-headers/pinned', making 'linux-libre-headers' track
>> latest from there.
>> 
>> Then, we'd bump linux-libre-headers/pinned to latest in a
>> world-rebuilding branch.
>> 
>> Does that sound like a plan?
> SGTM, but I'm not sure whether that's something for gnome-team.  We
> might want to discuss this within a wider area.

Agreed.  I've proposed the same to Leo and Wilker in the thread of
bug#66968 (https://issues.guix.gnu.org/66968).
diff mbox series

Patch

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 71aeec0905..90669e6703 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7976,7 +7976,7 @@  (define-public zenity
 (define-public mutter
   (package
     (name "mutter")
-    (version "44.9")
+    (version "46.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -7984,7 +7984,7 @@  (define-public mutter
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0b7wzaj67qzrhgclvqk10fwk4524j4qppl88822mxxlqr40frfnk"))))
+                "1r02fp1z5ikm9ml2m4dvnfdn3nig4wj45cz2gicmdnrak37xj6v1"))))
     ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
     ;; versions of cogl and clutter.  As a result, many of the inputs,
     ;; propagated-inputs, and configure flags used in cogl and clutter are
@@ -8001,7 +8001,7 @@  (define-public mutter
          ;; Otherwise, the RUNPATH will lack the final path component.
          (string-append "-Dc_link_args=-Wl,-rpath="
                         #$output "/lib,-rpath="
-                        #$output "/lib/mutter-12")
+                        #$output "/lib/mutter-14")
          ;; Disable systemd support.
          "-Dsystemd=false"
          ;; Don't install tests.
@@ -8124,19 +8124,20 @@  (define-public mutter
            autoconf
            automake
            libtool
-           wayland-protocols
+           wayland-protocols-next
            ;; For tests.
            ;; Warnings are configured to be fatal during the tests; add an icon
            ;; theme to please libxcursor.
            adwaita-icon-theme
+           libei
            libxcursor                   ;for XCURSOR_PATH
            pipewire
            python
            python-dbus
            python-dbusmock))
     (propagated-inputs
-     (list gsettings-desktop-schemas      ;required by libmutter-12.pc
-           ;; mutter-clutter-12.pc and mutter-cogl-12.pc refer to these:
+     (list gsettings-desktop-schemas      ;required by libmutter-14.pc
+           ;; mutter-clutter-14.pc and mutter-cogl-14.pc refer to these:
            at-spi2-core
            cairo
            eudev
@@ -8171,6 +8172,7 @@  (define-public mutter
            libxkbfile
            libxrandr
            libxtst
+           linux-libre-headers-6.1      ; for dma_buf_export_sync_file
            pipewire
            startup-notification
            sysprof