Merge pull request #72 from ublue-os/main

[pull] main from ublue-os:main

.github/workflows/build.yml

@@ -179,7 +179,7 @@ jobs:
           echo "alias_tags=${alias_tags[*]}" >> $GITHUB_OUTPUT
 
       - name: Pull main and akmods images
-        uses: Wandalen/wretry.action@v3.4.0
+        uses: Wandalen/wretry.action@v3.5.0
         with:
           attempt_limit: 3
           attempt_delay: 15000
@@ -192,7 +192,7 @@ jobs:
 
       - name: Get source versions
         id: labels
-        uses: Wandalen/wretry.action@v3.4.0
+        uses: Wandalen/wretry.action@v3.5.0
         with:
           attempt_limit: 3
           attempt_delay: 15000
@@ -271,7 +271,7 @@ jobs:
 
       # Push the image to GHCR (Image Registry)
       - name: Push To GHCR
-        uses: Wandalen/wretry.action@v3.4.0
+        uses: Wandalen/wretry.action@v3.5.0
         id: push
         if: github.event_name != 'pull_request'
         env:

Containerfile

@@ -235,7 +235,7 @@ RUN rpm-ostree override replace \
         || true && \
     ostree container commit
 
-# Install Valve's patched Mesa & Pipewire
+# Install Valve's patched Mesa, Pipewire, and Xwayland
 # Install patched switcheroo control with proper discrete GPU support
 RUN rpm-ostree override remove \
         mesa-va-drivers-freeworld && \
@@ -257,7 +257,8 @@ RUN rpm-ostree override remove \
         pipewire-jack-audio-connection-kit-libs \
         pipewire-libs \
         pipewire-pulseaudio \
-        pipewire-utils && \
+        pipewire-utils \
+        xorg-x11-server-Xwayland && \
     rpm-ostree install \
         mesa-va-drivers-freeworld \
         mesa-vdpau-drivers-freeworld.x86_64 && \

spec_files/gamescope/gamescope.spec

@@ -2,7 +2,7 @@
 
 %global _default_patch_fuzz 2
 %global build_timestamp %(date +"%Y%m%d")
-%global gamescope_tag 3.14.13
+%global gamescope_tag 3.14.14
 
 Name:           gamescope
 Version:        100.%{gamescope_tag}

spec_files/mutter/0001-place-Always-center-initial-setup-fedora-welcome.patch

@@ -0,0 +1,28 @@
+From 692546a9701a7b363e6190af441a95385c244907 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <[email protected]>
+Date: Fri, 2 Dec 2022 22:49:41 +0100
+Subject: [PATCH] place: Always center initial-setup/fedora-welcome
+
+---
+ src/core/place.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/core/place.c b/src/core/place.c
+index f9877dfc7..a69a3ebd1 100644
+--- a/src/core/place.c
++++ b/src/core/place.c
+@@ -321,6 +321,11 @@ window_place_centered (MetaWindow *window)
+
+   type = window->type;
+
++  if (g_strcmp0 (meta_window_get_wm_class (window), "org.gnome.InitialSetup") == 0 ||
++      g_strcmp0 (meta_window_get_wm_class (window), "org.fedoraproject.welcome-screen") == 0 ||
++      g_strcmp0 (meta_window_get_wm_class (window), "fedora-welcome") == 0)
++    return TRUE;
++
+   return (type == META_WINDOW_DIALOG ||
+     type == META_WINDOW_MODAL_DIALOG ||
+     type == META_WINDOW_SPLASHSCREEN ||
+-- 
+2.39.2
+

spec_files/mutter/0001-window-actor-Special-case-shaped-Java-windows.patch

@@ -0,0 +1,70 @@
+From b3b5aa01c63aee1df079e0394b0e6372df1838d0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <[email protected]>
+Date: Fri, 12 May 2017 13:40:31 +0200
+Subject: [PATCH] window-actor: Special-case shaped Java windows
+
+OpenJDK wrongly assumes that shaping a window implies no shadows.
+They got lucky until commit b975676c changed the fallback case,
+but now their compliance tests are broken. Make them happy again
+by special-casing shaped Java windows.
+---
+ src/compositor/meta-window-actor-x11.c | 8 ++++++++
+ src/x11/window-x11-private.h           | 2 ++
+ src/x11/window-x11.c                   | 9 +++++++++
+ 3 files changed, 19 insertions(+)
+
+diff --git a/src/compositor/meta-window-actor-x11.c b/src/compositor/meta-window-actor-x11.c
+index 19827af331..7d5e46ac75 100644
+--- a/src/compositor/meta-window-actor-x11.c
++++ b/src/compositor/meta-window-actor-x11.c
+@@ -424,6 +424,14 @@ has_shadow (MetaWindowActorX11 *actor_x11)
+    */
+   if (window->has_custom_frame_extents)
+     return FALSE;
++ 
++  /*
++   * OpenJDK wrongly assumes that shaping a window implies no compositor
++   * shadows; make its compliance tests happy to give it what it wants ...
++   */
++  if (g_strcmp0 (window->res_name, "sun-awt-X11-XWindowPeer") == 0 &&
++      meta_window_x11_is_shaped (window))
++    return FALSE;
+
+   /*
+    * Generate shadows for all other windows.
+diff --git a/src/x11/window-x11-private.h b/src/x11/window-x11-private.h
+index c947744ee5..cb862f0d72 100644
+--- a/src/x11/window-x11-private.h
++++ b/src/x11/window-x11-private.h
+@@ -125,6 +125,8 @@ gboolean meta_window_x11_has_pointer (MetaWindow *window);
+ gboolean meta_window_x11_same_application (MetaWindow *window,
+                                            MetaWindow *other_window);
+
++gboolean meta_window_x11_is_shaped (MetaWindow *window);
++
+ void meta_window_x11_shutdown_group (MetaWindow *window);
+
+ META_EXPORT
+diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
+index 745c45db18..83cdd2e420 100644
+--- a/src/x11/window-x11.c
++++ b/src/x11/window-x11.c
+@@ -2585,6 +2585,15 @@ meta_window_x11_update_shape_region (MetaWindow *window)
+   meta_window_set_shape_region (window, region);
+ }
+
++gboolean
++meta_window_x11_is_shaped (MetaWindow *window)
++{
++  MetaWindowX11 *window_x11 = META_WINDOW_X11 (window);
++  MetaWindowX11Private *priv = meta_window_x11_get_instance_private (window_x11);
++
++  return priv->shape_region != NULL;
++}
++
+ /* Generally meta_window_x11_same_application() is a better idea
+  * of "sameness", since it handles the case where multiple apps
+  * want to look like the same app or the same app wants to look
+-- 
+2.43.2
+