Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package muffin for openSUSE:Factory checked in at 2023-12-03 20:48:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/muffin (Old) and /work/SRC/openSUSE:Factory/.muffin.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "muffin" Sun Dec 3 20:48:42 2023 rev:30 rq:1130391 version:6.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/muffin/muffin.changes 2023-09-29 12:00:10.846004132 +0200 +++ /work/SRC/openSUSE:Factory/.muffin.new.25432/muffin.changes 2023-12-03 20:49:02.042262546 +0100 @@ -1,0 +2,18 @@ +Fri Dec 1 12:03:06 UTC 2023 - sb56637 <[email protected]> + +- Update to version 6.0.0: + * Remove deprecated/removed zenity arguments. + * Update issue templates. + * bug report: Mention crashes. + * Update issue template with a link to open and closed issues. + * meta-monitor.c: Allow 75% scaling once more. + * Make meta_set_verbose() public. + * Fix a meson warning + * Fix meson.build deprecations up to 0.56.0 + * keybindings: Restore window opacity keybindings. + * input settings: Allow disabling stylus buttons. + * Fix some incorrect gsettings schemas + * build/packaging: Restore Wayland support + * wayland: Fix desktop background + +------------------------------------------------------------------- Old: ---- muffin-5.8.1.tar.gz New: ---- muffin-6.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ muffin.spec ++++++ --- /var/tmp/diff_new_pack.qpv2OV/_old 2023-12-03 20:49:04.874366577 +0100 +++ /var/tmp/diff_new_pack.qpv2OV/_new 2023-12-03 20:49:04.878366724 +0100 @@ -1,7 +1,7 @@ # # spec file for package muffin # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,36 +21,41 @@ %define typelib typelib-1_0-Muffin-0_0 %define _lto_cflags %{nil} Name: muffin -Version: 5.8.1 +Version: 6.0.0 Release: 0 Summary: Cinnamon Desktop default window manager License: GPL-2.0-or-later AND MIT Group: System/GUI/Other URL: https://github.com/linuxmint/muffin Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: Mesa-libGLESv3-devel -BuildRequires: fdupes BuildRequires: meson +BuildRequires: fdupes BuildRequires: mutter-devel BuildRequires: update-desktop-files BuildRequires: zenity +BuildRequires: Mesa-libGLESv3-devel BuildRequires: pkgconfig(cinnamon-desktop) >= 4.0.0 BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(gnome-doc-utils) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk-doc) -BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libcanberra) BuildRequires: pkgconfig(libinput) -BuildRequires: pkgconfig(libpipewire-0.3) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(libwacom) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(xkbcommon-x11) BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(gudev-1.0) +BuildRequires: pkgconfig(libwacom) +BuildRequires: pkgconfig(libpipewire-0.3) +BuildRequires: pkgconfig(wayland-protocols) +BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(xwayland) +BuildRequires: pkgconfig(libxcvt) +BuildRequires: libxcvt Requires: cinnamon-gschemas Requires: zenity Recommends: %{name}-lang ++++++ muffin-5.8.1.tar.gz -> muffin-6.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/.github/ISSUE_TEMPLATE/bug_report.yaml new/muffin-6.0.0/.github/ISSUE_TEMPLATE/bug_report.yaml --- old/muffin-5.8.1/.github/ISSUE_TEMPLATE/bug_report.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/muffin-6.0.0/.github/ISSUE_TEMPLATE/bug_report.yaml 2023-11-19 14:50:08.000000000 +0100 @@ -0,0 +1,92 @@ +name: Bug Report +description: File a bug report +body: + - type: markdown + attributes: + value: | + ### STOP! Before continuing: + - Please try searching for [existing reports](https://github.com/linuxmint/muffin/issues?q=is%3Aissue+state%3Aall) that may match the behavior you're seeing. *If you find one, add to that issue, instead of opening a new one*. Include any relevant details that may differ from the original author's. + - If this is related to Cinnamon, sometimes third-party xlets (applets, desklets and extensions) can cause erroneous or unexpected behavior. Try disabling these first to see if the behavior goes away. After disabling, be sure to restart Cinnamon before continuing. Right-click an empty portion of the panel, select Troubleshooting, then 'Restart Cinnamon'. Alternately, you can open the run dialog - Alt-F2, type 'r' or 'restart', and enter. + - Check your logs - there may be some obvious cause for your trouble - in Linux Mint you can check ~/.xsession-errors (a hidden file in your Home folder). + - If this is a *crash*, provide information about it if possible (CoreDump file, stack trace, etc...). In Linux Mint you can check the System Reports program. + - Have you tried rebooting? + + --- + + Thank you for taking the time to report this issue. To allow us to work as efficiently as possible at resolving this, we need some information from you. + + - type: input + id: distro + attributes: + label: Distribution + description: Which Linux distribution are you using? Please be as specific as possible. + placeholder: "example: Mint 21.1" + validations: + required: true + + - type: input + id: pkgver + attributes: + label: Package version + description: Please provide the Cinnamon version. You can get this by running `cinnamon --version` in a terminal, or launching 'System Info" from the menu. + placeholder: "example: 5.6.1" + validations: + required: true + + - type: input + id: graphics + attributes: + label: Graphics hardware in use + description: Please provide information about your graphics hardware, if known. If you are using a dual-gpu system please specify that also. + placeholder: "example: NVIDIA GeForce GTX 1660 TI" + validations: + required: false + + - type: dropdown + id: frequency + attributes: + label: Frequency + description: How often does this behavior occur? + options: + - Always + - Quite often + - Only occasionally + validations: + required: true + + - type: textarea + id: current-behavior + attributes: + label: Bug description + description: Please describe what is happening + validations: + required: true + + - type: textarea + id: steps + attributes: + label: Steps to reproduce + description: Please try to provide **detailed** steps on the most direct way to reproduce this issue. The chances of a bug being fixed go up **considerably** if we are able to duplicate the behavior ourselves. + validations: + required: true + + - type: textarea + id: expected-behavior + attributes: + label: Expected behavior + description: Describe what you think should happen instead of the current behavior. + validations: + required: true + + - type: textarea + id: more-info + attributes: + label: Additional information + description: You can add any other information you think may be relevant. + validations: + required: false + + - type: markdown + attributes: + value: | + #### By submitting this report you agree to behave respectfully and in a mature manner. If in doubt, refer to the [Golden Rule](https://en.wikipedia.org/wiki/Golden_Rule) and [Github's Community Guidelines](https://docs.github.com/en/site-policy/github-terms/github-community-guidelines). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/.github/ISSUE_TEMPLATE/feature_request.md new/muffin-6.0.0/.github/ISSUE_TEMPLATE/feature_request.md --- old/muffin-5.8.1/.github/ISSUE_TEMPLATE/feature_request.md 1970-01-01 01:00:00.000000000 +0100 +++ new/muffin-6.0.0/.github/ISSUE_TEMPLATE/feature_request.md 2023-11-19 14:50:08.000000000 +0100 @@ -0,0 +1,12 @@ +--- +name: Feature request (OBSOLETE) +about: Feature requests are no longer accepted here, please use https://github.com/orgs/linuxmint/discussions instead. +title: "" +labels: ["FEATURE REQUEST"] +assignees: '' + +--- + +Please use: + +https://github.com/orgs/linuxmint/discussions \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/.github/ISSUE_TEMPLATE.md new/muffin-6.0.0/.github/ISSUE_TEMPLATE.md --- old/muffin-5.8.1/.github/ISSUE_TEMPLATE.md 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/.github/ISSUE_TEMPLATE.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ - -``` - * muffin version (muffin --version or 'dpkg --list | grep libmuffin0' for Mint/Ubuntu) - * Distribution - (Mint 17.2, Arch, Fedora 25, etc...) - * Graphics hardware *and* driver used - * 32 or 64 bit - ``` - -**Issue** - - - -**Steps to reproduce** - - - -**Expected behaviour** - - - -**Other information** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/clutter/clutter/egl/clutter-backend-eglnative.c new/muffin-6.0.0/clutter/clutter/egl/clutter-backend-eglnative.c --- old/muffin-5.8.1/clutter/clutter/egl/clutter-backend-eglnative.c 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/clutter/clutter/egl/clutter-backend-eglnative.c 2023-11-19 14:50:08.000000000 +0100 @@ -229,7 +229,7 @@ static void clutter_backend_egl_native_init (ClutterBackendEglNative *backend_egl_native) { - static const gchar xsettings_path[] = "org.gnome.settings-daemon.plugins.xsettings"; + static const gchar xsettings_path[] = "org.cinnamon.settings-daemon.plugins.xsettings"; GSettingsSchemaSource *source = g_settings_schema_source_get_default (); GSettingsSchema *schema = g_settings_schema_source_lookup (source, xsettings_path, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/data/meson.build new/muffin-6.0.0/data/meson.build --- old/muffin-5.8.1/data/meson.build 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/data/meson.build 2023-11-19 14:50:08.000000000 +0100 @@ -7,7 +7,7 @@ msgfmt, '--desktop', '--template', '@INPUT@', - '-d', join_paths(meson.source_root(), 'po'), + '-d', join_paths(meson.project_source_root(), 'po'), '-o', '@OUTPUT@' ], install: true, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/debian/changelog new/muffin-6.0.0/debian/changelog --- old/muffin-5.8.1/debian/changelog 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/debian/changelog 2023-11-19 14:50:08.000000000 +0100 @@ -1,3 +1,30 @@ +muffin (6.0.0) virginia; urgency=medium + + [ Michael Webster ] + * Remove deprecated/removed zenity arguments. + * Update issue templates. + * bug report: Mention crashes. + * Update issue template with a link to open and closed issues. + * meta-monitor.c: Allow 75% scaling once more. + * Make meta_set_verbose() public. + + [ Rick Calixte ] + * Fix a meson warning (#674) + * Fix meson.build deprecations up to 0.56.0 (#675) + + [ Michael Webster ] + * keybindings: Restore window opacity keybindings. + * input settings: Allow disabling stylus buttons. + + [ Clement Lefebvre ] + * Fix some incorrect gsettings schemas + + [ Michael Webster ] + * build/packaging: Restore Wayland support + * wayland: Fix desktop background + + -- Clement Lefebvre <[email protected]> Sun, 19 Nov 2023 13:47:31 +0000 + muffin (5.8.1) victoria; urgency=medium [ Michael Webster ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/debian/control new/muffin-6.0.0/debian/control --- old/muffin-5.8.1/debian/control 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/debian/control 2023-11-19 14:50:08.000000000 +0100 @@ -25,12 +25,15 @@ libgles2-mesa-dev (>= 7.1~rc3-1~) | libgles2-dev, libglib2.0-dev (>= 2.61.1), libcinnamon-desktop-dev, + libgbm-dev (>= 17.3) [linux-any], + libgdk-pixbuf-2.0-dev | libgdk-pixbuf2.0-dev, libgraphene-1.0-dev (>= 1.9.3), libgtk-3-dev (>= 3.19.8), libgudev-1.0-dev (>= 232) [linux-any], libice-dev, libinput-dev (>= 1.7) [linux-any], libjson-glib-dev (>= 0.13.2-1~), + libnvidia-egl-wayland-dev [linux-any], libpam0g-dev, libpango1.0-dev (>= 1.2.0), libpipewire-0.3-dev [linux-any] | libpipewire-0.2-dev [linux-any], @@ -38,6 +41,7 @@ libstartup-notification0-dev (>= 0.7), libsystemd-dev (>= 212) [linux-any], libwacom-dev (>= 0.13) [linux-any], + libwayland-dev, libxau-dev, libx11-dev, libx11-xcb-dev, @@ -58,10 +62,14 @@ libxt-dev, meson (>= 0.50), pkg-config (>= 0.22), + udev [linux-any], + wayland-protocols (>= 1.25) [linux-any], xauth <!nocheck>, + xcvt [linux-any], xkb-data, xserver-xorg-core [linux-any], xvfb <!nocheck>, + xwayland [linux-any], zenity Rules-Requires-Root: no Standards-Version: 4.5.0 @@ -153,7 +161,8 @@ libcinnamon-desktop-dev (>= 5.4), libdrm-dev, libegl1-mesa-dev, - libgdk-pixbuf2.0-dev, + libgbm-dev, + libgdk-pixbuf-2.0-dev | libgdk-pixbuf2.0-dev, libgles2-mesa-dev (>= 7.1~rc3-1~) | libgles2-dev, libglib2.0-dev, libgraphene-1.0-dev (>= 1.9.3), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/debian/rules new/muffin-6.0.0/debian/rules --- old/muffin-5.8.1/debian/rules 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/debian/rules 2023-11-19 14:50:08.000000000 +0100 @@ -13,11 +13,20 @@ -Dprofiler=false \ -Dremote_desktop=false -ifneq ($(DEB_HOST_ARCH_OS),linux) +ifeq ($(DEB_HOST_ARCH_OS),linux) +CONFFLAGS += \ + -Degl_device=true\ + -Dwayland=true \ + -Dwayland_eglstream=true \ + -Dnative_backend=true +else CONFFLAGS += \ -Dudev=false \ -Dcore_tests=false \ - -Dlibwacom=false + -Dlibwacom=false \ + -Dwayland=false \ + -Dnative_backend=false \ + -Ddefault_driver=gl endif ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/meson.build new/muffin-6.0.0/meson.build --- old/muffin-5.8.1/meson.build 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/meson.build 2023-11-19 14:50:08.000000000 +0100 @@ -1,6 +1,6 @@ project('muffin', 'c', - version: '5.8.1', - meson_version: '>= 0.50.0', + version: '6.0.0', + meson_version: '>=0.56.0', license: 'GPLv2+' ) @@ -161,8 +161,7 @@ endif endif -#have_wayland = get_option('wayland') -have_wayland = false +have_wayland = get_option('wayland') if have_wayland wayland_server_dep = dependency('wayland-server', version: wayland_server_req) @@ -182,8 +181,7 @@ gudev_dep = dependency('gudev-1.0', version: gudev_req) endif -# have_native_backend = get_option('native_backend') -have_native_backend = false +have_native_backend = get_option('native_backend') if have_native_backend libdrm_dep = dependency('libdrm') @@ -210,11 +208,9 @@ endif endif -#have_egl_device = get_option('egl_device') -have_egl_device = false +have_egl_device = get_option('egl_device') -#have_wayland_eglstream = get_option('wayland_eglstream') -have_wayland_eglstream = false +have_wayland_eglstream = get_option('wayland_eglstream') if have_wayland_eglstream wayland_eglstream_protocols_dep = dependency('wayland-eglstream-protocols') @@ -376,7 +372,7 @@ cdata.set('HAVE_INTROSPECTION', have_introspection) cdata.set('HAVE_PROFILER', have_profiler) -xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base') +xkb_base = xkeyboard_config_dep.get_variable(pkgconfig: 'xkb_base') cdata.set_quoted('XKB_BASE', xkb_base) if cc.has_header_symbol('sys/prctl.h', 'prctl') @@ -403,7 +399,7 @@ # For Xwayland -initfd usage use_initfd = get_option('xwayland_initfd') if use_initfd.auto() - xwayland_options = run_command(xwayland_path, '-help') + xwayland_options = run_command([xwayland_path, '-help'], check: true) have_xwayland_initfd = xwayland_options.stderr().contains('-initfd') else have_xwayland_initfd = use_initfd.enabled() @@ -483,7 +479,7 @@ ' Clutter tests............ ' + have_clutter_tests.to_string(), ' Installed tests.......... ' + have_installed_tests.to_string(), '', - ' Now type \'ninja -C ' + meson.build_root() + '\' to build ' + meson.project_name(), + ' Now type \'ninja -C ' + meson.project_build_root() + '\' to build ' + meson.project_name(), '', '', ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/meson_options.txt new/muffin-6.0.0/meson_options.txt --- old/muffin-5.8.1/meson_options.txt 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/meson_options.txt 2023-11-19 14:50:08.000000000 +0100 @@ -33,12 +33,36 @@ description: 'Enable GLX support' ) +option('wayland', + type: 'boolean', + value: true, + description: 'Enable Wayland support' +) + +option('native_backend', + type: 'boolean', + value: true, + description: 'Enable the native backend' +) + option('remote_desktop', type: 'boolean', value: true, description: 'Enable remote desktop and screen cast support' ) +option('egl_device', + type: 'boolean', + value: false, + description: 'Enable EGLDevice and EGLStream renderer support' +) + +option('wayland_eglstream', + type: 'boolean', + value: false, + description: 'Enable Wayland EGLStream support client support' +) + option('udev', type: 'boolean', value: true, @@ -120,5 +144,23 @@ option('default_driver', type: 'combo', choices: ['auto', 'gl', 'gl3', 'gles2', 'nop'], - value: 'gl' + value: 'auto' +) + +option('xwayland_path', + type: 'string', + value: '', + description: 'Path to Xwayland executable' +) + +option('xwayland_grab_default_access_rules', + type: 'string', + value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr', + description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland' +) + +option('xwayland_initfd', + type: 'feature', + value: 'auto', + description: 'Whether -initfd argument is passed to Xwayland to guarantee services (e.g. gsd-xsettings) startup before applications' ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/src/backends/meta-monitor.c new/muffin-6.0.0/src/backends/meta-monitor.c --- old/muffin-5.8.1/src/backends/meta-monitor.c 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/src/backends/meta-monitor.c 2023-11-19 14:50:08.000000000 +0100 @@ -33,7 +33,7 @@ #define SCALE_FACTORS_PER_INTEGER 4 #define SCALE_FACTORS_STEPS (1.0 / (float) SCALE_FACTORS_PER_INTEGER) -#define MINIMUM_SCALE_FACTOR 1.0f +#define MINIMUM_SCALE_FACTOR 0.74f #define MAXIMUM_SCALE_FACTOR 4.0f #define MINIMUM_LOGICAL_AREA (800 * 480) #define MAXIMUM_REFRESH_RATE_DIFF 0.001 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/src/backends/native/meta-input-settings-native.c new/muffin-6.0.0/src/backends/native/meta-input-settings-native.c --- old/muffin-5.8.1/src/backends/native/meta-input-settings-native.c 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/src/backends/native/meta-input-settings-native.c 2023-11-19 14:50:08.000000000 +0100 @@ -547,6 +547,8 @@ return BTN_BACK; case C_DESKTOP_STYLUS_BUTTON_ACTION_FORWARD: return BTN_FORWARD; + case C_DESKTOP_STYLUS_BUTTON_ACTION_DISABLED: + return BTN_DEAD; // This needs testing under wayland? case C_DESKTOP_STYLUS_BUTTON_ACTION_DEFAULT: default: return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/src/backends/x11/meta-input-settings-x11.c new/muffin-6.0.0/src/backends/x11/meta-input-settings-x11.c --- old/muffin-5.8.1/src/backends/x11/meta-input-settings-x11.c 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/src/backends/x11/meta-input-settings-x11.c 2023-11-19 14:50:08.000000000 +0100 @@ -901,6 +901,8 @@ return 8; case C_DESKTOP_STYLUS_BUTTON_ACTION_FORWARD: return 9; + case C_DESKTOP_STYLUS_BUTTON_ACTION_DISABLED: + return 0; case C_DESKTOP_STYLUS_BUTTON_ACTION_DEFAULT: default: return button; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/src/compositor/compositor.c new/muffin-6.0.0/src/compositor/compositor.c --- old/muffin-5.8.1/src/compositor/compositor.c 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/src/compositor/compositor.c 2023-11-19 14:50:08.000000000 +0100 @@ -600,15 +600,19 @@ priv->top_window_group = meta_window_group_new (display); priv->bottom_window_group = meta_window_group_new (display); priv->feedback_group = meta_window_group_new (display); - priv->background_actor = meta_x11_background_actor_new_for_display (display); + + if (!meta_is_wayland_compositor ()) + { + priv->background_actor = meta_x11_background_actor_new_for_display (display); + clutter_actor_add_child (priv->window_group, priv->background_actor); + } + + clutter_actor_add_child (priv->window_group, priv->bottom_window_group); // This needs to remain stacked just above the background actor in the window group. // So sync_actor_stacking() has to be able to reference it. The deskletManager // will take this and finish setting it up. priv->desklet_container = clutter_actor_new (); - - clutter_actor_add_child (priv->window_group, priv->background_actor); - clutter_actor_add_child (priv->window_group, priv->bottom_window_group); clutter_actor_add_child (priv->window_group, priv->desklet_container); clutter_actor_add_child (priv->stage, priv->window_group); clutter_actor_add_child (priv->stage, priv->top_window_group); @@ -954,7 +958,7 @@ } } - g_list_free (children); + g_clear_pointer (&children, g_list_free); if (!reordered) { @@ -989,6 +993,31 @@ // Then the bottom window group (which META_WINDOW_DESKTOP windows like nemo-desktop's get placed in). clutter_actor_set_child_below_sibling (priv->window_group, priv->bottom_window_group, NULL); + if (meta_is_wayland_compositor ()) + { + children = clutter_actor_get_children (priv->bottom_window_group); + for (tmp = children; tmp != NULL; tmp = tmp->next) + { + MetaWindowActor *child = tmp->data; + MetaWindow *mw = meta_window_actor_get_meta_window (child); + + if (mw != NULL) + { + // CsdBackground manager sets _NET_WM_STATE_BELOW (gtk_window_set_keep_below) + // This sets its stack layer to META_LAYER_BOTTOM, so we can keep these below + // the nemo-desktop, etc.. + MetaStackLayer layer = meta_window_get_default_layer (mw); + + if (layer == META_LAYER_BOTTOM) + { + clutter_actor_set_child_below_sibling (priv->bottom_window_group, CLUTTER_ACTOR (child), NULL); + } + } + } + + g_list_free (children); + } + // and finally backgrounds.. /* we prepended the backgrounds above so the last actor in the list @@ -1719,6 +1748,11 @@ MetaCompositorPrivate *priv = meta_compositor_get_instance_private (display->compositor); + if (meta_is_wayland_compositor ()) + { + return NULL; + } + return priv->background_actor; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/src/compositor/plugins/default.c new/muffin-6.0.0/src/compositor/plugins/default.c --- old/muffin-5.8.1/src/compositor/plugins/default.c 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/src/compositor/plugins/default.c 2023-11-19 14:50:08.000000000 +0100 @@ -910,7 +910,6 @@ NULL, "_Keep This Configuration", "_Restore Previous Configuration", - "preferences-desktop-display", 0, NULL, NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/src/core/keybindings.c new/muffin-6.0.0/src/core/keybindings.c --- old/muffin-5.8.1/src/core/keybindings.c 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/src/core/keybindings.c 2023-11-19 14:50:08.000000000 +0100 @@ -4073,6 +4073,25 @@ } static void +handle_opacity (MetaDisplay *display, + MetaWindow *window, + ClutterKeyEvent *event, + MetaKeyBinding *binding, + gpointer dummy) +{ + MetaKeyBindingAction action = meta_prefs_get_keybinding_action (binding->name); + + if (action == META_KEYBINDING_ACTION_DECREASE_OPACITY) + { + meta_window_decrease_opacity (window); + } + else + { + meta_window_increase_opacity (window); + } +} + +static void handle_restore_shortcuts (MetaDisplay *display, MetaWindow *window, ClutterKeyEvent *event, @@ -4925,6 +4944,20 @@ META_KEYBINDING_ACTION_MOVE_TO_CENTER, handle_move_to_center, 0); + add_builtin_keybinding (display, + "increase-opacity", + common_keybindings, + META_KEY_BINDING_PER_WINDOW, + META_KEYBINDING_ACTION_INCREASE_OPACITY, + handle_opacity, 0); + + add_builtin_keybinding (display, + "decrease-opacity", + common_keybindings, + META_KEY_BINDING_PER_WINDOW, + META_KEYBINDING_ACTION_DECREASE_OPACITY, + handle_opacity, 0); + g_object_unref (common_keybindings); g_object_unref (mutter_keybindings); g_object_unref (mutter_wayland_keybindings); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/src/core/meta-close-dialog-default.c new/muffin-6.0.0/src/core/meta-close-dialog-default.c --- old/muffin-5.8.1/src/core/meta-close-dialog-default.c 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/src/core/meta-close-dialog-default.c 2023-11-19 14:50:08.000000000 +0100 @@ -163,7 +163,7 @@ window_content, NULL, window->display->x11_display->screen_name, _("_Force Quit"), _("_Wait"), - "face-sad-symbolic", window->xwindow, + window->xwindow, NULL, NULL); g_free (window_content); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/src/core/util-private.h new/muffin-6.0.0/src/core/util-private.h --- old/muffin-5.8.1/src/core/util-private.h 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/src/core/util-private.h 2023-11-19 14:50:08.000000000 +0100 @@ -34,7 +34,6 @@ * for testability purposes */ #define META_EXPORT_TEST META_EXPORT -void meta_set_verbose (gboolean setting); void meta_set_debugging (gboolean setting); void meta_set_syncing (gboolean setting); void meta_set_replace_current_wm (gboolean setting); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/src/core/util.c new/muffin-6.0.0/src/core/util.c --- old/muffin-5.8.1/src/core/util.c 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/src/core/util.c 2023-11-19 14:50:08.000000000 +0100 @@ -594,13 +594,11 @@ /** * meta_show_dialog: (skip) - * @type: type of dialog * @message: message * @timeout: timeout * @display: display * @ok_text: text for Ok button * @cancel_text: text for Cancel button - * @icon_name: icon name * @transient_for: window XID of parent * @columns: columns * @entries: entries @@ -613,7 +611,6 @@ const char *display, const char *ok_text, const char *cancel_text, - const char *icon_name, const int transient_for, GSList *columns, GSList *entries) @@ -634,8 +631,6 @@ append_argument (args, display); } - append_argument (args, "--class"); - append_argument (args, "mutter-dialog"); append_argument (args, "--title"); append_argument (args, ""); append_argument (args, "--text"); @@ -659,12 +654,6 @@ append_argument (args, cancel_text); } - if (icon_name) - { - append_argument (args, "--icon-name"); - append_argument (args, icon_name); - } - tmp = columns; while (tmp) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/src/meson.build new/muffin-6.0.0/src/meson.build --- old/muffin-5.8.1/src/meson.build 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/src/meson.build 2023-11-19 14:50:08.000000000 +0100 @@ -734,7 +734,7 @@ 'backends/meta-profiler.h', ] - sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'interfaces') + sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_variable(pkgconfig: 'datadir'), 'dbus-1', 'interfaces') sysprof3_dbus_file = join_paths(sysprof_dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml') dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler', @@ -820,14 +820,14 @@ ['xwayland-keyboard-grab', 'unstable', 'v1', ], ] if have_wayland_eglstream - wayland_eglstream_protocols_dir = wayland_eglstream_protocols_dep.get_pkgconfig_variable('pkgdatadir') + wayland_eglstream_protocols_dir = wayland_eglstream_protocols_dep.get_variable(pkgconfig: 'pkgdatadir') wayland_protocols += [ ['wayland-eglstream-controller', 'third-party', wayland_eglstream_protocols_dir], ] endif wayland_scanner = find_program('wayland-scanner') - protocols_dir = wayland_protocols_dep.get_pkgconfig_variable('pkgdatadir') + protocols_dir = wayland_protocols_dep.get_variable(pkgconfig: 'pkgdatadir') assert(protocols_dir != '', 'Could not get pkgdatadir from wayland-protocols.pc') foreach p: wayland_protocols diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/src/meta/prefs.h new/muffin-6.0.0/src/meta/prefs.h --- old/muffin-5.8.1/src/meta/prefs.h 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/src/meta/prefs.h 2023-11-19 14:50:08.000000000 +0100 @@ -374,6 +374,8 @@ * @META_KEYBINDING_ACTION_MOVE_TO_SIDE_E: FILLME * @META_KEYBINDING_ACTION_MOVE_TO_SIDE_W: FILLME * @META_KEYBINDING_ACTION_MOVE_TO_CENTER: FILLME + * META_KEYBINDING_ACTION_INCREASE_OPACITY: FILLME, + * META_KEYBINDING_ACTION_DECREASE_OPACITY: FILLME, * @META_KEYBINDING_ACTION_OVERLAY_KEY: FILLME * @META_KEYBINDING_ACTION_LOCATE_POINTER_KEY: FILLME * @META_KEYBINDING_ACTION_ALWAYS_ON_TOP: FILLME @@ -474,6 +476,8 @@ META_KEYBINDING_ACTION_MOVE_TO_SIDE_E, META_KEYBINDING_ACTION_MOVE_TO_SIDE_W, META_KEYBINDING_ACTION_MOVE_TO_CENTER, + META_KEYBINDING_ACTION_INCREASE_OPACITY, + META_KEYBINDING_ACTION_DECREASE_OPACITY, META_KEYBINDING_ACTION_OVERLAY_KEY, META_KEYBINDING_ACTION_LOCATE_POINTER_KEY, META_KEYBINDING_ACTION_ISO_NEXT_GROUP, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/src/meta/util.h new/muffin-6.0.0/src/meta/util.h --- old/muffin-5.8.1/src/meta/util.h 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/src/meta/util.h 2023-11-19 14:50:08.000000000 +0100 @@ -119,6 +119,8 @@ void meta_topic_real (MetaDebugTopic topic, const char *format, ...) G_GNUC_PRINTF (2, 3); +META_EXPORT +void meta_set_verbose (gboolean setting); META_EXPORT void meta_add_verbose_topic (MetaDebugTopic topic); @@ -157,7 +159,6 @@ const char *display, const char *ok_text, const char *cancel_text, - const char *icon_name, const int transient_for, GSList *columns, GSList *entries); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/src/tests/meson.build new/muffin-6.0.0/src/tests/meson.build --- old/muffin-5.8.1/src/tests/meson.build 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/src/tests/meson.build 2023-11-19 14:50:08.000000000 +0100 @@ -38,8 +38,8 @@ endif test_env = environment() -test_env.set('G_TEST_SRCDIR', join_paths(meson.source_root(), 'src')) -test_env.set('G_TEST_BUILDDIR', meson.build_root()) +test_env.set('G_TEST_SRCDIR', join_paths(meson.project_source_root(), 'src')) +test_env.set('G_TEST_BUILDDIR', meson.project_build_root()) test_env.set('MUTTER_TEST_PLUGIN_PATH', '@0@'.format(default_plugin.full_path())) test_client = executable('mutter-test-client', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/src/wayland/meta-wayland-keyboard.c new/muffin-6.0.0/src/wayland/meta-wayland-keyboard.c --- old/muffin-5.8.1/src/wayland/meta-wayland-keyboard.c 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/src/wayland/meta-wayland-keyboard.c 2023-11-19 14:50:08.000000000 +0100 @@ -64,7 +64,7 @@ #include "backends/native/meta-event-native.h" #endif -#define GSD_KEYBOARD_SCHEMA "org.gnome.settings-daemon.peripherals.keyboard" +#define GSD_KEYBOARD_SCHEMA "org.cinnamon.settings-daemon.peripherals.keyboard" G_DEFINE_TYPE (MetaWaylandKeyboard, meta_wayland_keyboard, META_TYPE_WAYLAND_INPUT_DEVICE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/src/x11/meta-x11-background-actor.c new/muffin-6.0.0/src/x11/meta-x11-background-actor.c --- old/muffin-5.8.1/src/x11/meta-x11-background-actor.c 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/src/x11/meta-x11-background-actor.c 2023-11-19 14:50:08.000000000 +0100 @@ -534,6 +534,9 @@ g_return_val_if_fail (META_IS_DISPLAY (display), NULL); + if (meta_is_wayland_compositor ()) + return NULL; + self = g_object_new (META_TYPE_X11_BACKGROUND_ACTOR, NULL); priv = self->priv; @@ -567,7 +570,6 @@ { MetaX11Display *x11_display; MetaDisplayBackground *background; - MetaCompositor *compositor; Atom type; int format; gulong nitems; @@ -577,7 +579,6 @@ x11_display = meta_display_get_x11_display (display); background = meta_display_background_get (display); - compositor = meta_display_get_compositor (display); root_pixmap_id = None; if (!XGetWindowProperty (meta_x11_display_get_xdisplay (x11_display), @@ -666,29 +667,3 @@ update_wrap_mode (background); } - -static MetaDisplayBackground * -display_background_get (MetaDisplay *display) -{ - MetaDisplayBackground *background; - - background = g_object_get_data (G_OBJECT (display), "meta-display-background"); - if (background == NULL) - { - ClutterActor *stage; - - background = g_new0 (MetaDisplayBackground, 1); - - background->x11_display = meta_display_get_x11_display (display); - g_object_set_data_full (G_OBJECT (display), "meta-screen-background", - background, (GDestroyNotify) free_display_background); - - stage = meta_get_stage_for_display (display); - g_signal_connect (stage, "notify::background-color", - G_CALLBACK (on_notify_stage_color), background); - - meta_x11_background_actor_update (display); - } - - return background; -} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.8.1/src/x11/session.c new/muffin-6.0.0/src/x11/session.c --- old/muffin-5.8.1/src/x11/session.c 2023-07-07 15:25:13.000000000 +0200 +++ new/muffin-6.0.0/src/x11/session.c 2023-11-19 14:50:08.000000000 +0100 @@ -1823,7 +1823,7 @@ "you log in."), "240", meta_get_display()->x11_display->screen_name, - NULL, NULL, NULL, + NULL, NULL, None, columns, lame_details);
