Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package muffin for openSUSE:Factory checked
in at 2021-06-04 22:43:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/muffin (Old)
and /work/SRC/openSUSE:Factory/.muffin.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "muffin"
Fri Jun 4 22:43:26 2021 rev:25 rq:897287 version:5.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/muffin/muffin.changes 2021-01-21
21:57:20.325856477 +0100
+++ /work/SRC/openSUSE:Factory/.muffin.new.1898/muffin.changes 2021-06-04
22:43:39.427135486 +0200
@@ -1,0 +2,13 @@
+Thu May 27 20:05:58 UTC 2021 - andy great <andythe_gr...@pm.me>
+
+- Update to version 5.0.0.
+ * build: Add missing libtool depedencies.
+ * build: Fix undefined references with slibtool.
+ * Revert "Remove useless, annoying window activation warning."
+ * windows: Fix focus-stealing prevention. Cinnamon no longer
+ attempts to deal with this.
+ * Do not unmaximize windows that are not maximized or
+ tiled - fixes Wine bug
+ * Add newline to debug message
+
+-------------------------------------------------------------------
Old:
----
muffin-4.8.1.tar.gz
New:
----
muffin-5.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ muffin.spec ++++++
--- /var/tmp/diff_new_pack.pKw1z8/_old 2021-06-04 22:43:40.247136391 +0200
+++ /var/tmp/diff_new_pack.pKw1z8/_new 2021-06-04 22:43:40.251136395 +0200
@@ -21,7 +21,7 @@
%define typelib typelib-1_0-Muffin-0_0
%define _lto_cflags %{nil}
Name: muffin
-Version: 4.8.1
+Version: 5.0.0
Release: 0
Summary: Cinnamon Desktop default window manager
License: GPL-2.0-or-later AND MIT
++++++ muffin-4.8.1.tar.gz -> muffin-5.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-4.8.1/Makefile.am new/muffin-5.0.0/Makefile.am
--- old/muffin-4.8.1/Makefile.am 2021-01-14 10:47:56.000000000 +0100
+++ new/muffin-5.0.0/Makefile.am 2021-05-27 16:45:48.000000000 +0200
@@ -1,5 +1,5 @@
-SUBDIRS=cogl clutter src po doc data
+SUBDIRS=cogl clutter src src/compositor/plugins po doc data
EXTRA_DIST = HACKING MAINTAINERS rationales.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-4.8.1/clutter/clutter/Makefile.am
new/muffin-5.0.0/clutter/clutter/Makefile.am
--- old/muffin-4.8.1/clutter/clutter/Makefile.am 2021-01-14
10:47:56.000000000 +0100
+++ new/muffin-5.0.0/clutter/clutter/Makefile.am 2021-05-27
16:45:48.000000000 +0200
@@ -666,7 +666,11 @@
Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = Clutter
Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_VERSION = @MUFFIN_PLUGIN_API_VERSION@
-Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS =
libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
+Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
+ libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
+
$(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
+
$(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la
\
+
$(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = \
$(clutter_include_HEADERS) \
$(clutter_deprecated_HEADERS) \
@@ -687,7 +691,11 @@
Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = Cally
Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_VERSION = @MUFFIN_PLUGIN_API_VERSION@
-Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS =
libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
+Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
+ libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
+
$(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
+
$(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la
\
+
$(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = $(cally_sources_h)
$(cally_sources_c)
Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_SCANNERFLAGS = \
@@ -702,7 +710,11 @@
ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = ClutterX11
ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_INCLUDES = xlib-2.0
-ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS =
libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
+ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
+ libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
+
$(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
+
$(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la
\
+
$(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = $(x11_introspection)
ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS)
$(CLUTTER_CFLAGS)
ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_SCANNERFLAGS = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-4.8.1/configure.ac
new/muffin-5.0.0/configure.ac
--- old/muffin-4.8.1/configure.ac 2021-01-14 10:47:56.000000000 +0100
+++ new/muffin-5.0.0/configure.ac 2021-05-27 16:45:48.000000000 +0200
@@ -1,8 +1,8 @@
AC_PREREQ(2.50)
-m4_define([muffin_major_version], [4])
-m4_define([muffin_minor_version], [8])
-m4_define([muffin_micro_version], [1])
+m4_define([muffin_major_version], [5])
+m4_define([muffin_minor_version], [0])
+m4_define([muffin_micro_version], [0])
m4_define([muffin_version],
[muffin_major_version.muffin_minor_version.muffin_micro_version])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-4.8.1/debian/changelog
new/muffin-5.0.0/debian/changelog
--- old/muffin-4.8.1/debian/changelog 2021-01-14 10:47:56.000000000 +0100
+++ new/muffin-5.0.0/debian/changelog 2021-05-27 16:45:48.000000000 +0200
@@ -1,3 +1,19 @@
+muffin (5.0.0) uma; urgency=medium
+
+ [ orbea ]
+ * build: Add missing libtool depedencies.
+ * build: Fix undefined references with slibtool.
+
+ [ Michael Webster ]
+ * Revert "Remove useless, annoying window activation warning."
+ * windows: Fix focus-stealing prevention. Cinnamon no longer attempts to
deal with this.
+
+ [ Albert Pool ]
+ * Do not unmaximize windows that are not maximized or tiled - fixes Wine bug
+ * Add newline to debug message
+
+ -- Clement Lefebvre <r...@linuxmint.com> Thu, 27 May 2021 15:45:16 +0100
+
muffin (4.8.1) ulyssa; urgency=medium
[ Michael Webster ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-4.8.1/src/Makefile.am
new/muffin-5.0.0/src/Makefile.am
--- old/muffin-4.8.1/src/Makefile.am 2021-01-14 10:47:56.000000000 +0100
+++ new/muffin-5.0.0/src/Makefile.am 2021-05-27 16:45:48.000000000 +0200
@@ -3,7 +3,7 @@
lib_LTLIBRARIES = libmuffin.la
-SUBDIRS=wm-tester tools compositor/plugins
+SUBDIRS=wm-tester tools
NULL =
@@ -277,7 +277,12 @@
@META_GIR@_INCLUDES = GObject-2.0 CDesktopEnums-3.0 Gdk-3.0 Gtk-3.0
Cogl-$(MUFFIN_PLUGIN_API_VERSION) Clutter-$(MUFFIN_PLUGIN_API_VERSION) xlib-2.0
xfixes-4.0
@META_GIR@_PACKAGES = gtk+-3.0
@META_GIR@_CFLAGS = $(AM_CPPFLAGS)
-@META_GIR@_LIBS = libmuffin.la
+@META_GIR@_LIBS = \
+ libmuffin.la \
+
$(top_builddir)/clutter/clutter/libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
\
+ $(top_builddir)/cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la
\
+
$(top_builddir)/cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la
\
+
$(top_builddir)/cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
@META_GIR@_FILES = \
muffin-enum-types.h \
$(libmuffininclude_base_headers) \
@@ -383,4 +388,4 @@
{ rm -f libmuffin-$$lib-0.so && ln -s muffin/libmuffin-$$lib-0.so
libmuffin-$$lib-0.so; }; \
} \
) ; \
- done
\ No newline at end of file
+ done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-4.8.1/src/compositor/plugins/Makefile.am
new/muffin-5.0.0/src/compositor/plugins/Makefile.am
--- old/muffin-4.8.1/src/compositor/plugins/Makefile.am 2021-01-14
10:47:56.000000000 +0100
+++ new/muffin-5.0.0/src/compositor/plugins/Makefile.am 2021-05-27
16:45:48.000000000 +0200
@@ -2,9 +2,9 @@
pkglibdir=@MUFFIN_PLUGIN_DIR@
AM_CPPFLAGS= \
- $(WARN_CFLAGS) \
+ $(WARN_CFLAGS) \
$(MUFFIN_CFLAGS) \
- -I$(top_builddir)/src \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/src \
-I$(top_srcdir)/cogl \
-I$(top_builddir)/cogl \
@@ -27,7 +27,10 @@
default_la_CFLAGS = $(WARN_CFLAGS) -fPIC
default_la_SOURCES = default.c
default_la_LDFLAGS = $(WARN_LDFLAGS) -module -avoid-version -no-undefined
-default_la_LIBADD = $(CLUTTER_LIBS)
+default_la_LIBADD = \
+ $(CLUTTER_LIBS) \
+ $(top_builddir)/src/libmuffin.la \
+
$(top_builddir)/clutter/clutter/libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
pkglib_LTLIBRARIES = default.la
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-4.8.1/src/core/display.c
new/muffin-5.0.0/src/core/display.c
--- old/muffin-4.8.1/src/core/display.c 2021-01-14 10:47:56.000000000 +0100
+++ new/muffin-5.0.0/src/core/display.c 2021-05-27 16:45:48.000000000 +0200
@@ -3826,7 +3826,7 @@
meta_grab_op_is_moving (display->grab_op))
{
meta_topic (META_DEBUG_WINDOW_OPS,
- "Clearing out the edges for resistance/snapping");
+ "Clearing out the edges for resistance/snapping\n");
meta_display_cleanup_edges (display);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-4.8.1/src/core/prefs.c
new/muffin-5.0.0/src/core/prefs.c
--- old/muffin-4.8.1/src/core/prefs.c 2021-01-14 10:47:56.000000000 +0100
+++ new/muffin-5.0.0/src/core/prefs.c 2021-05-27 16:45:48.000000000 +0200
@@ -65,12 +65,15 @@
#define KEY_MOUSEWHEEL_ZOOM_ENABLED "screen-magnifier-enabled"
+#define KEY_BRING_ACTIVATED_WINDOWS_TO_CURRENT_WORKSPACE
"bring-windows-to-current-workspace"
+
/* These are the different schemas we are keeping
* a GSettings instance for */
#define SCHEMA_GENERAL "org.cinnamon.desktop.wm.preferences"
#define SCHEMA_MUFFIN "org.cinnamon.muffin"
#define SCHEMA_INTERFACE "org.cinnamon.desktop.interface"
#define SCHEMA_A11Y_APPLICATIONS "org.cinnamon.desktop.a11y.applications"
+#define SCHEMA_CINNAMON "org.cinnamon"
#define SETTINGS(s) g_hash_table_lookup (settings_schemas, (s))
@@ -86,6 +89,7 @@
static gboolean mouse_zoom_enabled = FALSE;
static CDesktopFocusMode focus_mode = C_DESKTOP_FOCUS_MODE_CLICK;
static CDesktopFocusNewWindows focus_new_windows =
C_DESKTOP_FOCUS_NEW_WINDOWS_SMART;
+static gboolean bring_user_activated_windows_to_current_workspace = FALSE;
static gboolean raise_on_click = TRUE;
static gboolean attach_modal_dialogs = FALSE;
static gboolean ignore_hide_titlebar_when_maximized = FALSE;
@@ -330,6 +334,13 @@
&raise_on_click,
},
{
+ { "bring-windows-to-current-workspace",
+ SCHEMA_CINNAMON,
+ META_PREF_BRING_WINDOWS_TO_CURRENT_WORKSPACE,
+ },
+ &bring_user_activated_windows_to_current_workspace,
+ },
+ {
{ "titlebar-uses-system-font",
SCHEMA_GENERAL,
META_PREF_TITLEBAR_FONT, /* note! shares a pref */
@@ -987,6 +998,11 @@
G_CALLBACK (settings_changed), NULL);
g_hash_table_insert (settings_schemas, g_strdup (SCHEMA_A11Y_APPLICATIONS),
settings);
+ settings = g_settings_new (SCHEMA_CINNAMON);
+ g_signal_connect (settings, "changed::"
KEY_BRING_ACTIVATED_WINDOWS_TO_CURRENT_WORKSPACE,
+ G_CALLBACK (settings_changed), NULL);
+ g_hash_table_insert (settings_schemas, g_strdup (SCHEMA_CINNAMON), settings);
+
for (tmp = overridden_keys; tmp; tmp = tmp->next)
{
MetaPrefsOverriddenKey *override = tmp->data;
@@ -1292,6 +1308,15 @@
return raise_on_click || focus_mode == C_DESKTOP_FOCUS_MODE_CLICK;
}
+gboolean
+meta_prefs_get_bring_windows_to_current_workspace (void)
+{
+ /* Windows that the user activates (with a current timestamp) will
+ * be brought to the currently active workspace if necessary. Normally
+ * the user is brought to the window's workspace instead. */
+ return bring_user_activated_windows_to_current_workspace;
+}
+
const char*
meta_prefs_get_theme (void)
{
@@ -1974,7 +1999,10 @@
case META_PREF_MIN_WIN_OPACITY:
return "MIN_WIN_OPACITY";
- }
+
+ case META_PREF_BRING_WINDOWS_TO_CURRENT_WORKSPACE:
+ return "BRING_WINDOWS_TO_CURRENT_WORKSPACE";
+ }
return "(unknown)";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-4.8.1/src/core/window.c
new/muffin-5.0.0/src/core/window.c
--- old/muffin-4.8.1/src/core/window.c 2021-01-14 10:47:56.000000000 +0100
+++ new/muffin-5.0.0/src/core/window.c 2021-05-27 16:45:48.000000000 +0200
@@ -3988,13 +3988,13 @@
if (unmaximize_horizontally && unmaximize_vertically)
window->saved_maximize = FALSE;
- /* Only do something if the window isn't already maximized in the
+ /* Only do something if the window is tiled, or maximized in the
* given direction(s).
*/
if ((unmaximize_horizontally && window->maximized_horizontally) ||
(unmaximize_vertically && window->maximized_vertically) ||
- window->tile_type == META_WINDOW_TILE_TYPE_NONE ||
- window->tile_mode == META_TILE_NONE)
+ window->tile_type != META_WINDOW_TILE_TYPE_NONE ||
+ window->tile_mode != META_TILE_NONE)
{
MetaRectangle target_rect;
MetaRectangle work_area;
@@ -4419,13 +4419,24 @@
MetaClientType source_indication,
MetaWorkspace *workspace)
{
+ gboolean can_ignore_outdated_timestamps;
meta_topic (META_DEBUG_FOCUS,
"_NET_ACTIVE_WINDOW message sent for %s at time %u "
"by client type %u.\n",
window->desc, timestamp, source_indication);
- if (timestamp != 0 &&
- XSERVER_TIME_IS_BEFORE (timestamp, window->display->last_user_time))
+ /* Older EWMH spec didn't specify a timestamp; we decide to honor these only
+ * if the app specifies that it is a pager.
+ *
+ * Update: Unconditionally honor 0 timestamps for now; we'll fight
+ * that battle later. Just remove the "FALSE &&" in order to only
+ * honor 0 timestamps for pagers.
+ */
+ can_ignore_outdated_timestamps =
+ (timestamp != 0 || (source_indication != META_CLIENT_TYPE_PAGER));
+
+ if (XSERVER_TIME_IS_BEFORE (timestamp, window->display->last_user_time) &&
+ can_ignore_outdated_timestamps)
{
meta_topic (META_DEBUG_FOCUS,
"last_user_time (%u) is more recent; ignoring "
@@ -4435,8 +4446,13 @@
return;
}
+ /* For those stupid pagers, get a valid timestamp and show a warning */
if (timestamp == 0)
- timestamp = meta_display_get_current_time_roundtrip (window->display);
+ {
+ meta_warning ("meta_window_activate called by a pager with a 0
timestamp; "
+ "the pager needs to be fixed.\n");
+ timestamp = meta_display_get_current_time_roundtrip (window->display);
+ }
meta_window_set_user_time (window, timestamp);
@@ -4450,12 +4466,19 @@
/* For non-transient windows, we just set up a pulsing indicator,
rather than move windows or workspaces.
See http://bugzilla.gnome.org/show_bug.cgi?id=482354 */
- if (window->xtransient_for == None &&
- !meta_window_located_on_workspace (window,
window->screen->active_workspace))
+ if (window->xtransient_for == None)
{
- meta_window_set_demands_attention (window);
- /* We've marked it as demanding, don't need to do anything else. */
- return;
+ if (!meta_window_located_on_workspace (window, workspace))
+ {
+ if (meta_prefs_get_bring_windows_to_current_workspace ())
+ {
+ meta_window_change_workspace (window, workspace);
+ }
+ else
+ {
+ meta_workspace_activate (window->workspace, timestamp);
+ }
+ }
}
else if (window->xtransient_for != None)
{
@@ -4493,7 +4516,7 @@
* we were such. If we change the pager behavior later, we could revisit
* this and just add extra flags to window_activate.
*/
- window_activate (window, timestamp, META_CLIENT_TYPE_PAGER, NULL);
+ window_activate (window, timestamp, META_CLIENT_TYPE_APPLICATION, NULL);
}
void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-4.8.1/src/meta/prefs.h
new/muffin-5.0.0/src/meta/prefs.h
--- old/muffin-4.8.1/src/meta/prefs.h 2021-01-14 10:47:56.000000000 +0100
+++ new/muffin-5.0.0/src/meta/prefs.h 2021-05-27 16:45:48.000000000 +0200
@@ -85,7 +85,8 @@
META_PREF_MIN_WIN_OPACITY,
META_PREF_MOUSE_ZOOM_ENABLED,
META_PREF_MOUSE_BUTTON_ZOOM_MODS,
- META_PREF_UI_SCALE
+ META_PREF_UI_SCALE,
+ META_PREF_BRING_WINDOWS_TO_CURRENT_WORKSPACE,
} MetaPreference;
typedef void (* MetaPrefsChangedFunc) (MetaPreference pref,
@@ -113,6 +114,7 @@
gboolean meta_prefs_get_attach_modal_dialogs (void);
gboolean meta_prefs_get_ignore_hide_titlebar_when_maximized
(void);
gboolean meta_prefs_get_raise_on_click (void);
+gboolean meta_prefs_get_bring_windows_to_current_workspace
(void);
const char* meta_prefs_get_theme (void);
/* returns NULL if GTK default should be used */
const PangoFontDescription* meta_prefs_get_titlebar_font (void);
