r54573 - in /desktop/unstable/mutter/debian: ./ patches/
smcv at users.alioth.debian.org
smcv at users.alioth.debian.org
Fri Oct 27 11:50:09 UTC 2017
Author: smcv
Date: Fri Oct 27 11:50:07 2017
New Revision: 54573
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54573
Log:
Improve patch status tracking
* d/p/0006-x11-Protect-XChangeProperty-call-with-error-traps.patch:
Note equivalence with Debian bug #878353
* d/changelog: Retroactively add a reference from 3.26.1-2 to #878353
* d/p/*.patch: Add metadata indicating whether the patch is applied
upstream for 3.26.2 or Debian-specific (all current patches are in
one category or the other)
Modified:
desktop/unstable/mutter/debian/changelog
desktop/unstable/mutter/debian/patches/0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch
desktop/unstable/mutter/debian/patches/0006-x11-Protect-XChangeProperty-call-with-error-traps.patch
desktop/unstable/mutter/debian/patches/0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch
desktop/unstable/mutter/debian/patches/0008-backends-add-monitors-updated-internal-signal-to-onl.patch
desktop/unstable/mutter/debian/patches/0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch
desktop/unstable/mutter/debian/patches/0010-backend-move-the-cursor-render-update-on-screen-chan.patch
desktop/unstable/mutter/debian/patches/0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch
desktop/unstable/mutter/debian/patches/0012-x11-window-Don-t-manage-InputOnly-windows.patch
desktop/unstable/mutter/debian/patches/0013-compositor-Ignore-offscreen-windows.patch
desktop/unstable/mutter/debian/patches/0014-Use-a-single-supported-scales.patch
desktop/unstable/mutter/debian/patches/0015-monitor-normal-Prefer-modes-with-same-flags.patch
desktop/unstable/mutter/debian/patches/0016-monitor-unit-tests-Check-non-first-preferred-modes.patch
desktop/unstable/mutter/debian/patches/0017-compositor-Avoid-a-crash-if-top-window-finalized.patch
desktop/unstable/mutter/debian/patches/0018-Revert-ClutterActor-Optimize-away-idempotent-scale.patch
desktop/unstable/mutter/debian/patches/0019-Revert-tests-Fix-actor-anchors-test.patch
desktop/unstable/mutter/debian/patches/skip-failing-tests-325.patch
desktop/unstable/mutter/debian/patches/skip-failing-tests.patch
Modified: desktop/unstable/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/changelog?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/changelog [utf-8] (original)
+++ desktop/unstable/mutter/debian/changelog [utf-8] Fri Oct 27 11:50:07 2017
@@ -1,3 +1,14 @@
+mutter (3.26.1-7) UNRELEASED; urgency=medium
+
+ * d/p/0006-x11-Protect-XChangeProperty-call-with-error-traps.patch:
+ Note equivalence with Debian bug #878353
+ * d/changelog: Retroactively add a reference from 3.26.1-2 to #878353
+ * d/p/*.patch: Add metadata indicating whether the patch is applied
+ upstream for 3.26.2 or Debian-specific (all current patches are in
+ one category or the other)
+
+ -- Simon McVittie <smcv at debian.org> Fri, 27 Oct 2017 12:41:28 +0100
+
mutter (3.26.1-6) unstable; urgency=high
* debian/control.in: Bump libegl1-mesa-dev to (>= 17) (Closes: #878702)
@@ -47,7 +58,7 @@
* Add git_fix_xorg_maximize_crash.patch:
- Cherry-pick fix for crash when closing windows on Budgie or
- GNOME Shell (LP: #1722510)
+ GNOME Shell (LP: #1722510, Closes: #878353)
-- Jeremy Bicha <jbicha at debian.org> Tue, 10 Oct 2017 10:22:41 -0400
Modified: desktop/unstable/mutter/debian/patches/0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -10,7 +10,8 @@
Send the older 'format' event to all clients, and only send the newer
'modifier' event to resource versions 3 or above.
-https://bugzilla.gnome.org/show_bug.cgi?id=788558
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788558
+Origin: upstream, 3.26.2
---
src/wayland/meta-wayland-dma-buf.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
Modified: desktop/unstable/mutter/debian/patches/0006-x11-Protect-XChangeProperty-call-with-error-traps.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/0006-x11-Protect-XChangeProperty-call-with-error-traps.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/0006-x11-Protect-XChangeProperty-call-with-error-traps.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/0006-x11-Protect-XChangeProperty-call-with-error-traps.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -4,8 +4,9 @@
users of the gnome-shell xorg session together with all budgie desktop
users.
Author: polygamma <jonny.westphalen at googlemail.com>
-Origin: upstream commit f9c625924e5358afd3e47733e68d166770edd496
+Origin: upstream, 3.26.2, commit:f9c625924e5358afd3e47733e68d166770edd496
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788666
+Bug-Debian: https://bugs.debian.org/878353
Bug-Ubuntu: https://launchpad.net/bugs/1722510
Last-Update: 2017-10-09
Modified: desktop/unstable/mutter/debian/patches/0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -8,7 +8,8 @@
factor, just use the primary logical monitor. That's where the shell UI
will most likely be.
-https://bugzilla.gnome.org/show_bug.cgi?id=788820
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788820
+Origin: upstream, 3.26.2
---
src/backends/meta-settings.c | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
Modified: desktop/unstable/mutter/debian/patches/0008-backends-add-monitors-updated-internal-signal-to-onl.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/0008-backends-add-monitors-updated-internal-signal-to-onl.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/0008-backends-add-monitors-updated-internal-signal-to-onl.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/0008-backends-add-monitors-updated-internal-signal-to-onl.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -7,7 +7,8 @@
Adding an internal signal and use it to update the internal state before
emitting "monitors-changed" which will be repeated by the screen to the world.
-https://bugzilla.gnome.org/show_bug.cgi?id=788860
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788860
+Origin: upstream, 3.26.2
---
src/backends/meta-backend.c | 2 --
src/backends/meta-input-settings.c | 2 +-
Modified: desktop/unstable/mutter/debian/patches/0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -4,7 +4,8 @@
Subject: [PATCH 09/11] monitor-manager: use g_return_val_if_fail if trying to
fetch an invalid monitor
-https://bugzilla.gnome.org/show_bug.cgi?id=788860
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788860
+Origin: upstream, 3.26.2
---
src/backends/meta-monitor-manager.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: desktop/unstable/mutter/debian/patches/0010-backend-move-the-cursor-render-update-on-screen-chan.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/0010-backend-move-the-cursor-render-update-on-screen-chan.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/0010-backend-move-the-cursor-render-update-on-screen-chan.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/0010-backend-move-the-cursor-render-update-on-screen-chan.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -4,7 +4,8 @@
Subject: [PATCH 10/11] backend: move the cursor render update on screen
changes here
-https://bugzilla.gnome.org/show_bug.cgi?id=788860
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788860
+Origin: upstream, 3.26.2
---
src/backends/meta-backend.c | 2 ++
src/core/screen.c | 7 -------
Modified: desktop/unstable/mutter/debian/patches/0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -4,7 +4,8 @@
Subject: [PATCH 11/11] workspace: ensure that workarea data is valid when
fetching by monitor num
-https://bugzilla.gnome.org/show_bug.cgi?id=788860
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788860
+Origin: upstream, 3.26.2
---
src/core/workspace.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Modified: desktop/unstable/mutter/debian/patches/0012-x11-window-Don-t-manage-InputOnly-windows.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/0012-x11-window-Don-t-manage-InputOnly-windows.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/0012-x11-window-Don-t-manage-InputOnly-windows.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/0012-x11-window-Don-t-manage-InputOnly-windows.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -6,7 +6,8 @@
This was dropped by mistake in commit
f166240225b6ab110b091520103d0370d51899ac.
-https://bugzilla.gnome.org/show_bug.cgi?id=788493
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788493
+Origin: upstream, 3.26.2
---
src/x11/window-x11.c | 6 ++++++
1 file changed, 6 insertions(+)
Modified: desktop/unstable/mutter/debian/patches/0013-compositor-Ignore-offscreen-windows.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/0013-compositor-Ignore-offscreen-windows.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/0013-compositor-Ignore-offscreen-windows.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/0013-compositor-Ignore-offscreen-windows.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -13,7 +13,8 @@
UI frames window. This effectively disabled the compositor bypass
functionality.
-https://bugzilla.gnome.org/show_bug.cgi?id=788493
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788493
+Origin: upstream, 3.26.2
---
src/compositor/compositor-private.h | 2 ++
src/compositor/compositor.c | 47 ++++++++++++++++++++++++++++++++-----
Modified: desktop/unstable/mutter/debian/patches/0014-Use-a-single-supported-scales.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/0014-Use-a-single-supported-scales.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/0014-Use-a-single-supported-scales.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/0014-Use-a-single-supported-scales.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -15,8 +15,9 @@
supported scales list is then used for all monitor and modes no matter
what.
-https://bugzilla.gnome.org/show_bug.cgi?id=788901
-https://launchpad.net/bugs/1724024
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788901
+Bug-Ubuntu: https://launchpad.net/bugs/1724024
+Origin: upstream, 3.26.2
---
src/backends/x11/meta-monitor-manager-xrandr.c | 103 +++++++++++++++++++++++--
1 file changed, 95 insertions(+), 8 deletions(-)
Modified: desktop/unstable/mutter/debian/patches/0015-monitor-normal-Prefer-modes-with-same-flags.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/0015-monitor-normal-Prefer-modes-with-same-flags.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/0015-monitor-normal-Prefer-modes-with-same-flags.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/0015-monitor-normal-Prefer-modes-with-same-flags.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -12,7 +12,8 @@
This fixes a crash when the preferred mode was not the first mode with
the same resolution, refresh rate and set of handled modes.
-https://bugzilla.gnome.org/show_bug.cgi?id=789153
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=789153
+Origin: upstream, 3.26.2
---
src/backends/meta-monitor.c | 41 ++++++++++++++++++++++++++++++++---------
1 file changed, 32 insertions(+), 9 deletions(-)
Modified: desktop/unstable/mutter/debian/patches/0016-monitor-unit-tests-Check-non-first-preferred-modes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/0016-monitor-unit-tests-Check-non-first-preferred-modes.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/0016-monitor-unit-tests-Check-non-first-preferred-modes.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/0016-monitor-unit-tests-Check-non-first-preferred-modes.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -7,7 +7,8 @@
refresh rate and handled flags) we correctly add the preferred mode to
the list of monitor modes.
-https://bugzilla.gnome.org/show_bug.cgi?id=789153
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=789153
+Origin: upstream, 3.26.2
---
src/backends/meta-monitor.c | 2 -
src/backends/meta-monitor.h | 2 +
Modified: desktop/unstable/mutter/debian/patches/0017-compositor-Avoid-a-crash-if-top-window-finalized.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/0017-compositor-Avoid-a-crash-if-top-window-finalized.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/0017-compositor-Avoid-a-crash-if-top-window-finalized.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/0017-compositor-Avoid-a-crash-if-top-window-finalized.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -7,7 +7,8 @@
Since we're not holding a reference, the top window actor might be
finalized when we paint resulting in a use after free crash.
-https://bugzilla.gnome.org/show_bug.cgi?id=788493
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788493
+Origin: upstream, 3.26.2
---
src/compositor/compositor.c | 3 +++
1 file changed, 3 insertions(+)
Modified: desktop/unstable/mutter/debian/patches/0018-Revert-ClutterActor-Optimize-away-idempotent-scale.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/0018-Revert-ClutterActor-Optimize-away-idempotent-scale.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/0018-Revert-ClutterActor-Optimize-away-idempotent-scale.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/0018-Revert-ClutterActor-Optimize-away-idempotent-scale.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -9,7 +9,8 @@
There's a cascade of regressions that needs to be sorted out before
relanding this:
-https://bugzilla.gnome.org/show_bug.cgi?id=784314
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=784314
+Origin: upstream, 3.26.2
---
clutter/clutter/clutter-actor.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
Modified: desktop/unstable/mutter/debian/patches/0019-Revert-tests-Fix-actor-anchors-test.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/0019-Revert-tests-Fix-actor-anchors-test.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/0019-Revert-tests-Fix-actor-anchors-test.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/0019-Revert-tests-Fix-actor-anchors-test.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -6,6 +6,8 @@
This reverts commit dd451547a5e7bcce6d9752cb1936ee8222b82315.
since we reverted commit 5cb5baa with commit 193216c
+
+Applied-upstream: 3.26.2
---
clutter/tests/conform/actor-anchors.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Modified: desktop/unstable/mutter/debian/patches/skip-failing-tests-325.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/skip-failing-tests-325.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/skip-failing-tests-325.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/skip-failing-tests-325.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -2,6 +2,7 @@
That way we can still benefit by running all the other tests.
Author: Jeremy Bicha <jbicha at ubuntu.com>
Bug: https://bugzilla.gnome.org/785319
+Applied-upstream: no
---
clutter/tests/conform/Makefile.am | 1 -
1 file changed, 1 deletion(-)
Modified: desktop/unstable/mutter/debian/patches/skip-failing-tests.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/skip-failing-tests.patch?rev=54573&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/skip-failing-tests.patch [utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/skip-failing-tests.patch [utf-8] Fri Oct 27 11:50:07 2017
@@ -3,7 +3,8 @@
Author: Jeremy Bicha <jbicha at ubuntu.com>
Date: Fri, 05 May 2017 08:26:36 -0500
Bug: https://bugzilla.gnome.org/782215
- https://bugzilla.gnome.org/753836
+Bug: https://bugzilla.gnome.org/753836
+Applied-upstream: no
---
clutter/tests/conform/Makefile.am | 2 --
1 file changed, 2 deletions(-)
More information about the pkg-gnome-commits
mailing list