bug#26887: [PATCH 01/11] gnu: libdrm: Update to 2.4.80.

bug#26887: [PATCH 01/11] gnu: libdrm: Update to 2.4.80.

[Kei Kebreau]

From: Marius Bakke <mbakke@fastmail.com>

* gnu/packages/xdisorg.scm (libdrm): Update to 2.4.80.
---
 gnu/packages/xdisorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 89830a628..8d7f2195c 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -277,7 +277,7 @@ rasterisation.")
 (define-public libdrm
   (package
     (name "libdrm")
-    (version "2.4.79")
+    (version "2.4.80")
     (source
       (origin
         (method url-fetch)
@@ -287,7 +287,7 @@ rasterisation.")
                ".tar.bz2"))
         (sha256
          (base32
-          "15xiwnicf7vl1l37k8nj0z496p7ln1qp8qws7q13ikiv54cz7an6"))
+          "1wa9cnzf60xwx67zq9ay48xr3j3sn1z80q77jpbzmkg906b52am8"))
         (patches (search-patches "libdrm-symbol-check.patch"))))
     (build-system gnu-build-system)
     (inputs
-- 
2.13.0

bug#26887: [PATCH 02/11] gnu: mesa: Update to 17.0.4.

[Kei Kebreau]

From: Marius Bakke <mbakke@fastmail.com>

* gnu/packages/patches/mesa-skip-disk-cache-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/gl.scm (mesa): Update to 17.0.4.
[source]: Adapt URI to new directory structure.
[arguments]: End phases on #t. Remove stray whitespaces.
[home-page]: Use HTTPS.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/gl.scm                                | 23 +++++++++++++---------
 .../patches/mesa-skip-disk-cache-test.patch        | 20 +++++++++++++++++++
 3 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 gnu/packages/patches/mesa-skip-disk-cache-test.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 5822add4c..552dd0549 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -775,6 +775,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/mcrypt-CVE-2012-4409.patch			\
   %D%/packages/patches/mcrypt-CVE-2012-4426.patch			\
   %D%/packages/patches/mcrypt-CVE-2012-4527.patch			\
+  %D%/packages/patches/mesa-skip-disk-cache-test.patch		\
   %D%/packages/patches/mesa-wayland-egl-symbols-check-mips.patch	\
   %D%/packages/patches/metabat-remove-compilation-date.patch	\
   %D%/packages/patches/mhash-keygen-test-segfault.patch		\
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index bb2eb768e..f43f46439 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -217,17 +217,20 @@ also known as DXTn or DXTC) for Mesa.")
 (define-public mesa
   (package
     (name "mesa")
-    (version "13.0.5")
+    (version "17.0.4")
     (source
       (origin
         (method url-fetch)
-        (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
-                            version "/mesa-" version ".tar.xz"))
+        (uri (list (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
+                                  "mesa-" version ".tar.xz")
+                   (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
+                                  version "/mesa-" version ".tar.xz")))
         (sha256
          (base32
-          "11zgynii1wz17131ml1mmblpwib8m88zz2jwi5h5llh1r3iagkmz"))
+          "0im3ca1vwwmkjf5w761vh7vabr4vrrdxpckr0wm974x18n2xqs8j"))
         (patches
-         (search-patches "mesa-wayland-egl-symbols-check-mips.patch"))))
+         (search-patches "mesa-wayland-egl-symbols-check-mips.patch"
+                         "mesa-skip-disk-cache-test.patch"))))
     (build-system gnu-build-system)
     (propagated-inputs
       `(("glproto" ,glproto)
@@ -281,7 +284,7 @@ also known as DXTn or DXTC) for Mesa.")
          ;; Without floating point texture support, drivers such as Nouveau
          ;; are stuck at OpenGL 2.1 instead of OpenGL 3.0+.
          "--enable-texture-float"
-         
+
          ;; Also enable the tests.
          "--enable-gallium-tests"
 
@@ -301,7 +304,8 @@ also known as DXTn or DXTC) for Mesa.")
              (substitute* "src/compiler/glsl/tests/lower_jumps/create_test_cases.py"
                (("/usr/bin/env bash") (which "bash")))
              (substitute* "src/intel/genxml/gen_pack_header.py"
-               (("/usr/bin/env python2") (which "python")))))
+               (("/usr/bin/env python2") (which "python")))
+             #t))
          (add-before
            'build 'fix-dlopen-libnames
            (lambda* (#:key inputs outputs #:allow-other-keys)
@@ -325,8 +329,9 @@ also known as DXTn or DXTC) for Mesa.")
                  ;; it's never installed since Mesa removed its
                  ;; egl_gallium support.
                  (("\"gbm_dri\\.so")
-                  (string-append "\"" out "/lib/dri/gbm_dri.so")))))))))
-    (home-page "http://mesa3d.org/")
+                  (string-append "\"" out "/lib/dri/gbm_dri.so")))
+               #t))))))
+    (home-page "https://mesa3d.org/")
     (synopsis "OpenGL implementation")
     (description "Mesa is a free implementation of the OpenGL specification -
 a system for rendering interactive 3D graphics.  A variety of device drivers
diff --git a/gnu/packages/patches/mesa-skip-disk-cache-test.patch b/gnu/packages/patches/mesa-skip-disk-cache-test.patch
new file mode 100644
index 000000000..437711047
--- /dev/null
+++ b/gnu/packages/patches/mesa-skip-disk-cache-test.patch
@@ -0,0 +1,20 @@
+disk_cache_create() here looks up the users home directory from <pwd.h>
+which resolves to "/" in the build environment. I could not find an easy
+way to set the home directory to something else, so we disable this test
+for now.
+
+--- a/src/compiler/glsl/tests/cache_test.c
++++ b/src/compiler/glsl/tests/cache_test.c
+@@ -137,11 +137,6 @@
+    unsetenv("MESA_GLSL_CACHE_DIR");
+    unsetenv("XDG_CACHE_HOME");
+
+-   cache = disk_cache_create();
+-   expect_non_null(cache, "disk_cache_create with no environment variables");
+-
+-   disk_cache_destroy(cache);
+-
+    /* Test with XDG_CACHE_HOME set */
+    setenv("XDG_CACHE_HOME", CACHE_TEST_TMP "/xdg-cache-home", 1);
+    cache = disk_cache_create();
+
-- 
2.13.0

bug#26886: [PATCH 03/11] gnu: gtk+: Update to 3.22.12.

[Kei Kebreau]

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

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index e75a08575..985056b95 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -653,7 +653,7 @@ application suites.")
    (name "gtk+")
    ;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in
    ;;       mate.scm will also need to be updated.
-   (version "3.22.6")
+   (version "3.22.12")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnome/sources/" name "/"
@@ -661,7 +661,7 @@ application suites.")
                                 name "-" version ".tar.xz"))
             (sha256
              (base32
-              "0bqpx8825b1fdjmz14wq20zq58gq1yi1p5xjps8l6zqid8hmm9zb"))
+              "1359w81sxs2izkan2rni985x78s6zr1arf469qmyw4bazg7f1yl4"))
             (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
                                      "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
    (outputs '("out" "bin" "doc"))
-- 
2.13.0

bug#26880: [PATCH 04/11] gnu: gtk+: Enable wayland backend.

[Kei Kebreau]

* gnu/packages/gtk.scm (gtk+)[propagated-inputs]: Add libxkbcommon,
mesa, wayland and wayland-protocols.
[arguments]: Add "--enable-wayland-backend" and "--enable-x11-backend"
to #:configure-flags.
---
 gnu/packages/gtk.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 985056b95..9732ee4cc 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -50,6 +50,7 @@
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages enchant)
   #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gl)
@@ -673,8 +674,12 @@ application suites.")
       ("libxcursor" ,libxcursor)
       ("libxi" ,libxi)
       ("libxinerama" ,libxinerama)
+      ("libxkbcommon" ,libxkbcommon)
       ("libxdamage" ,libxdamage)
-      ("pango" ,pango)))
+      ("mesa" ,mesa)
+      ("pango" ,pango)
+      ("wayland" ,wayland)
+      ("wayland-protocols" ,wayland-protocols)))
    (inputs
     `(("libxml2" ,libxml2)
       ;; XXX: colord depends on mozjs (through polkit), which fails on
@@ -700,7 +705,12 @@ application suites.")
       ;; to "doc".
       #:configure-flags (list (string-append "--with-html-dir="
                                              (assoc-ref %outputs "doc")
-                                             "/share/gtk-doc/html"))
+                                             "/share/gtk-doc/html")
+                              ;; The header file <gdk/gdkwayland.h> is required
+                              ;; by gnome-control-center
+                              "--enable-wayland-backend"
+                              ;; This is necessary to build both backends.
+                              "--enable-x11-backend")
       #:phases (modify-phases %standard-phases
         (add-before 'configure 'pre-configure
           (lambda _
-- 
2.13.0

bug#26880: [PATCH 04/11] gnu: gtk+: Enable wayland backend.

[Marius Bakke]

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

Kei Kebreau <kei@openmailbox.org> writes:

> * gnu/packages/gtk.scm (gtk+)[propagated-inputs]: Add libxkbcommon,
> mesa, wayland and wayland-protocols.
> [arguments]: Add "--enable-wayland-backend" and "--enable-x11-backend"
> to #:configure-flags.

Why do these inputs need to be propagated? Apart from that I think this
looks okay. Would like other opinions though.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#26880: [PATCH 04/11] gnu: gtk+: Enable wayland backend.

[Kei Kebreau]

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

Marius Bakke <mbakke@fastmail.com> writes:

> Kei Kebreau <kei@openmailbox.org> writes:
>
>> * gnu/packages/gtk.scm (gtk+)[propagated-inputs]: Add libxkbcommon,
>> mesa, wayland and wayland-protocols.
>> [arguments]: Add "--enable-wayland-backend" and "--enable-x11-backend"
>> to #:configure-flags.
>
> Why do these inputs need to be propagated? Apart from that I think this
> looks okay. Would like other opinions though.

Many packages depending on gtk+ ended up needing these inputs. I can
sift through my gtk+ .pc files to see if propagation is absolutely necessary.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

bug#26880: [PATCH 04/11] gnu: gtk+: Enable wayland backend.

[Marius Bakke]

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

Kei Kebreau <kei@openmailbox.org> writes:

> Marius Bakke <mbakke@fastmail.com> writes:
>
>> Kei Kebreau <kei@openmailbox.org> writes:
>>
>>> * gnu/packages/gtk.scm (gtk+)[propagated-inputs]: Add libxkbcommon,
>>> mesa, wayland and wayland-protocols.
>>> [arguments]: Add "--enable-wayland-backend" and "--enable-x11-backend"
>>> to #:configure-flags.
>>
>> Why do these inputs need to be propagated? Apart from that I think this
>> looks okay. Would like other opinions though.
>
> Many packages depending on gtk+ ended up needing these inputs. I can
> sift through my gtk+ .pc files to see if propagation is absolutely necessary.

That would be great. Maybe some of these should be propagated from
wayland instead.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#26880: [PATCH 04/11] gnu: gtk+: Enable wayland backend.

[Kei Kebreau]

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

Marius Bakke <mbakke@fastmail.com> writes:

> Kei Kebreau <kei@openmailbox.org> writes:
>
>> Marius Bakke <mbakke@fastmail.com> writes:
>>
>>> Kei Kebreau <kei@openmailbox.org> writes:
>>>
>>>> * gnu/packages/gtk.scm (gtk+)[propagated-inputs]: Add libxkbcommon,
>>>> mesa, wayland and wayland-protocols.
>>>> [arguments]: Add "--enable-wayland-backend" and "--enable-x11-backend"
>>>> to #:configure-flags.
>>>
>>> Why do these inputs need to be propagated? Apart from that I think this
>>> looks okay. Would like other opinions though.
>>
>> Many packages depending on gtk+ ended up needing these inputs. I can
>> sift through my gtk+ .pc files to see if propagation is absolutely necessary.
>
> That would be great. Maybe some of these should be propagated from
> wayland instead.

It looks like gtk+ needs them to be propagated. No xkbcommon to be found
in my wayland .pc files.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

bug#26880: [PATCH 04/11] gnu: gtk+: Enable wayland backend.

[Marius Bakke]

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

Kei Kebreau <kei@openmailbox.org> writes:

> Marius Bakke <mbakke@fastmail.com> writes:
>
>> Kei Kebreau <kei@openmailbox.org> writes:
>>
>>> Marius Bakke <mbakke@fastmail.com> writes:
>>>
>>>> Kei Kebreau <kei@openmailbox.org> writes:
>>>>
>>>>> * gnu/packages/gtk.scm (gtk+)[propagated-inputs]: Add libxkbcommon,
>>>>> mesa, wayland and wayland-protocols.
>>>>> [arguments]: Add "--enable-wayland-backend" and "--enable-x11-backend"
>>>>> to #:configure-flags.
>>>>
>>>> Why do these inputs need to be propagated? Apart from that I think this
>>>> looks okay. Would like other opinions though.
>>>
>>> Many packages depending on gtk+ ended up needing these inputs. I can
>>> sift through my gtk+ .pc files to see if propagation is absolutely necessary.
>>
>> That would be great. Maybe some of these should be propagated from
>> wayland instead.
>
> It looks like gtk+ needs them to be propagated. No xkbcommon to be found
> in my wayland .pc files.

And they're all in Requires.private of the gtk+ .pc files? LGTM in that
case. Pending other comments I think you can go ahead and push these
tomorrow. Maybe we can have native Wayland support by 1.0! :-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#26880: [PATCH 04/11] gnu: gtk+: Enable wayland backend.

[Kei Kebreau]

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

Marius Bakke <mbakke@fastmail.com> writes:

> And they're all in Requires.private of the gtk+ .pc files? LGTM in that
> case.

Yes they are and thanks for the review.

> Pending other comments I think you can go ahead and push these
> tomorrow. Maybe we can have native Wayland support by 1.0! :-)

It's definitely worth a shot!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

bug#26887: [PATCH 05/11] gnu: cogl: Enable wayland support.

[Kei Kebreau]

* gnu/packages/gnome.scm (cogl)[inputs]: Add wayland.
[arguments]: Add "--enable-wayland-egl-platform" and
"--enable-wayland-egl-server".
---
 gnu/packages/gnome.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7f8aa839d..e6a1e3ca5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2920,9 +2920,13 @@ throughout GNOME for API documentation).")
        ("cairo" ,cairo)
        ("pango" ,pango)
        ("gstreamer" ,gstreamer)
-       ("gst-plugins-base" ,gst-plugins-base)))
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("wayland" ,wayland)))
     (arguments
      `(#:configure-flags (list "--enable-cogl-gst"
+                               "--enable-wayland-egl-platform"
+                               "--enable-wayland-egl-server"
+
                                ;; Arrange to pass an absolute file name to
                                ;; dlopen for libGL.so.
                                (string-append "--with-gl-libname="
-- 
2.13.0

bug#26887: [PATCH 05/11] gnu: cogl: Enable wayland support.

[Marius Bakke]

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

Kei Kebreau <kei@openmailbox.org> writes:

> * gnu/packages/gnome.scm (cogl)[inputs]: Add wayland.
> [arguments]: Add "--enable-wayland-egl-platform" and
> "--enable-wayland-egl-server".

LGTM.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#26887: [PATCH 06/11] gnu: gnome-desktop: Update to 3.24.1.

[Kei Kebreau]

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

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e6a1e3ca5..4a0274735 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -253,7 +253,7 @@ commonly used macros.")
 (define-public gnome-desktop
   (package
     (name "gnome-desktop")
-    (version "3.22.2")
+    (version "3.24.1")
     (source
      (origin
       (method url-fetch)
@@ -262,7 +262,7 @@ commonly used macros.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
-        "074yjz4g9gii045v2pl1ad34hcg92ci04ynxqcabwnf3lvvypmsi"))))
+        "1as5ri52n6wphvhqnxa813q15jri0x47hxsjikjcmb2big9vf2fy"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("gobject-introspection" ,gobject-introspection)
-- 
2.13.0

bug#26884: [PATCH 07/11] gnu: gnome-bluetooth: Update to 3.20.1.

[Kei Kebreau]

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

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4a0274735..17fb6b063 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4876,7 +4876,7 @@ usage and information about running processes.")
 (define-public gnome-bluetooth
   (package
     (name "gnome-bluetooth")
-    (version "3.20.0")
+    (version "3.20.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -4884,7 +4884,7 @@ usage and information about running processes.")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0lzbwk2kn7kp39sv5bf4ja92mfkxkc27gxxk8k86i8a8ncbcmcwk"))))
+                "1zlqcz6jz4vzzr8gd1678i9s4015kiwcpr5szrwz4kmryfsm147a"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      `(("glib:bin" ,glib "bin") ; for gdbus-codegen, etc.
-- 
2.13.0

bug#26882: [PATCH 08/11] gnu: gnome-online-accounts: Update to 3.24.0.

[Kei Kebreau]

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

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 17fb6b063..0a73e4148 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4401,7 +4401,7 @@ window manager.")
 (define-public gnome-online-accounts
   (package
     (name "gnome-online-accounts")
-    (version "3.22.3")
+    (version "3.24.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -4409,7 +4409,7 @@ window manager.")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "13wvnfh3hnasdnb6fhjssybj2327qihd32kpdjjb3r1qiyc8dvqb"))))
+                "0yy10znqj278lnhdiqjcqxrwwv5c1jdjd0ncjbbdyh8n0q77hbwy"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
-- 
2.13.0

bug#26881: [PATCH 09/11] gnu: gnome-control-center: Update to 3.24.1.

[Kei Kebreau]

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

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0a73e4148..a227d323c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4909,7 +4909,7 @@ devices using the GNOME desktop.")
 (define-public gnome-control-center
   (package
     (name "gnome-control-center")
-    (version "3.22.1")
+    (version "3.24.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -4917,7 +4917,7 @@ devices using the GNOME desktop.")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "06h9937sjfrzjf36pxqybg4wmkc5xdhbxgdkclnkjxiiqidjjsax"))))
+                "0g55i4w0a8qpfkl0vnzr3ng6adx8pdxqk8vzc3kvvx6xzlcqxk1h"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      '(#:phases
-- 
2.13.0

bug#26885: [PATCH 10/11] gnu: gnome-session: Update to 3.24.1.

[Kei Kebreau]

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

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a227d323c..f79b5351a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4079,7 +4079,7 @@ such as gzip tarballs.")
 (define-public gnome-session
   (package
     (name "gnome-session")
-    (version "3.22.2")
+    (version "3.24.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -4087,7 +4087,7 @@ such as gzip tarballs.")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1xahljysbpnc1zafm1y2lqnmmqi2jh4fx7h2y48d9ipqnknk26in"))))
+                "1vkfjsgks9czajivcg3y1krzlnilv2cnzzbdc7wrasrriqilji1v"))))
     (arguments
      '(#:phases
        (modify-phases %standard-phases
-- 
2.13.0

bug#26883: [PATCH 11/11] gnu: mutter: Update to 3.24.1.

[Kei Kebreau]

* gnu/packages/gnome.scm (mutter): Update to 3.24.1.
[arguments]: Enable wayland and the native backend. Add "use-elogind"
phase.
[propagated-inputs]: Remove wayland and wayland-protocols.
[inputs]: Add elogind and libxtst.
---
 gnu/packages/gnome.scm | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f79b5351a..fbb15ba0a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4300,24 +4300,21 @@ to display dialog boxes from the commandline and shell scripts.")
     (license license:lgpl2.0+)))
 
 (define-public mutter
-  ;; Uses the gnome 3.22 branch that only contains bug fixes.
-  (let ((commit "23c315ea7121e9bd108e2837d0b4beeba53c5e18"))
   (package
     (name "mutter")
-    (version (git-version "3.22.2" "1" commit))
+    (version "3.24.1")
     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "git://git.gnome.org/mutter")
-                    (commit commit)))
-              (file-name (git-file-name name version))
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/" name "/"
+                                  (version-major+minor version) "/"
+                                  name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1v1f9xyzjr1ihmfwpq9kzlv2lyr9qn63ck8zny699mbp5hsi11mb"))))
-     ;; 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
-     ;; needed here as well.
+                "093ax3ng7fv28qfkxpbvcx67mfiizwj5b4s17m5cmijwf3wpgamc"))))
+    ;; 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
+    ;; needed here as well.
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags
@@ -4326,8 +4323,7 @@ to display dialog boxes from the commandline and shell scripts.")
        ;;      implicit declaration of function ?roundf?
        (list "--enable-compile-warnings=minimum"
 
-             "--disable-wayland"           ; TODO enable wayland
-             ;; "--enable-native-backend"  ; TODO enable the native backend
+             "--enable-native-backend"
 
              ;; The following flags are needed for the bundled clutter
              "--enable-x11-backend=yes"
@@ -4340,8 +4336,15 @@ to display dialog boxes from the commandline and shell scripts.")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'autoreconf
-                    (lambda _
-                      (zero? (system* "autoreconf" "-vfi")))))))
+           (lambda _
+             (zero? (system* "autoreconf" "-vfi"))))
+         (add-before 'configure 'use-elogind
+           (lambda _
+             (substitute* (list "configure"
+                                "src/backends/native/meta-launcher.c"
+                                "src/core/main.c")
+               (("systemd") "elogind"))
+             #t)))))
     (native-inputs
      `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
        ("gobject-introspection" ,gobject-introspection)
@@ -4374,17 +4377,17 @@ to display dialog boxes from the commandline and shell scripts.")
        ("mesa" ,mesa)
        ("pango" ,pango)
        ("udev" ,eudev)
-       ("wayland" ,wayland)
-       ("wayland-protocols" ,wayland-protocols)
        ("xinput" ,xinput)))
     (inputs
-     `(("gnome-desktop" ,gnome-desktop)
+     `(("elogind" ,elogind)
+       ("gnome-desktop" ,gnome-desktop)
        ("libcanberra-gtk" ,libcanberra)
        ("libgudev" ,libgudev)
        ("libice" ,libice)
        ("libsm" ,libsm)
        ("libxkbfile" ,libxkbfile)
        ("libxrandr" ,libxrandr)
+       ("libxtst" ,libxtst)
        ("startup-notification" ,startup-notification)
        ("upower-glib" ,upower)
        ("xkeyboard-config" ,xkeyboard-config)
@@ -4396,7 +4399,7 @@ to display dialog boxes from the commandline and shell scripts.")
 desktop via OpenGL.  Mutter combines a sophisticated display engine using the
 Clutter toolkit with solid window-management logic inherited from the Metacity
 window manager.")
-    (license license:gpl2+))))
+    (license license:gpl2+)))
 
 (define-public gnome-online-accounts
   (package
-- 
2.13.0

bug#26883: [PATCH 11/11] gnu: mutter: Update to 3.24.1.

[Marius Bakke]

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

Kei Kebreau <kei@openmailbox.org> writes:

> * gnu/packages/gnome.scm (mutter): Update to 3.24.1.
> [arguments]: Enable wayland and the native backend. Add "use-elogind"
> phase.
> [propagated-inputs]: Remove wayland and wayland-protocols.
> [inputs]: Add elogind and libxtst.

This should also mention that the source is now a release download.

[...]

> @@ -4340,8 +4336,15 @@ to display dialog boxes from the commandline and shell scripts.")
>         #:phases
>         (modify-phases %standard-phases
>           (add-after 'unpack 'autoreconf
> -                    (lambda _
> -                      (zero? (system* "autoreconf" "-vfi")))))))
> +           (lambda _
> +             (zero? (system* "autoreconf" "-vfi"))))

...and this phase can likely be removed since we use a bootstrapped
release.

> +         (add-before 'configure 'use-elogind
> +           (lambda _
> +             (substitute* (list "configure"
> +                                "src/backends/native/meta-launcher.c"
> +                                "src/core/main.c")
> +               (("systemd") "elogind"))

This looks like it potentially could cause some trouble, especially in
configure. Could you add a comment about what we are substituting here?

Other than that looks okay to me, thanks a lot for working on it.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#26887: [PATCH 01/11] gnu: libdrm: Update to 2.4.80.

[Kei Kebreau]

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

Kei Kebreau <kei@openmailbox.org> writes:

These patches are intended for gnome-updates. The first three are merged
from master. Also, the mutter patch is not functional yet, as it
probably requires some updated package from master.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

bug#26887: [PATCH 01/11] gnu: libdrm: Update to 2.4.80.

[Marius Bakke]

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

Kei Kebreau <kei@openmailbox.org> writes:

> Kei Kebreau <kei@openmailbox.org> writes:
>
> These patches are intended for gnome-updates. The first three are merged
> from master. Also, the mutter patch is not functional yet, as it
> probably requires some updated package from master.

I think it's better to merge master directly instead of cherry-picking
these patches. We'd want to do that before starting it on Hydra anyway.

Would you like to do it? I think we can start building it shortly, Hydra
seems to have caught up with recent events. Maybe it'll be ready for the
release :)

Do you know if anything else remains after Mutter?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#26887: [PATCH 01/11] gnu: libdrm: Update to 2.4.80.

[Kei Kebreau]

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

Marius Bakke <mbakke@fastmail.com> writes:

> Kei Kebreau <kei@openmailbox.org> writes:
>
>> Kei Kebreau <kei@openmailbox.org> writes:
>>
>> These patches are intended for gnome-updates. The first three are merged
>> from master. Also, the mutter patch is not functional yet, as it
>> probably requires some updated package from master.
>
> I think it's better to merge master directly instead of cherry-picking
> these patches. We'd want to do that before starting it on Hydra anyway.
>
> Would you like to do it? I think we can start building it shortly, Hydra
> seems to have caught up with recent events. Maybe it'll be ready for the
> release :)
>
I can merge master and put these on top, though I can't test my patches
very quickly (building webkitgtk+ repeatedly on 10-year-old hardware \o/).
If your computer(s) are faster, I'd be more than happy to let you finish
this branch.

> Do you know if anything else remains after Mutter?

Within the gnome meta-package, everything from gnome-shell down. If all
of those main packages can be upgraded, I'll be satisfied.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

bug#26887: [PATCH 01/11] gnu: libdrm: Update to 2.4.80.

[Marius Bakke]

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

Kei Kebreau <kei@openmailbox.org> writes:

> Marius Bakke <mbakke@fastmail.com> writes:
>
>> Kei Kebreau <kei@openmailbox.org> writes:
>>
>>> Kei Kebreau <kei@openmailbox.org> writes:
>>>
>>> These patches are intended for gnome-updates. The first three are merged
>>> from master. Also, the mutter patch is not functional yet, as it
>>> probably requires some updated package from master.
>>
>> I think it's better to merge master directly instead of cherry-picking
>> these patches. We'd want to do that before starting it on Hydra anyway.
>>
>> Would you like to do it? I think we can start building it shortly, Hydra
>> seems to have caught up with recent events. Maybe it'll be ready for the
>> release :)
>>
> I can merge master and put these on top, though I can't test my patches
> very quickly (building webkitgtk+ repeatedly on 10-year-old hardware \o/).
> If your computer(s) are faster, I'd be more than happy to let you finish
> this branch.

I think these patches look fine (see other comments), at least up to
mutter. I'd suggest merging master and adding the patches leading to
it, as long as everyone is fine with adding wayland as a hard dependency
of gtk+.

Then we can start an evaluation on Hydra to get some substitutes before
trying the mutter update :)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#26881: bug#26887: [PATCH 01/11] gnu: libdrm: Update to 2.4.80.

[Kei Kebreau]

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

Kei Kebreau <kei@openmailbox.org> writes:

> Marius Bakke <mbakke@fastmail.com> writes:
>
>> Kei Kebreau <kei@openmailbox.org> writes:
>>
>>> Marius Bakke <mbakke@fastmail.com> writes:
>>>
>>>> Kei Kebreau <kei@openmailbox.org> writes:
>>>>
>>>>> Kei Kebreau <kei@openmailbox.org> writes:
>>>>>
>>>>> These patches are intended for gnome-updates. The first three are merged
>>>>> from master. Also, the mutter patch is not functional yet, as it
>>>>> probably requires some updated package from master.
>>>>
>>>> I think it's better to merge master directly instead of cherry-picking
>>>> these patches. We'd want to do that before starting it on Hydra anyway.
>>>>
>>>> Would you like to do it? I think we can start building it shortly, Hydra
>>>> seems to have caught up with recent events. Maybe it'll be ready for the
>>>> release :)
>>>>
>>> I can merge master and put these on top, though I can't test my patches
>>> very quickly (building webkitgtk+ repeatedly on 10-year-old hardware \o/).
>>> If your computer(s) are faster, I'd be more than happy to let you finish
>>> this branch.
>>
>> I think these patches look fine (see other comments), at least up to
>> mutter. I'd suggest merging master and adding the patches leading to
>> it, as long as everyone is fine with adding wayland as a hard dependency
>> of gtk+.
>>
>> Then we can start an evaluation on Hydra to get some substitutes before
>> trying the mutter update :)
>
> Last call for objections to wayland as a hard dependency of gtk+ on the
> gnome-updates branch! This will be committed in approximately 24 hours
> otherwise.

The gnome-updates branch has been updated! I'll be closing all of my
related bugs.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]