Accepting request 422494 from home:zhangxiaofei:branches:GNOME:Factory

SLE sync - Add mutter-bsc984738-grab-display.patch (bsc#984738, bgo#769387). - Drop mutter-grab-display.patch, it has been fixed by upstream differently. - Update to GNOME 3.20 Fate#318572 - Remove upstream patches: mutter-bnc879109-no-monitors-crash.patch - Refresh mutter-grab-display.patch, mutter-bell.patch, relax-some-constraints-on-CSD-windows-in-sle-classic.patch - Update mutter-bell.patch so it works on all cases (bnc#889218) - Add relax-some-constraints-on-CSD-windows-in-sle-classic.patch: CSD (Client Side Decoration) windows have invisible box wrapping around them, which leads to some positioning issues as in this bug report. Relax some constraints on window positioning for CSD windows s.t. they can be placed at the very top of the monitor. This fix works nicely for "sle-classic" as there is no top bar any more, and is NOT applied in other GNOME sessions for reasons stated in bgo#719772 (bnc#883491). - Add mutter-bnc879109-no-monitors-crash.patch: Fixes a crash in Mutter when there are no usable monitors, such as when a laptop is booted with the lid closed while on a docking station, with the intent of plugging an external monitor later (bnc#879109). - Added support for gnome-patch-translation (2 strings). - Update mutter-grab-display.patch to fix (bnc#873763) OBS-URL: https://build.opensuse.org/request/show/422494 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=203
2016-08-26 12:00:22 +00:00
parent d0ee0f6020
commit bc9db1f782
5 changed files with 432 additions and 1 deletions
--- a/mutter-bell.patch
+++ b/mutter-bell.patch
@@ -0,0 +1,107 @@
+Index: mutter-3.20.0/src/meta/prefs.h
+===================================================================
+--- mutter-3.20.0.orig/src/meta/prefs.h
+++ mutter-3.20.0/src/meta/prefs.h
+@@ -89,6 +89,7 @@ typedef enum
+   META_PREF_WORKSPACE_NAMES,
+   META_PREF_VISUAL_BELL,
+   META_PREF_AUDIBLE_BELL,
+  META_PREF_AUDIBLE_BELL_FORCE_THROUGH_SERVER,
+   META_PREF_VISUAL_BELL_TYPE,
+   META_PREF_GNOME_ACCESSIBILITY,
+   META_PREF_GNOME_ANIMATIONS,
+@@ -399,6 +400,7 @@ MetaKeyBindingAction meta_prefs_get_keyb
+ 
+ gboolean           meta_prefs_get_visual_bell      (void);
+ gboolean           meta_prefs_bell_is_audible      (void);
+gboolean           meta_prefs_bell_force_through_server (void);
+ GDesktopVisualBellType meta_prefs_get_visual_bell_type (void);
+ 
+ #endif
+Index: mutter-3.20.0/src/core/prefs.c
+===================================================================
+--- mutter-3.20.0.orig/src/core/prefs.c
+++ mutter-3.20.0/src/core/prefs.c
+@@ -93,6 +93,7 @@ static gboolean auto_raise_delay = 500;
+ static gboolean focus_change_on_pointer_rest = FALSE;
+ static gboolean bell_is_visible = FALSE;
+ static gboolean bell_is_audible = TRUE;
+static gboolean bell_force_through_server = FALSE;
+ static gboolean gnome_accessibility = FALSE;
+ static gboolean gnome_animations = TRUE;
+ static char *cursor_theme = NULL;
+@@ -353,6 +354,13 @@ static MetaBoolPreference preferences_bo
+       &bell_is_audible, /* FIXME: change the name: it's confusing */
+     },
+     {
+      { "audible-bell-force-through-server",
+        SCHEMA_MUTTER,
+        META_PREF_AUDIBLE_BELL_FORCE_THROUGH_SERVER,
+      },
+      &bell_force_through_server,
+    },
+    {
+       { KEY_GNOME_ACCESSIBILITY,
+         SCHEMA_INTERFACE,
+         META_PREF_GNOME_ACCESSIBILITY,
+@@ -1813,6 +1821,9 @@ meta_preference_to_string (MetaPreferenc
+     case META_PREF_AUDIBLE_BELL:
+       return "AUDIBLE_BELL";
+ 
+    case META_PREF_AUDIBLE_BELL_FORCE_THROUGH_SERVER:
+      return "AUDIBLE_BELL_FORCE_THROUGH_SERVER";
+
+     case META_PREF_VISUAL_BELL_TYPE:
+       return "VISUAL_BELL_TYPE";
+ 
+@@ -2077,6 +2088,12 @@ meta_prefs_bell_is_audible (void)
+   return bell_is_audible;
+ }
+ 
+gboolean
+meta_prefs_bell_force_through_server (void)
+{
+  return bell_force_through_server;
+}
+
+ GDesktopVisualBellType
+ meta_prefs_get_visual_bell_type (void)
+ {
+Index: mutter-3.20.0/src/core/bell.c
+===================================================================
+--- mutter-3.20.0.orig/src/core/bell.c
+++ mutter-3.20.0/src/core/bell.c
+@@ -220,6 +220,12 @@ meta_bell_notify (MetaDisplay *display,
+   if (meta_prefs_get_visual_bell ())
+     bell_visual_notify (display, window);
+ 
+  if (meta_prefs_bell_force_through_server ())
+   {
+    XkbForceBell (display->xdisplay, 100);
+    return TRUE;
+    }
+
+   if (meta_prefs_bell_is_audible ())
+     return bell_audible_notify (display, window);
+ 
+Index: mutter-3.20.0/data/org.gnome.mutter.gschema.xml.in
+===================================================================
+--- mutter-3.20.0.orig/data/org.gnome.mutter.gschema.xml.in
+++ mutter-3.20.0/data/org.gnome.mutter.gschema.xml.in
+@@ -102,6 +102,16 @@
+       </_description>
+     </key>
+ 
+    <key name="audible-bell-force-through-server" type="b">
+      <default>false</default>
+      <_summary>Force the System Bell through the X server only.</_summary>
+      <_description>
+        Force the System Bell through the X server only for systems that
+        do not want to go through the sound card - for example that don't
+        have speakers.
+      </_description>
+    </key>
+
+     <child name="keybindings" schema="org.gnome.mutter.keybindings"/>
+ 
+   </schema>