r42127 - in /desktop/experimental/mutter/debian: ./ patches/
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Sat Aug 2 15:54:36 UTC 2014
Author: ah
Date: Sat Aug 2 15:54:36 2014
New Revision: 42127
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42127
Log:
* New upstream development release.
* Drop debian/patches/prevent-double-lock-deadlock.patch
- obsoleted by upstream commit 5c99eae8a9ca04f5e
"display: clean up event handling"
* Update build-dependencies according to configure.ac changes:
- add libsystemd-login-dev (>= 207), libpam0g-dev
- drop libxrender-dev
* debian/mutter.install: drop usr/share/gnome
- see upstream commit 542a0886cf14cec3995ada2
"Remove files no one cares about anymore"
* Add patches stolen from fedora originally backported from upstream git:
- 0001-constraints-Complete-fix-for-size-hints-constrainmen.patch
- 0001-constraints-Size-increments-need-to-be-applied-to-th.patch
- 0001-keybindings-Make-sure-not-to-call-meta_change_keygra.patch
* Bump gsettings-desktop-schemas (build-)dependencies to 3.13.1
- need switch-to-workspace-last schema key
* Exclude mutter-launch from having permissions "fixed"
- mutter-launch needs to be suid
Added:
desktop/experimental/mutter/debian/patches/0001-constraints-Complete-fix-for-size-hints-constrainmen.patch
desktop/experimental/mutter/debian/patches/0001-constraints-Size-increments-need-to-be-applied-to-th.patch
desktop/experimental/mutter/debian/patches/0001-keybindings-Make-sure-not-to-call-meta_change_keygra.patch
Removed:
desktop/experimental/mutter/debian/patches/prevent-double-lock-deadlock.patch
Modified:
desktop/experimental/mutter/debian/changelog
desktop/experimental/mutter/debian/control.in
desktop/experimental/mutter/debian/mutter.install
desktop/experimental/mutter/debian/patches/series
desktop/experimental/mutter/debian/rules
Modified: desktop/experimental/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/changelog?rev=42127&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/changelog [utf-8] (original)
+++ desktop/experimental/mutter/debian/changelog [utf-8] Sat Aug 2 15:54:36 2014
@@ -1,8 +1,29 @@
-mutter (3.12.2-3) UNRELEASED; urgency=medium
-
+mutter (3.13.1-1) UNRELEASED; urgency=medium
+
+ [ Laurent Bigonville ]
* debian/rules: Pass --as-needed to dh_autoreconf
- -- Laurent Bigonville <bigon at debian.org> Sat, 02 Aug 2014 14:49:38 +0200
+ [ Andreas Henriksson ]
+ * New upstream development release.
+ * Drop debian/patches/prevent-double-lock-deadlock.patch
+ - obsoleted by upstream commit 5c99eae8a9ca04f5e
+ "display: clean up event handling"
+ * Update build-dependencies according to configure.ac changes:
+ - add libsystemd-login-dev (>= 207), libpam0g-dev
+ - drop libxrender-dev
+ * debian/mutter.install: drop usr/share/gnome
+ - see upstream commit 542a0886cf14cec3995ada2
+ "Remove files no one cares about anymore"
+ * Add patches stolen from fedora originally backported from upstream git:
+ - 0001-constraints-Complete-fix-for-size-hints-constrainmen.patch
+ - 0001-constraints-Size-increments-need-to-be-applied-to-th.patch
+ - 0001-keybindings-Make-sure-not-to-call-meta_change_keygra.patch
+ * Bump gsettings-desktop-schemas (build-)dependencies to 3.13.1
+ - need switch-to-workspace-last schema key
+ * Exclude mutter-launch from having permissions "fixed"
+ - mutter-launch needs to be suid
+
+ -- Andreas Henriksson <andreas at fatal.se> Sat, 02 Aug 2014 16:33:04 +0200
mutter (3.12.2-2) unstable; urgency=medium
Modified: desktop/experimental/mutter/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/control.in?rev=42127&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/control.in [utf-8] (original)
+++ desktop/experimental/mutter/debian/control.in [utf-8] Sat Aug 2 15:54:36 2014
@@ -12,7 +12,7 @@
libgtk-3-dev (>= 3.9.11),
libcanberra-gtk3-dev,
gobject-introspection (>= 0.9.12-5~),
- gsettings-desktop-schemas-dev (>= 3.7.3),
+ gsettings-desktop-schemas-dev (>= 3.13.1),
libgirepository1.0-dev (>= 0.9.12),
libjson-glib-dev (>= 0.13.2-1~),
libcogl-dev (>= 1.17.1),
@@ -21,11 +21,11 @@
libcairo2-dev (>= 1.2.0),
libgnome-desktop-3-dev (>= 3.10),
libstartup-notification0-dev (>= 0.7),
+ libsystemd-login-dev (>= 207) [linux-any],
libupower-glib-dev (>= 0.99.0),
libxcomposite-dev (>= 1:0.2),
libxi-dev (>= 2:1.6.0),
libxfixes-dev,
- libxrender-dev,
libxdamage-dev,
libxcursor-dev,
libxt-dev,
@@ -35,6 +35,8 @@
libxrandr-dev,
libsm-dev,
libice-dev,
+ libpam0g-dev,
+ libwayland-dev (>= 1.4.93) [linux-any],
zenity
Standards-Version: 3.9.5
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/mutter
@@ -45,7 +47,7 @@
Depends: ${shlibs:Depends},
${misc:Depends},
mutter-common (= ${source:Version}),
- gsettings-desktop-schemas (>= 3.7.3),
+ gsettings-desktop-schemas (>= 3.13.1),
gnome-themes-standard,
zenity
Provides: x-window-manager
@@ -88,7 +90,7 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- gsettings-desktop-schemas (>= 3.7.3),
+ gsettings-desktop-schemas (>= 3.13.1),
mutter-common (= ${source:Version})
Conflicts: libmutter0, libmutter0a, libmutter0b, libmutter0c
Description: window manager library from the Mutter window manager
@@ -125,7 +127,7 @@
Depends: ${misc:Depends},
libmutter0d (= ${binary:Version}),
gir1.2-mutter-3.0 (= ${binary:Version}),
- gsettings-desktop-schemas-dev (>= 3.7.3),
+ gsettings-desktop-schemas-dev (>= 3.13.1),
libclutter-1.0-dev (>= 1.15.90),
libgtk-3-dev (>= 3.9.11),
libx11-dev
Modified: desktop/experimental/mutter/debian/mutter.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/mutter.install?rev=42127&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/mutter.install [utf-8] (original)
+++ desktop/experimental/mutter/debian/mutter.install [utf-8] Sat Aug 2 15:54:36 2014
@@ -1,4 +1,3 @@
usr/bin
usr/lib/mutter/plugins
usr/share/applications
-usr/share/gnome
Added: desktop/experimental/mutter/debian/patches/0001-constraints-Complete-fix-for-size-hints-constrainmen.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/0001-constraints-Complete-fix-for-size-hints-constrainmen.patch?rev=42127&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/0001-constraints-Complete-fix-for-size-hints-constrainmen.patch (added)
+++ desktop/experimental/mutter/debian/patches/0001-constraints-Complete-fix-for-size-hints-constrainmen.patch [utf-8] Sat Aug 2 15:54:36 2014
@@ -0,0 +1,31 @@
+From bc8799d7d7f240887086a16e8a400e049ea64df0 Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre at mecheye.net>
+Date: Mon, 5 May 2014 19:06:47 -0400
+Subject: [PATCH] constraints: Complete fix for size hints constrainment
+
+---
+ src/core/constraints.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/core/constraints.c b/src/core/constraints.c
+index df9c219..bfc7090 100644
+--- a/src/core/constraints.c
++++ b/src/core/constraints.c
+@@ -950,6 +950,14 @@ constrain_size_increments (MetaWindow *window,
+ if (new_height < window->size_hints.min_height)
+ new_height += ((window->size_hints.min_height - new_height)/hi + 1)*hi;
+
++ {
++ client_rect.width = new_width;
++ client_rect.height = new_height;
++ meta_window_client_rect_to_frame_rect (window, &client_rect, &client_rect);
++ new_width = client_rect.width;
++ new_height = client_rect.height;
++ }
++
+ /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity
+ * See bug 448183
+ */
+--
+1.9.0
+
Added: desktop/experimental/mutter/debian/patches/0001-constraints-Size-increments-need-to-be-applied-to-th.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/0001-constraints-Size-increments-need-to-be-applied-to-th.patch?rev=42127&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/0001-constraints-Size-increments-need-to-be-applied-to-th.patch (added)
+++ desktop/experimental/mutter/debian/patches/0001-constraints-Size-increments-need-to-be-applied-to-th.patch [utf-8] Sat Aug 2 15:54:36 2014
@@ -0,0 +1,55 @@
+From f4ef4b79f95db7b4e3071489a30cbc8f710ab4ce Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre at mecheye.net>
+Date: Mon, 5 May 2014 13:09:41 -0400
+Subject: [PATCH] constraints: Size increments need to be applied to the client
+ rect
+
+Not the frame rect.
+---
+ src/core/constraints.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/core/constraints.c b/src/core/constraints.c
+index e4e019b..df9c219 100644
+--- a/src/core/constraints.c
++++ b/src/core/constraints.c
+@@ -905,6 +905,7 @@ constrain_size_increments (MetaWindow *window,
+ int new_width, new_height;
+ gboolean constraint_already_satisfied;
+ MetaRectangle *start_rect;
++ MetaRectangle client_rect;
+
+ if (priority > PRIORITY_SIZE_HINTS_INCREMENTS)
+ return TRUE;
+@@ -915,13 +916,15 @@ constrain_size_increments (MetaWindow *window,
+ info->action_type == ACTION_MOVE)
+ return TRUE;
+
++ meta_window_frame_rect_to_client_rect (window, &info->current, &client_rect);
++
+ /* Determine whether constraint is already satisfied; exit if it is */
+ bh = window->size_hints.base_height;
+ hi = window->size_hints.height_inc;
+ bw = window->size_hints.base_width;
+ wi = window->size_hints.width_inc;
+- extra_height = (info->current.height - bh) % hi;
+- extra_width = (info->current.width - bw) % wi;
++ extra_height = (client_rect.height - bh) % hi;
++ extra_width = (client_rect.width - bw) % wi;
+ /* ignore size increments for maximized windows */
+ if (window->maximized_horizontally)
+ extra_width *= 0;
+@@ -935,8 +938,8 @@ constrain_size_increments (MetaWindow *window,
+ return constraint_already_satisfied;
+
+ /*** Enforce constraint ***/
+- new_width = info->current.width - extra_width;
+- new_height = info->current.height - extra_height;
++ new_width = client_rect.width - extra_width;
++ new_height = client_rect.height - extra_height;
+
+ /* Adjusting down instead of up (as done in the above two lines) may
+ * violate minimum size constraints; fix the adjustment if this
+--
+1.9.0
+
Added: desktop/experimental/mutter/debian/patches/0001-keybindings-Make-sure-not-to-call-meta_change_keygra.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/0001-keybindings-Make-sure-not-to-call-meta_change_keygra.patch?rev=42127&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/0001-keybindings-Make-sure-not-to-call-meta_change_keygra.patch (added)
+++ desktop/experimental/mutter/debian/patches/0001-keybindings-Make-sure-not-to-call-meta_change_keygra.patch [utf-8] Sat Aug 2 15:54:36 2014
@@ -0,0 +1,59 @@
+From 845fdda22c1e7595d72b710796ed61490b02cbbd Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre at mecheye.net>
+Date: Sat, 3 May 2014 12:49:41 -0400
+Subject: [PATCH] keybindings: Make sure not to call meta_change_keygrab under
+ Wayland
+
+---
+ src/core/keybindings.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/core/keybindings.c b/src/core/keybindings.c
+index bf9be99..b0a6bbd 100644
+--- a/src/core/keybindings.c
++++ b/src/core/keybindings.c
+@@ -1259,6 +1259,7 @@ guint
+ meta_display_grab_accelerator (MetaDisplay *display,
+ const char *accelerator)
+ {
++ MetaBackend *backend = meta_get_backend ();
+ MetaKeyBinding *binding;
+ MetaKeyGrab *grab;
+ guint keysym = 0;
+@@ -1284,7 +1285,8 @@ meta_display_grab_accelerator (MetaDisplay *display,
+ if (display_get_keybinding (display, keycode, mask))
+ return META_KEYBINDING_ACTION_NONE;
+
+- meta_change_keygrab (display, display->screen->xroot, TRUE, keysym, keycode, mask);
++ if (META_IS_BACKEND_X11 (backend))
++ meta_change_keygrab (display, display->screen->xroot, TRUE, keysym, keycode, mask);
+
+ grab = g_new0 (MetaKeyGrab, 1);
+ grab->action = next_dynamic_keybinding_action ();
+@@ -1314,6 +1316,7 @@ gboolean
+ meta_display_ungrab_accelerator (MetaDisplay *display,
+ guint action)
+ {
++ MetaBackend *backend = meta_get_backend ();
+ MetaKeyBinding *binding;
+ MetaKeyGrab *grab;
+ char *key;
+@@ -1335,10 +1338,11 @@ meta_display_ungrab_accelerator (MetaDisplay *display,
+ {
+ guint32 index_key;
+
+- meta_change_keygrab (display, display->screen->xroot, FALSE,
+- binding->keysym,
+- binding->keycode,
+- binding->mask);
++ if (META_IS_BACKEND_X11 (backend))
++ meta_change_keygrab (display, display->screen->xroot, FALSE,
++ binding->keysym,
++ binding->keycode,
++ binding->mask);
+
+ index_key = key_binding_key (binding->keycode, binding->mask);
+ g_hash_table_remove (display->key_bindings_index, GINT_TO_POINTER (index_key));
+--
+1.9.0
+
Modified: desktop/experimental/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/series?rev=42127&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/patches/series [utf-8] (original)
+++ desktop/experimental/mutter/debian/patches/series [utf-8] Sat Aug 2 15:54:36 2014
@@ -1,2 +1,4 @@
01_Wcast-align.patch
-prevent-double-lock-deadlock.patch
+0001-constraints-Complete-fix-for-size-hints-constrainmen.patch
+0001-constraints-Size-increments-need-to-be-applied-to-th.patch
+0001-keybindings-Make-sure-not-to-call-meta_change_keygra.patch
Modified: desktop/experimental/mutter/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/rules?rev=42127&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/rules [utf-8] (original)
+++ desktop/experimental/mutter/debian/rules [utf-8] Sat Aug 2 15:54:36 2014
@@ -20,4 +20,6 @@
# This does not work with mutter; disabled, for now.
# LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+DEB_FIXPERMS_EXCLUDE := /usr/bin/mutter-launch
+
common-binary-post-install-arch:: list-missing
More information about the pkg-gnome-commits
mailing list