Hello community,
here is the log from the commit of package muffin for openSUSE:Factory checked
in at 2018-05-11 09:15:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/muffin (Old)
and /work/SRC/openSUSE:Factory/.muffin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "muffin"
Fri May 11 09:15:40 2018 rev:15 rq:605817 version:3.8.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/muffin/muffin.changes 2018-04-26
13:37:16.741734593 +0200
+++ /work/SRC/openSUSE:Factory/.muffin.new/muffin.changes 2018-05-11
09:15:52.771722797 +0200
@@ -1,0 +2,10 @@
+Thu May 8 20:40:20 UTC 2018 - sor.ale...@meowr.ru
+
+- Update to version 3.8.1:
+ * prefs: Fix introspection for meta_prefs_get_button_layout().
+ * Remove META_LAYER_FULLSCREEN.
+ * Make MetaButtonLayout usable from introspection.
+ * screen.c: Redefine a fullscreen monitor as one where there is a
+ fullscreen window and that window is the topmost there.
+
+-------------------------------------------------------------------
Old:
----
muffin-3.8.0.tar.gz
New:
----
muffin-3.8.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ muffin.spec ++++++
--- /var/tmp/diff_new_pack.hl7Nd9/_old 2018-05-11 09:15:53.407699757 +0200
+++ /var/tmp/diff_new_pack.hl7Nd9/_new 2018-05-11 09:15:53.411699612 +0200
@@ -20,7 +20,7 @@
%define sover 0
%define typelib typelib-1_0-MetaMuffin-0_0
Name: muffin
-Version: 3.8.0
+Version: 3.8.1
Release: 0
Summary: Cinnamon Desktop default window manager
License: GPL-2.0-or-later AND MIT
++++++ muffin-3.8.0.tar.gz -> muffin-3.8.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.8.0/.circleci/config.yml
new/muffin-3.8.1/.circleci/config.yml
--- old/muffin-3.8.0/.circleci/config.yml 2018-04-20 13:16:00.000000000
+0200
+++ new/muffin-3.8.1/.circleci/config.yml 2018-05-06 16:14:22.000000000
+0200
@@ -46,11 +46,6 @@
fi
jobs:
- "mint18":
- <<: *shared
- docker:
- - image: linuxmintd/mint18-amd64
-
"mint19":
<<: *shared
docker:
@@ -65,6 +60,5 @@
version: 2
build:
jobs:
- - "mint18"
- "mint19"
- "lmde3"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.8.0/configure.ac
new/muffin-3.8.1/configure.ac
--- old/muffin-3.8.0/configure.ac 2018-04-20 13:16:00.000000000 +0200
+++ new/muffin-3.8.1/configure.ac 2018-05-06 16:14:22.000000000 +0200
@@ -2,7 +2,7 @@
m4_define([muffin_major_version], [3])
m4_define([muffin_minor_version], [8])
-m4_define([muffin_micro_version], [0])
+m4_define([muffin_micro_version], [1])
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-3.8.0/debian/changelog
new/muffin-3.8.1/debian/changelog
--- old/muffin-3.8.0/debian/changelog 2018-04-20 13:16:00.000000000 +0200
+++ new/muffin-3.8.1/debian/changelog 2018-05-06 16:14:22.000000000 +0200
@@ -1,3 +1,27 @@
+muffin (3.8.1) tara; urgency=medium
+
+ [ Michael Webster ]
+ * prefs: Fix introspection for meta_prefs_get_button_layout()
+ * Remove META_LAYER_FULLSCREEN
+
+ [ Germán Franco ]
+ * Make MetaButtonLayout usable from introspection (#318)
+
+ [ Fabio Fantoni ]
+ * debian: wrap-and-sort -bst
+ * improve debian/control
+ * debian/rules: don't run configure twice
+ * add debian/not-installed
+ * circleci: remove mint18 job
+ * Bump debhelper build-dep and compat to 10
+ * update debian/copyright
+ * debian/rules: remove override_dh_installdocs
+
+ [ Michael Webster ]
+ * screen.c: Redefine a fullscreen monitor as one where there is a (#317)
+
+ -- Clement Lefebvre <r...@linuxmint.com> Sun, 06 May 2018 15:13:58 +0100
+
muffin (3.8.0) tara; urgency=medium
[ Michael Webster ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.8.0/debian/compat
new/muffin-3.8.1/debian/compat
--- old/muffin-3.8.0/debian/compat 2018-04-20 13:16:00.000000000 +0200
+++ new/muffin-3.8.1/debian/compat 2018-05-06 16:14:22.000000000 +0200
@@ -1 +1 @@
-9
+10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.8.0/debian/control
new/muffin-3.8.1/debian/control
--- old/muffin-3.8.0/debian/control 2018-04-20 13:16:00.000000000 +0200
+++ new/muffin-3.8.1/debian/control 2018-05-06 16:14:22.000000000 +0200
@@ -2,122 +2,123 @@
Section: x11
Priority: optional
Maintainer: Linux Mint <r...@linuxmint.com>
-Build-Depends: debhelper (>= 9),
- dh-autoreconf,
- autoconf-archive,
- intltool (>= 0.34.90),
- libgtk-3-dev (>= 3.9.12),
- libcanberra-gtk3-dev,
- gobject-introspection (>= 0.9.2),
- libgirepository1.0-dev (>= 0.9.2),
- libclutter-1.0-dev (>= 1.10.0),
- libpango1.0-dev (>= 1.14.0),
- libglib2.0-dev (>= 2.37.3),
- libstartup-notification0-dev (>= 0.7),
- libxcomposite-dev (>= 1:0.3),
- libxfixes-dev,
- libxrender-dev,
- libxdamage-dev,
- libxcursor-dev,
- libxt-dev,
- libx11-dev,
- libxinerama-dev,
- libxext-dev,
- libxrandr-dev,
- libsm-dev,
- libice-dev,
- zenity,
- gnome-doc-utils (>= 0.8),
- gtk-doc-tools,
- gnome-pkg-tools (>= 0.10),
- libcinnamon-desktop-dev (>= 2.4.0)
+Build-Depends:
+ autoconf-archive,
+ automake,
+ debhelper (>= 10),
+ gnome-doc-utils (>= 0.8),
+ gnome-pkg-tools (>= 0.10),
+ gobject-introspection (>= 0.9.12-5~),
+ gtk-doc-tools,
+ intltool (>= 0.34.90),
+ libcanberra-gtk3-dev,
+ libcinnamon-desktop-dev (>= 3.6),
+ libclutter-1.0-dev (>= 1.14.3),
+ libcogl-dev (>= 1.13.3),
+ libgirepository1.0-dev (>= 0.9.12),
+ libglib2.0-dev (>= 2.37.3),
+ libgtk-3-dev (>= 3.9.12),
+ libice-dev,
+ libpango1.0-dev (>= 1.14.0),
+ libsm-dev,
+ libstartup-notification0-dev (>= 0.7),
+ libx11-dev,
+ libxcomposite-dev (>= 1:0.3),
+ libxcursor-dev,
+ libxdamage-dev,
+ libxext-dev,
+ libxfixes-dev,
+ libxinerama-dev,
+ libxrandr-dev,
+ libxrender-dev,
+ libxt-dev,
+ zenity,
Standards-Version: 3.9.4
-Package: muffin
+Package: gir1.2-meta-muffin-0.0
+Section: introspection
Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- muffin-common (= ${source:Version}),
- zenity
-Provides: x-window-manager
-Suggests: gnome-themes,
- xdg-user-dirs
-Description: window and compositing manager
+Breaks: gir1.2-muffin-3.0
+Replaces: gir1.2-muffin-3.0
+Depends: ${gir:Depends}, ${misc:Depends}
+Description: GObject introspection data for Muffin
Muffin is a window manager performing compositing as well based on
GTK+ and Clutter and used in Cinnamon desktop environment.
.
- This package contains the core binaries.
+ This package contains the GObject introspection data which may be
+ used to generate dynamic bindings.
+
+Package: libmuffin-dev
+Section: libdevel
+Architecture: any
+Depends:
+ gir1.2-meta-muffin-0.0 (= ${binary:Version}),
+ libcinnamon-desktop-dev,
+ libclutter-1.0-dev (>= 1.10.0),
+ libgtk-3-dev (>= 3.9.12),
+ libmuffin0 (= ${binary:Version}),
+ ${misc:Depends},
+Description: window and compositing manager (development files)
+ Muffin is a window manager performing compositing as well based on
+ GTK+ and Clutter and used in Cinnamon desktop environment.
+ .
+ This package contains the development files.
Package: libmuffin0
Section: libs
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- muffin-common (= ${source:Version})
+Depends: muffin-common (= ${source:Version}), ${misc:Depends},
${shlibs:Depends}
Description: window and compositing manager (shared library)
Muffin is a window manager performing compositing as well based on
GTK+ and Clutter and used in Cinnamon desktop environment.
.
This package contains the shared library.
+Package: muffin
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ muffin-common (= ${source:Version}),
+ zenity,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Provides: x-window-manager
+Suggests: gnome-themes, xdg-user-dirs
+Description: window and compositing manager
+ Muffin is a window manager performing compositing as well based on
+ GTK+ and Clutter and used in Cinnamon desktop environment.
+ .
+ This package contains the core binaries.
+
Package: muffin-common
Section: misc
Architecture: all
-Depends: dconf-gsettings-backend | gsettings-backend,
- sgml-base (>= 1.26)
+Depends: dconf-gsettings-backend | gsettings-backend, sgml-base (>= 1.26)
Description: window and compositing manager (data files)
Muffin is a window manager performing compositing as well based on
GTK+ and Clutter and used in Cinnamon desktop environment.
.
This package contains the shared files.
-Package: libmuffin-dev
-Section: libdevel
-Architecture: any
-Depends: ${misc:Depends},
- libmuffin0 (= ${binary:Version}),
- gir1.2-meta-muffin-0.0 (= ${binary:Version}),
- libclutter-1.0-dev (>= 1.10.0),
- libgtk-3-dev (>= 3.9.12)
-Description: window and compositing manager (development files)
- Muffin is a window manager performing compositing as well based on
- GTK+ and Clutter and used in Cinnamon desktop environment.
- .
- This package contains the development files.
-
Package: muffin-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: libmuffin0 (= ${binary:Version}),
- muffin (= ${binary:Version}),
- ${misc:Depends}
+Depends:
+ libmuffin0 (= ${binary:Version}),
+ muffin (= ${binary:Version}),
+ ${misc:Depends},
Description: window and compositing manager (debugging symbols)
Muffin is a window manager performing compositing as well based on
GTK+ and Clutter and used in Cinnamon desktop environment.
.
This package contains the debugging symbols.
-Package: gir1.2-meta-muffin-0.0
-Section: introspection
-Architecture: any
-Breaks: gir1.2-muffin-3.0
-Replaces: gir1.2-muffin-3.0
-Depends: ${gir:Depends},
- ${misc:Depends}
-Description: GObject introspection data for Muffin
- Muffin is a window manager performing compositing as well based on
- GTK+ and Clutter and used in Cinnamon desktop environment.
- .
- This package contains the GObject introspection data which may be
- used to generate dynamic bindings.
-
Package: muffin-doc
Section: doc
Architecture: all
-Depends: ${misc:Depends}, devhelp
+Depends: devhelp, ${misc:Depends}
Description: Muffin documentation
Muffin is a window manager performing compositing as well based on
GTK+ and Clutter and used in Cinnamon desktop environment.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.8.0/debian/copyright
new/muffin-3.8.1/debian/copyright
--- old/muffin-3.8.0/debian/copyright 2018-04-20 13:16:00.000000000 +0200
+++ new/muffin-3.8.1/debian/copyright 2018-05-06 16:14:22.000000000 +0200
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: muffin
Upstream-Contact: Linux Mint Project <r...@linuxmint.com>
Source: https://github.com/linuxmint/muffin
@@ -77,12 +77,14 @@
2001-2002, হ্যাভোক পেনিংটন, রেড হ্যাট্, ইন্কর্পোরেট এবং অন্যান্য
License: GPL-2+
-Files: src/core/async-getprop.c
+Files: src/compositor/meta-sync-ring.c
+ src/core/async-getprop.c
src/core/async-getprop.h
src/core/muffin-Xatomtype.h
src/core/testasyncgetprop.c
Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts
2002, Havoc Pennington
+ 2011, NVIDIA Corporation
1986-1998, The Open Group
License: MIT/X11
Permission to use, copy, modify, distribute, and sell this software
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.8.0/debian/not-installed
new/muffin-3.8.1/debian/not-installed
--- old/muffin-3.8.0/debian/not-installed 1970-01-01 01:00:00.000000000
+0100
+++ new/muffin-3.8.1/debian/not-installed 2018-05-06 16:14:22.000000000
+0200
@@ -0,0 +1,4 @@
+# libtool not installed
+usr/lib/*/libmuffin.la
+# manpages are compressed
+usr/share/man/man1/*.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.8.0/debian/rules
new/muffin-3.8.1/debian/rules
--- old/muffin-3.8.0/debian/rules 2018-04-20 13:16:00.000000000 +0200
+++ new/muffin-3.8.1/debian/rules 2018-05-06 16:14:22.000000000 +0200
@@ -18,10 +18,10 @@
endif
%:
- dh $@ --with autoreconf,gir
+ dh $@ --with gir
override_dh_autoreconf:
- dh_autoreconf --as-needed ./autogen.sh
+ NOCONFIGURE=1 dh_autoreconf --as-needed ./autogen.sh
override_dh_auto_configure:
dh_auto_configure -- --disable-static \
@@ -35,8 +35,5 @@
override_dh_strip:
dh_strip --dbg-package=muffin-dbg
-override_dh_installdocs:
- dh_installdocs --link-doc=muffin-common
-
override_dh_install:
dh_install -X.la --fail-missing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.8.0/src/core/prefs.c
new/muffin-3.8.1/src/core/prefs.c
--- old/muffin-3.8.0/src/core/prefs.c 2018-04-20 13:16:00.000000000 +0200
+++ new/muffin-3.8.1/src/core/prefs.c 2018-05-06 16:14:22.000000000 +0200
@@ -1584,8 +1584,11 @@
g_strfreev (buttons);
}
- new_layout.left_buttons[i] = META_BUTTON_FUNCTION_LAST;
- new_layout.left_buttons_has_spacer[i] = FALSE;
+ for (; i < MAX_BUTTONS_PER_CORNER; i++)
+ {
+ new_layout.left_buttons[i] = META_BUTTON_FUNCTION_LAST;
+ new_layout.left_buttons_has_spacer[i] = FALSE;
+ }
i = 0;
if (sides != NULL && sides[0] != NULL && sides[1] != NULL)
@@ -1643,8 +1646,11 @@
g_strfreev (buttons);
}
- new_layout.right_buttons[i] = META_BUTTON_FUNCTION_LAST;
- new_layout.right_buttons_has_spacer[i] = FALSE;
+ for (; i < MAX_BUTTONS_PER_CORNER; i++)
+ {
+ new_layout.right_buttons[i] = META_BUTTON_FUNCTION_LAST;
+ new_layout.right_buttons_has_spacer[i] = FALSE;
+ }
g_strfreev (sides);
@@ -2121,6 +2127,12 @@
g_variant_builder_end (&builder));
}
+/**
+ * meta_prefs_get_button_layout:
+ * @button_layout_p: (out): the #MetaButtonLayout
+ *
+ * Returns the titlebar button definitions.
+ */
void
meta_prefs_get_button_layout (MetaButtonLayout *button_layout_p)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.8.0/src/core/screen.c
new/muffin-3.8.1/src/core/screen.c
--- old/muffin-3.8.0/src/core/screen.c 2018-04-20 13:16:00.000000000 +0200
+++ new/muffin-3.8.1/src/core/screen.c 2018-05-06 16:14:22.000000000 +0200
@@ -3824,8 +3824,7 @@
if (meta_window_is_monitor_sized (window))
covers_monitors = TRUE;
}
- else if (window->maximized_horizontally &&
- window->maximized_vertically)
+ else
{
int monitor_index = meta_window_get_monitor (window);
/* + 1 to avoid NULL */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.8.0/src/core/stack.c
new/muffin-3.8.1/src/core/stack.c
--- old/muffin-3.8.0/src/core/stack.c 2018-04-20 13:16:00.000000000 +0200
+++ new/muffin-3.8.1/src/core/stack.c 2018-05-06 16:14:22.000000000 +0200
@@ -274,35 +274,11 @@
g_list_free (windows);
}
-static gboolean
-is_focused_foreach (MetaWindow *window,
- void *data)
-{
- if (window == window->display->expected_focus_window)
- {
- *((gboolean*) data) = TRUE;
- return FALSE;
- }
- return TRUE;
-}
-
-static gboolean
-windows_on_different_monitor (MetaWindow *a,
- MetaWindow *b)
-{
- if (a->screen != b->screen)
- return TRUE;
-
- return meta_screen_get_monitor_for_window (a->screen, a) !=
- meta_screen_get_monitor_for_window (b->screen, b);
-}
-
/* Get layer ignoring any transient or group relationships */
static MetaStackLayer
get_standalone_layer (MetaWindow *window)
{
MetaStackLayer layer;
- gboolean focused_transient = FALSE;
switch (window->type)
{
@@ -327,20 +303,8 @@
layer = META_LAYER_OVERRIDE_REDIRECT;
break;
default:
- meta_window_foreach_transient (window,
- is_focused_foreach,
- &focused_transient);
-
if (window->wm_state_below)
layer = META_LAYER_BOTTOM;
- else if (window->fullscreen &&
- (focused_transient ||
- window == window->display->expected_focus_window ||
- window->display->expected_focus_window == NULL ||
- (window->display->expected_focus_window != NULL &&
- windows_on_different_monitor (window,
-
window->display->expected_focus_window))))
- layer = META_LAYER_FULLSCREEN;
else if (window->wm_state_above)
layer = META_LAYER_TOP;
else
@@ -395,8 +359,6 @@
static void
compute_layer (MetaWindow *window)
{
- MetaStackLayer old_layer = window->layer;
-
window->layer = get_standalone_layer (window);
/* We can only do promotion-due-to-group for dialogs and other
@@ -432,10 +394,6 @@
meta_topic (META_DEBUG_STACK, "Window %s on layer %u type = %u has_focus =
%d\n",
window->desc, window->layer,
window->type, window->has_focus);
-
- if (window->layer != old_layer &&
- (old_layer == META_LAYER_FULLSCREEN || window->layer ==
META_LAYER_FULLSCREEN))
- meta_screen_queue_check_fullscreen (window->screen);
}
/* Front of the layer list is the topmost window,
@@ -997,6 +955,8 @@
stack->sorted = g_list_sort (stack->sorted,
(GCompareFunc) compare_window_position);
+ meta_screen_queue_check_fullscreen (stack->screen);
+
stack->need_resort = FALSE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.8.0/src/core/window.c
new/muffin-3.8.1/src/core/window.c
--- old/muffin-3.8.0/src/core/window.c 2018-04-20 13:16:00.000000000 +0200
+++ new/muffin-3.8.1/src/core/window.c 2018-05-06 16:14:22.000000000 +0200
@@ -4132,7 +4132,6 @@
window->force_save_user_rect = FALSE;
meta_stack_freeze (window->screen->stack);
- meta_window_update_layer (window);
meta_window_raise (window);
meta_stack_thaw (window->screen->stack);
@@ -4198,7 +4197,7 @@
*/
force_save_user_window_placement (window);
- meta_window_update_layer (window);
+ meta_screen_queue_check_fullscreen (window->screen);
meta_stack_tracker_queue_sync_stack (window->screen->stack_tracker);
g_object_notify (G_OBJECT (window), "fullscreen");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.8.0/src/meta/common.h
new/muffin-3.8.1/src/meta/common.h
--- old/muffin-3.8.0/src/meta/common.h 2018-04-20 13:16:00.000000000 +0200
+++ new/muffin-3.8.1/src/meta/common.h 2018-05-06 16:14:22.000000000 +0200
@@ -306,6 +306,14 @@
#define MAX_BUTTONS_PER_CORNER META_BUTTON_FUNCTION_LAST
+/* Keep array size in sync with MAX_BUTTONS_PER_CORNER */
+/**
+ * MetaButtonLayout:
+ * @left_buttons: (array fixed-size=10):
+ * @right_buttons: (array fixed-size=10):
+ * @left_buttons_has_spacer: (array fixed-size=10):
+ * @right_buttons_has_spacer: (array fixed-size=10):
+ */
typedef struct _MetaButtonLayout MetaButtonLayout;
struct _MetaButtonLayout
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/muffin-3.8.0/src/meta/prefs.h
new/muffin-3.8.1/src/meta/prefs.h
--- old/muffin-3.8.0/src/meta/prefs.h 2018-04-20 13:16:00.000000000 +0200
+++ new/muffin-3.8.1/src/meta/prefs.h 2018-05-06 16:14:22.000000000 +0200
@@ -128,7 +128,7 @@
const char* meta_prefs_get_terminal_command (void);
-void meta_prefs_get_button_layout (MetaButtonLayout
*button_layout);
+void meta_prefs_get_button_layout (MetaButtonLayout
*button_layout_p);
/* Double, right, middle click can be configured to any titlebar meta-action */
CDesktopTitlebarAction meta_prefs_get_action_double_click_titlebar (void);
