From 32858c7b4066de2de4289180bcb9eb0d5f008c52cbf592d2873d5187bcce3d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 31 Mar 2023 12:02:56 +0000 Subject: [PATCH] Accepting request 1076087 from GNOME:Next - Update to version 44.0+18: + backends: Use meta_gamma_lut_new_sized() in a few more places + compositor: - Drop anchor_window_pos field from MetaWindowDrag - Use relative anchor coordinates for window drags - Avoid use of variable during resize + onscreen/native: Avoid freezing the frame clock on failed cursor commits + window-actor-x11: Check array bounds before accessing array + build: Don't disable checks in release builds + tests: Use a more interoperable path to bash + backend/nested: Ignore setting pointer constraint + Updated translations. - Clean up spec, drop old disabled and unneeded pkgconfig(gtk+-3.0) BuildRequires and move disabled patches to SLE. OBS-URL: https://build.opensuse.org/request/show/1076087 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=439 --- _service | 2 +- _servicedata | 2 +- mutter-44.0+18.obscpio | 3 +++ mutter-44.0+8.obscpio | 3 --- mutter.changes | 19 +++++++++++++++++++ mutter.obsinfo | 6 +++--- mutter.spec | 15 ++++----------- 7 files changed, 31 insertions(+), 19 deletions(-) create mode 100644 mutter-44.0+18.obscpio delete mode 100644 mutter-44.0+8.obscpio diff --git a/_service b/_service index 2016171..802fbec 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git https://gitlab.gnome.org/GNOME/mutter.git - bc9cad51 + 8ca94f4d @PARENT_TAG@+@TAG_OFFSET@ (.*)\+0 \1 diff --git a/_servicedata b/_servicedata index 332fada..aa6ae04 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://gitlab.gnome.org/GNOME/mutter.git - bc9cad512451d3f5d63c1892668d1c7aec370227 \ No newline at end of file + 8ca94f4d3faf5ea402d8045d550e6b277be75235 \ No newline at end of file diff --git a/mutter-44.0+18.obscpio b/mutter-44.0+18.obscpio new file mode 100644 index 0000000..d9fd30e --- /dev/null +++ b/mutter-44.0+18.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3723abf80c1cc8ad572d484de49eec9a53e05d9685955a13720db8dbd09e8c1b +size 25947149 diff --git a/mutter-44.0+8.obscpio b/mutter-44.0+8.obscpio deleted file mode 100644 index d6939ac..0000000 --- a/mutter-44.0+8.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dec42a8196be37a4925a60e7814ed2350d4deb96fb2c5fc7edaf8d01691e47b1 -size 25943565 diff --git a/mutter.changes b/mutter.changes index ce44153..86f7f48 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Mar 31 06:45:44 UTC 2023 - bjorn.lie@gmail.com + +- Update to version 44.0+18: + + backends: Use meta_gamma_lut_new_sized() in a few more places + + compositor: + - Drop anchor_window_pos field from MetaWindowDrag + - Use relative anchor coordinates for window drags + - Avoid use of variable during resize + + onscreen/native: Avoid freezing the frame clock on failed + cursor commits + + window-actor-x11: Check array bounds before accessing array + + build: Don't disable checks in release builds + + tests: Use a more interoperable path to bash + + backend/nested: Ignore setting pointer constraint + + Updated translations. +- Clean up spec, drop old disabled and unneeded pkgconfig(gtk+-3.0) + BuildRequires and move disabled patches to SLE. + ------------------------------------------------------------------- Tue Mar 21 18:42:11 UTC 2023 - bjorn.lie@gmail.com diff --git a/mutter.obsinfo b/mutter.obsinfo index 081d110..fa6d235 100644 --- a/mutter.obsinfo +++ b/mutter.obsinfo @@ -1,4 +1,4 @@ name: mutter -version: 44.0+8 -mtime: 1679406471 -commit: bc9cad512451d3f5d63c1892668d1c7aec370227 +version: 44.0+18 +mtime: 1680175262 +commit: 8ca94f4d3faf5ea402d8045d550e6b277be75235 diff --git a/mutter.spec b/mutter.spec index 8d34857..f0eb9fa 100644 --- a/mutter.spec +++ b/mutter.spec @@ -22,18 +22,14 @@ %define api_minor 0 %define libmutter libmutter-%{api_major}-%{api_minor} Name: mutter -Version: 44.0+8 +Version: 44.0+18 Release: 0 Summary: Window and compositing manager based on Clutter License: GPL-2.0-or-later Group: System/GUI/GNOME URL: https://www.gnome.org -# Source url disabled, using git checkout via source service -#Source0: https://download.gnome.org/sources/mutter/42/%%{name}-%%{version}.tar.xz Source0: %{name}-%{version}.tar.xz -# PATCH-NEEDS-REBASE mutter-Lower-HIDPI_LIMIT-to-144.patch fate#326682, bsc#1125467 qkzhu@suse.com -- Lower HIDPI_LIMIT to 144 WAS PATCH-FIX-OPENSUSE -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 Patch1: mutter-disable-cvt-s390x.patch # PATCH-FIX-OPENSUSE mutter-window-actor-Special-case-shaped-Java-windows.patch -- window-actor: Special-case shaped Java windows @@ -48,6 +44,8 @@ Patch1000: mutter-SLE-bell.patch Patch1001: mutter-SLE-relax-some-constraints-on-CSD-windows.patch # PATCH-FIX-SLE mutter-SLE-bsc984738-grab-display.patch bsc#984738 bgo#769387 hpj@suse.com -- Revert a upstream commit to avoid X11 race condition that results in wrong dialog sizes. Patch1002: mutter-SLE-bsc984738-grab-display.patch +# PATCH-NEEDS-REBASE mutter-Lower-HIDPI_LIMIT-to-144.patch fate#326682, bsc#1125467 qkzhu@suse.com -- Lower HIDPI_LIMIT to 144 WAS +Patch1003: mutter-Lower-HIDPI_LIMIT-to-144.patch BuildRequires: Mesa-libGLESv3-devel BuildRequires: fdupes @@ -66,13 +64,11 @@ BuildRequires: pkgconfig(gbm) >= 17.3 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.69.0 BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(glib-2.0) >= 2.69.0 -#BuildRequires: pkgconfig(gnome-desktop-3.0) BuildRequires: pkgconfig(gnome-desktop-4) BuildRequires: pkgconfig(gnome-settings-daemon) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.5 BuildRequires: pkgconfig(graphene-gobject-1.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.37.2 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.19.8 BuildRequires: pkgconfig(gtk4) BuildRequires: pkgconfig(gudev-1.0) >= 232 BuildRequires: pkgconfig(json-glib-1.0) >= 0.12.0 @@ -146,7 +142,6 @@ applications that want to make use of the mutter library. %prep %setup -q -#patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -156,6 +151,7 @@ applications that want to make use of the mutter library. %patch1000 -p1 %patch1001 -p1 %patch1002 -p1 +#patch1003 -p1 %endif %build @@ -175,9 +171,6 @@ applications that want to make use of the mutter library. %{nil} %meson_build -#%%check -#%%meson_test - %install %meson_install %find_lang %{name} %{?no_lang_C}