pool/mutter
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 945345 from GNOME:Next

Browse Source 
Add a patch for java apps

OBS-URL: https://build.opensuse.org/request/show/945345
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=399
This commit is contained in:
Bjørn Lie 2022-01-11 15:26:34 +00:00 committed by Git OBS Bridge
parent 0b41391235
commit 5243171e91
6 changed files with 69 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mutter-Lower-HIDPI_LIMIT-to-144.patch
View File

@ -7,11 +7,11 @@ Subject: [PATCH] monitor: Lower HIDPI_LIMIT to 144
src/backends/meta-monitor.c | 2 +- src/backends/meta-monitor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
Index: mutter-40.2.1/src/backends/meta-monitor.c Index: mutter-41.2/src/backends/meta-monitor.c
=================================================================== ===================================================================
--- mutter-40.2.1.orig/src/backends/meta-monitor.c --- mutter-41.2.orig/src/backends/meta-monitor.c
+++ mutter-40.2.1/src/backends/meta-monitor.c +++ mutter-41.2/src/backends/meta-monitor.c
@@ -1644,7 +1644,7 @@ meta_monitor_calculate_crtc_pos (MetaMon @@ -1658,7 +1658,7 @@ meta_monitor_calculate_crtc_pos (MetaMon
} }
/* The minimum resolution at which we turn on a window-scale of 2 */ /* The minimum resolution at which we turn on a window-scale of 2 */

13
mutter-allow-disable-hardware-cursors.patch
View File

@ -14,11 +14,11 @@ Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2046
src/backends/native/meta-cursor-renderer-native.c | 5 ++++- src/backends/native/meta-cursor-renderer-native.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-) 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/backends/native/meta-cursor-renderer-native.c b/src/backends/native/meta-cursor-renderer-native.c Index: mutter-41.2/src/backends/native/meta-cursor-renderer-native.c
index 8efdaf7775..8a1a6d6446 100644 ===================================================================
--- a/src/backends/native/meta-cursor-renderer-native.c --- mutter-41.2.orig/src/backends/native/meta-cursor-renderer-native.c
+++ b/src/backends/native/meta-cursor-renderer-native.c +++ mutter-41.2/src/backends/native/meta-cursor-renderer-native.c
@@ -1874,7 +1874,10 @@ meta_cursor_renderer_native_new (MetaBackend *backend, @@ -1864,7 +1864,10 @@ meta_cursor_renderer_native_new (MetaBac
priv->backend = backend; priv->backend = backend;
@ -30,6 +30,3 @@ index 8efdaf7775..8a1a6d6446 100644
return cursor_renderer_native; return cursor_renderer_native;
} }
--
GitLab

14
mutter-disable-cvt-s390x.patch
View File

@ -1,8 +1,8 @@
Index: mutter-40.2.1/src/meson.build Index: mutter-41.2/src/meson.build
=================================================================== ===================================================================
--- mutter-40.2.1.orig/src/meson.build --- mutter-41.2.orig/src/meson.build
+++ mutter-40.2.1/src/meson.build +++ mutter-41.2/src/meson.build
@@ -824,6 +824,7 @@ if have_profiler @@ -843,6 +843,7 @@ if have_profiler
endif endif
if have_native_backend if have_native_backend
@ -10,7 +10,7 @@ Index: mutter-40.2.1/src/meson.build
cvt = find_program('cvt') cvt = find_program('cvt')
gen_default_modes = find_program('backends/native/gen-default-modes.py') gen_default_modes = find_program('backends/native/gen-default-modes.py')
@@ -831,6 +832,9 @@ if have_native_backend @@ -850,6 +851,9 @@ if have_native_backend
output: 'meta-default-modes.h', output: 'meta-default-modes.h',
command: [gen_default_modes, '@OUTPUT@'] command: [gen_default_modes, '@OUTPUT@']
) )
@ -20,10 +20,10 @@ Index: mutter-40.2.1/src/meson.build
mutter_built_sources += default_modes_h mutter_built_sources += default_modes_h
dbus_login1_built_sources = gnome.gdbus_codegen('meta-dbus-login1', dbus_login1_built_sources = gnome.gdbus_codegen('meta-dbus-login1',
Index: mutter-40.2.1/src/backends/native/meta-default-modes.h Index: mutter-41.2/src/backends/native/meta-default-modes.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ mutter-40.2.1/src/backends/native/meta-default-modes.h +++ mutter-41.2/src/backends/native/meta-default-modes.h
@@ -0,0 +1,57 @@ @@ -0,0 +1,57 @@
+/* Generated by gen-default-modes.py */ +/* Generated by gen-default-modes.py */
+ +

32
mutter-window-actor-Special-case-shaped-Java-windows.patch Normal file
View File

@ -0,0 +1,32 @@
From 9efcc35102b4c41265e93461b35a1193b3d5822d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
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 ++++++++
1 file changed, 8 insertions(+)
Index: mutter-41.2/src/compositor/meta-window-actor-x11.c
===================================================================
--- mutter-41.2.orig/src/compositor/meta-window-actor-x11.c
+++ mutter-41.2/src/compositor/meta-window-actor-x11.c
@@ -589,6 +589,14 @@ has_shadow (MetaWindowActorX11 *actor_x1
*/
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 &&
+ window->shape_region != NULL)
+ return FALSE;
/*
* Generate shadows for all other windows.

12
mutter.changes
View File

@ -7,6 +7,18 @@ Mon Jan 10 07:14:19 UTC 2022 - Alynx Zhou <alynx.zhou@suse.com>
saved_rect_fullscreen which is used for unfullscreen, this patch saved_rect_fullscreen which is used for unfullscreen, this patch
fixes it (glgo#GNOME/mutter!2210, bsc#1185444). fixes it (glgo#GNOME/mutter!2210, bsc#1185444).
-------------------------------------------------------------------
Fri Dec 17 22:19:26 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
- Rebase patches with quilt and renumber them.
- Add mutter-window-actor-Special-case-shaped-Java-windows.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. Patch from fedora:
https://src.fedoraproject.org/rpms/mutter/raw/rawhide/f/0001-window-actor-Special-case-shaped-Java-windows.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 17 09:00:44 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com> Fri Dec 17 09:00:44 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com>

15
mutter.spec
View File

@ -34,13 +34,15 @@ URL: https://www.gnome.org
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE mutter-Lower-HIDPI_LIMIT-to-144.patch fate#326682, bsc#1125467 qkzhu@suse.com -- Lower HIDPI_LIMIT to 144 # PATCH-FIX-OPENSUSE mutter-Lower-HIDPI_LIMIT-to-144.patch fate#326682, bsc#1125467 qkzhu@suse.com -- Lower HIDPI_LIMIT to 144
Patch3: mutter-Lower-HIDPI_LIMIT-to-144.patch Patch0: mutter-Lower-HIDPI_LIMIT-to-144.patch
# PATCH-FIX-UPSTREAM mutter-disable-cvt-s390x.patch bsc#1158128 fcrozat@suse.com -- Do not search for cvt on s390x, it doesn't exist there # PATCH-FIX-UPSTREAM mutter-disable-cvt-s390x.patch bsc#1158128 fcrozat@suse.com -- Do not search for cvt on s390x, it doesn't exist there
Patch4: mutter-disable-cvt-s390x.patch Patch1: mutter-disable-cvt-s390x.patch
# PATCH-FIX-UPSTREAM mutter-allow-disable-hardware-cursors.patch glgo#GNOME/mutter!2150 alynx.zhou@suse.com -- Add a debug environment variable to disable hardware cursors. # PATCH-FIX-UPSTREAM mutter-allow-disable-hardware-cursors.patch glgo#GNOME/mutter!2150 alynx.zhou@suse.com -- Add a debug environment variable to disable hardware cursors.
Patch5: mutter-allow-disable-hardware-cursors.patch Patch2: mutter-allow-disable-hardware-cursors.patch
# PATCH-FIX-OPENSUSE mutter-window-actor-Special-case-shaped-Java-windows.patch -- window-actor: Special-case shaped Java windows
Patch3: mutter-window-actor-Special-case-shaped-Java-windows.patch
# PATCH-FIX-UPSTREAM mutter-initialize-saved_rect_fullscreen.patch glgo#GNOME/mutter!2210, bsc#1185444 alynx.zhou@suse.com -- Initialize saved_rect_fullscreen to fix fullscreen for some program like Stellarium. # PATCH-FIX-UPSTREAM mutter-initialize-saved_rect_fullscreen.patch glgo#GNOME/mutter!2210, bsc#1185444 alynx.zhou@suse.com -- Initialize saved_rect_fullscreen to fix fullscreen for some program like Stellarium.
Patch6: mutter-initialize-saved_rect_fullscreen.patch Patch4: mutter-initialize-saved_rect_fullscreen.patch
## SLE-only patches start at 1000 ## SLE-only patches start at 1000
# PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box. # PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box.
@ -145,10 +147,11 @@ applications that want to make use of the mutter library.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
%patch6 -p1
# SLE-only patches and translations. # SLE-only patches and translations.
%if 0%{?sle_version} %if 0%{?sle_version}