Remove obsolete patches
This commit is contained in:
Yaakov Selkowitz
parent
050cf23470
commit
c44830098d
@ -1,40 +0,0 @@
|
||||
From 0734ddbfaacff73b80747272ad7044ff904290f6 Mon Sep 17 00:00:00 2001
|
||||
From: "Owen W. Taylor" <otaylor@fishsoup.net>
|
||||
Date: Mon, 19 Oct 2009 18:43:00 -0400
|
||||
Subject: [PATCH] Don't focus ancestor window on a different workspace
|
||||
|
||||
When we are moving a window with a modal dialog to a different
|
||||
workspace, meta_workspace_focus_default_window() can be called
|
||||
with 'not_this_one' being the focused modal dialog.
|
||||
|
||||
Since the ancestor of that window is also being moved, we must
|
||||
not focus it as an alternative to the current window; this will
|
||||
cause windows to be moved back and Metacity to get into an
|
||||
inconsistent confused state.
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=237158
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=598995
|
||||
---
|
||||
src/core/workspace.c | 5 ++++-
|
||||
1 files changed, 4 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/core/workspace.c b/src/core/workspace.c
|
||||
index e877b19..6ffea30 100644
|
||||
--- a/src/core/workspace.c
|
||||
+++ b/src/core/workspace.c
|
||||
@@ -975,7 +975,10 @@ focus_ancestor_or_mru_window (MetaWorkspace *workspace,
|
||||
MetaWindow *ancestor;
|
||||
ancestor = NULL;
|
||||
meta_window_foreach_ancestor (not_this_one, record_ancestor, &ancestor);
|
||||
- if (ancestor != NULL)
|
||||
+ if (ancestor != NULL &&
|
||||
+ (ancestor->on_all_workspaces ||
|
||||
+ ancestor->workspace == workspace) &&
|
||||
+ meta_window_showing_on_its_workspace (ancestor))
|
||||
{
|
||||
meta_topic (META_DEBUG_FOCUS,
|
||||
"Focusing %s, ancestor of %s\n",
|
||||
--
|
||||
1.7.9
|
||||
|
||||
@ -1,80 +0,0 @@
|
||||
From 429b200aa0e21b33a720790d18e059491eb60089 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Drake <dsd@laptop.org>
|
||||
Date: Wed, 02 Mar 2011 15:52:53 +0000
|
||||
Subject: Disable keybindings message should ungrab keys
|
||||
|
||||
The disable-keybindings action is currently only 'soft' in that it
|
||||
just causes Metacity to ignore keypresses; the keys themselves are left
|
||||
bound.
|
||||
|
||||
Sugar would like to use this message to actually disable the bindings
|
||||
*and* release the grabs so that it can implement its own Alt-Tab handler.
|
||||
|
||||
This patch implements this. Based on earlier work by Bernie Innocenti.
|
||||
---
|
||||
diff --git a/src/core/display.c b/src/core/display.c
|
||||
index 518b4f3..3143e0c 100644
|
||||
--- a/src/core/display.c
|
||||
+++ b/src/core/display.c
|
||||
@@ -2268,7 +2268,7 @@ event_callback (XEvent *event,
|
||||
{
|
||||
meta_verbose ("Received set keybindings request = %d\n",
|
||||
(int) event->xclient.data.l[0]);
|
||||
- meta_set_keybindings_disabled (!event->xclient.data.l[0]);
|
||||
+ meta_set_keybindings_disabled (display, !event->xclient.data.l[0]);
|
||||
}
|
||||
else if (event->xclient.message_type ==
|
||||
display->atom__METACITY_TOGGLE_VERBOSE)
|
||||
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
|
||||
index 8ea6b41..da274e0 100644
|
||||
--- a/src/core/keybindings.c
|
||||
+++ b/src/core/keybindings.c
|
||||
@@ -817,6 +817,9 @@ meta_screen_grab_keys (MetaScreen *screen)
|
||||
if (screen->keys_grabbed)
|
||||
return;
|
||||
|
||||
+ if (all_bindings_disabled)
|
||||
+ return;
|
||||
+
|
||||
grab_keys (screen->display->key_bindings,
|
||||
screen->display->n_key_bindings,
|
||||
screen->display, screen->xroot,
|
||||
@@ -841,6 +844,9 @@ meta_window_grab_keys (MetaWindow *window)
|
||||
if (window->all_keys_grabbed)
|
||||
return;
|
||||
|
||||
+ if (all_bindings_disabled)
|
||||
+ return;
|
||||
+
|
||||
if (window->type == META_WINDOW_DOCK)
|
||||
{
|
||||
if (window->keys_grabbed)
|
||||
@@ -3356,9 +3362,11 @@ handle_set_spew_mark (MetaDisplay *display,
|
||||
}
|
||||
|
||||
void
|
||||
-meta_set_keybindings_disabled (gboolean setting)
|
||||
+meta_set_keybindings_disabled (MetaDisplay *display,
|
||||
+ gboolean setting)
|
||||
{
|
||||
all_bindings_disabled = setting;
|
||||
+ regrab_key_bindings (display);
|
||||
meta_topic (META_DEBUG_KEYBINDINGS,
|
||||
"Keybindings %s\n", all_bindings_disabled ? "disabled" : "enabled");
|
||||
}
|
||||
diff --git a/src/core/keybindings.h b/src/core/keybindings.h
|
||||
index 618520b..f845b48 100644
|
||||
--- a/src/core/keybindings.h
|
||||
+++ b/src/core/keybindings.h
|
||||
@@ -49,7 +49,8 @@ void meta_window_ungrab_all_keys (MetaWindow *window,
|
||||
void meta_display_process_key_event (MetaDisplay *display,
|
||||
MetaWindow *window,
|
||||
XEvent *event);
|
||||
-void meta_set_keybindings_disabled (gboolean setting);
|
||||
+void meta_set_keybindings_disabled (MetaDisplay *display,
|
||||
+ gboolean setting);
|
||||
void meta_display_process_mapping_event (MetaDisplay *display,
|
||||
XEvent *event);
|
||||
|
||||
--
|
||||
cgit v0.9
|
||||
@ -1,30 +0,0 @@
|
||||
Index: src/core/window.c
|
||||
===================================================================
|
||||
--- src/core/window.c (revision 3554)
|
||||
+++ src/core/window.c (working copy)
|
||||
@@ -2882,8 +2882,23 @@
|
||||
/* Get window on current or given workspace */
|
||||
if (workspace == NULL)
|
||||
workspace = window->screen->active_workspace;
|
||||
- if (!meta_window_located_on_workspace (window, workspace))
|
||||
- meta_window_change_workspace (window, workspace);
|
||||
+
|
||||
+ /* 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, workspace))
|
||||
+ {
|
||||
+ meta_window_set_demands_attention (window);
|
||||
+ /* We've marked it as demanding, don't need to do anything else. */
|
||||
+ return;
|
||||
+ }
|
||||
+ else if (window->xtransient_for != None)
|
||||
+ {
|
||||
+ /* Move transients to current workspace - preference dialogs should appear over
|
||||
+ the source window. */
|
||||
+ meta_window_change_workspace (window, workspace);
|
||||
+ }
|
||||
|
||||
if (window->shaded)
|
||||
meta_window_unshade (window, timestamp);
|
||||
@ -1,40 +0,0 @@
|
||||
From 857ac4b0682dec32ba55e4080fa7ec560a2481a0 Mon Sep 17 00:00:00 2001
|
||||
From: "Owen W. Taylor" <otaylor@fishsoup.net>
|
||||
Date: Fri, 20 Nov 2009 10:19:03 -0500
|
||||
Subject: [PATCH] Accept an empty string as well as "disabled" for
|
||||
keybindings
|
||||
|
||||
Treat the empty string the same as "disabled" for GConf keybinding
|
||||
keys. gnome-keybinding-properties was changed to write disabled
|
||||
keys as the empty string a year or so ago.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=559816
|
||||
---
|
||||
src/ui/ui.c | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/ui/ui.c b/src/ui/ui.c
|
||||
index 78aa353..ef9fcfc 100644
|
||||
--- a/src/ui/ui.c
|
||||
+++ b/src/ui/ui.c
|
||||
@@ -827,7 +827,7 @@ meta_ui_parse_accelerator (const char *accel,
|
||||
*keycode = 0;
|
||||
*mask = 0;
|
||||
|
||||
- if (strcmp (accel, "disabled") == 0)
|
||||
+ if (!accel[0] || strcmp (accel, "disabled") == 0)
|
||||
return TRUE;
|
||||
|
||||
meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask);
|
||||
@@ -914,7 +914,7 @@ meta_ui_parse_modifier (const char *accel,
|
||||
|
||||
*mask = 0;
|
||||
|
||||
- if (accel == NULL || strcmp (accel, "disabled") == 0)
|
||||
+ if (accel == NULL || !accel[0] || strcmp (accel, "disabled") == 0)
|
||||
return TRUE;
|
||||
|
||||
meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask);
|
||||
--
|
||||
1.7.9
|
||||
|
||||
@ -5,14 +5,6 @@ Release: 1%{?dist}
|
||||
URL: http://download.gnome.org/sources/metacity/
|
||||
Source0: http://download.gnome.org/sources/metacity/3.26/metacity-%{version}.tar.xz
|
||||
|
||||
# http://bugzilla.gnome.org/show_bug.cgi?id=558723
|
||||
#Patch4: stop-spamming-xsession-errors.patch
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=598995
|
||||
#Patch16: Dont-focus-ancestor-window-on-a-different-workspac.patch
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=559816
|
||||
Patch24: metacity-2.28-empty-keybindings.patch
|
||||
|
||||
License: GPLv2+
|
||||
Group: User Interface/Desktops
|
||||
BuildRequires: pkgconfig(gtk+-3.0) >= 3.20.0
|
||||
@ -61,11 +53,6 @@ API. This package exists purely for technical reasons.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
#patch4 -p1 -b .stop-spamming-xsession-errors
|
||||
|
||||
#patch16 -p1 -b .focus-different-workspace
|
||||
%patch24 -p1 -b .empty-keybindings
|
||||
|
||||
# force regeneration
|
||||
rm -f src/org.gnome.metacity.gschema.valid
|
||||
|
||||
@ -135,6 +122,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
* Mon Nov 13 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 3.26.0-1
|
||||
- Update to 3.26.0
|
||||
- Remove obsolete scriptlets
|
||||
- Remove obsolete patches
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
diff -up metacity-2.25.8/src/core/display.c.stop-spamming-xsession-errors metacity-2.25.8/src/core/display.c
|
||||
--- metacity-2.25.8/src/core/display.c.stop-spamming-xsession-errors 2008-11-23 00:28:37.000000000 -0500
|
||||
+++ metacity-2.25.8/src/core/display.c 2008-11-24 21:40:33.000000000 -0500
|
||||
@@ -3264,10 +3264,12 @@ meta_display_begin_grab_op (MetaDisplay
|
||||
|
||||
if (display->grab_op != META_GRAB_OP_NONE)
|
||||
{
|
||||
+#if 0
|
||||
if (window)
|
||||
meta_warning ("Attempt to perform window operation %u on window %s when operation %u on %s already in effect\n",
|
||||
op, window->desc, display->grab_op,
|
||||
display->grab_window ? display->grab_window->desc : "none");
|
||||
+#endif
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user