# This patch comes from upstream commit c0620e432650e81062c1967cc669829dbd29b310.
# gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland

--- src/canberra-gtk-module.c.orig
+++ src/canberra-gtk-module.c
@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
         guchar *data = NULL;
         gint ret = -1;
 
+#ifdef GDK_IS_X11_DISPLAY
+        if (!GDK_IS_X11_DISPLAY(d))
+                return 0;
+#endif
+
         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) {
         guchar *data = NULL;
         gint ret = -1;
 
+#ifdef GDK_IS_X11_DISPLAY
+        if (!GDK_IS_X11_DISPLAY(d))
+                return 0;
+#endif
+
         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)),
                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"),
                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
         gboolean ret = FALSE;
         Atom xembed;
 
+#ifdef GDK_IS_X11_DISPLAY
+        if (!GDK_IS_X11_DISPLAY(d))
+                return FALSE;
+#endif
+
         /* Gnome Panel applets are XEMBED windows. We need to make sure we
          * ignore them */
 
--- src/canberra-gtk.c.orig
+++ src/canberra-gtk.c
@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
         guchar *data = NULL;
         gint ret = -1;
 
+#ifdef GDK_IS_X11_DISPLAY
+        if (!GDK_IS_X11_DISPLAY(d))
+                return 0;
+#endif
+
         if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
                                gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
                                0, G_MAXLONG, False, XA_CARDINAL, &type_return,
df3f2c1'>root</a>/<a href='/guix/log/gnu?id=89d4cf2a873de9fd2b2c3afe011b0355fdf3f2c1'>gnu</a>/<a href='/guix/log/gnu/bootloader?id=89d4cf2a873de9fd2b2c3afe011b0355fdf3f2c1'>bootloader</a>/<a href='/guix/log/gnu/bootloader/u-boot.scm?id=89d4cf2a873de9fd2b2c3afe011b0355fdf3f2c1'>u-boot.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/bootloader/u-boot.scm?id=89d4cf2a873de9fd2b2c3afe011b0355fdf3f2c1&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-05-29 21:25:13 -0700'>2021-05-29</span></td><td><a href='/guix/commit/gnu/bootloader/u-boot.scm?id=d7d6c9e4e697c33634c89628d10995d0f070db96'>gnu: bootloader: Fix install-allwinner64-u-boot.</a><span class='msg-avail'>...<span class='msg-tooltip'>This fixes boot breakage introduced in commit:

  a65c935e29766940148d52b8116634b1e1cbcba6

Multiple files were still needed, but the filenames changed.

* gnu/bootloader/u-boot.scm (install-allwinner64-u-boot): Update to
  use both SPL and u-boot files with new filenames.
</span></span></td><td>Vagrant Cascadian</td></tr>
<tr><td><span title='2021-02-08 17:21:34 -0800'>2021-02-08</span></td><td><a href='/guix/commit/gnu/bootloader/u-boot.scm?id=a65c935e29766940148d52b8116634b1e1cbcba6'>gnu: bootloader: Update install-allwinner64-u-boot.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/bootloader/u-boot.scm (install-allwinner64-u-boot): Update to
  use a single file to install.
</span></span></td><td>Vagrant Cascadian</td></tr>
<tr><td><span title='2021-02-08 07:18:41 -0800'>2021-02-08</span></td><td><a href='/guix/commit/gnu/bootloader/u-boot.scm?id=15990546a5c26742fcbc7f7aa56b2a6db09dc643'>gnu: u-boot-puma-rk3399: Switch to using arm-trusted-firmware-rk3399.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/bootloaders.scm (u-boot-puma-rk3399)[native-inputs]:
  Add arm-trusted-firmware-rk3399.
  Remove arm-trusted-firmware-puma-rk3399 and rk3399-cortex-m0.
* gnu/packages/firmware.scm (arm-trusted-firmware-puma-rk3399,
  rk3399-cortex-m0): Remove obsolete variables.
* gnu/bootloader/u-boot.scm (install-puma-rk3399-u-boot): Install
  idbloader.img.
</span></span></td><td>Vagrant Cascadian</td></tr>
<tr><td><span title='2020-10-05 11:10:35 +0200'>2020-10-05</span></td><td><a href='/guix/commit/gnu/bootloader/u-boot.scm?id=b97b423e3f61c80d5877dadc95b3f316cd61788f'>bootloader: Fix u-boot installation.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a follow-up of f19cf27c2b9ff92e2c0fd931ef7fde39c376adaa. The
bootloader installation must be done on the final disk-image, hence using
"disk-image-installer" instead of "installer" callback.

* gnu/bootloader/u-boot.scm: Turn all installer callbacks into
disk-image-installer callbacks.
* gnu/build/bootloader.scm (write-file-on-device): Open the output file with
'no-truncate and 'no-create options.
* gnu/system/image.scm (with-imported-modules*): Add (gnu build bootloader)
module.
</span></span></td><td>Mathieu Othacehe</td></tr>