Accepting request 47794 from GNOME:Factory

checked in (request 47794)

OBS-URL: https://build.opensuse.org/request/show/47794
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=32

mutter-2.29.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:175f3adcc5ad5c6f23772ca15c862f275fc3d9a9c3104e9146cf265847a4a10a
+size 1981019

mutter-2.31.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:518df8d359acd7ec91e8ffcce1c3420fce5bcf85fefba6f4571ad3f6c419d398
-size 1992924

mutter-gcc45.patch

@@ -0,0 +1,39 @@
+Index: mutter-2.29.0/src/core/core.c
+===================================================================
+--- mutter-2.29.0.orig/src/core/core.c
++++ mutter-2.29.0/src/core/core.c
+@@ -526,6 +526,9 @@ meta_core_get_menu_accelerator (MetaMenu
+   
+   switch (menu_op)
+     {
++    case META_MENU_OP_NONE:
++      /* No keybindings needed here */ 
++      break;
+     case META_MENU_OP_DELETE:
+       name = "close";
+       break;
+Index: mutter-2.29.0/src/include/common.h
+===================================================================
+--- mutter-2.29.0.orig/src/include/common.h
++++ mutter-2.29.0/src/include/common.h
+@@ -52,6 +52,7 @@ typedef enum
+ 
+ typedef enum
+ {
++  META_MENU_OP_NONE        = 0,
+   META_MENU_OP_DELETE      = 1 << 0,
+   META_MENU_OP_MINIMIZE    = 1 << 1,
+   META_MENU_OP_UNMAXIMIZE  = 1 << 2,
+Index: mutter-2.29.0/src/core/window.c
+===================================================================
+--- mutter-2.29.0.orig/src/core/window.c
++++ mutter-2.29.0/src/core/window.c
+@@ -7157,7 +7157,7 @@ menu_callback (MetaWindowMenu *menu,
+           meta_window_shove_titlebar_onscreen (window);
+           break;
+ 
+-        case 0:
++        case META_MENU_OP_NONE:
+           /* nothing */
+           break;
+ 

mutter.changes

@@ -1,88 +1,3 @@
--------------------------------------------------------------------
-Thu Sep  2 20:48:40 UTC 2010 - dimstar@opensuse.org
-
-- Add mutter-gdk-cairo.patch: replace GDK Drawing API with cairo.
-  This fixes building with GTK3 2.90.6.
-
--------------------------------------------------------------------
-Wed Sep  1 15:32:49 CEST 2010 - vuntz@opensuse.org
-
-- Drop gir-repository BuildRequires: the introspection files that
-  were needed from there are now directly with the appropriate
-  libraries.
-
--------------------------------------------------------------------
-Fri Jul 16 13:49:04 UTC 2010 - dimstar@opensuse.org
-
-- Update to 2.31.5:
-  + Support building with GTK+ 3.0
-  + Remove deprecated usages for compatibility with GTK+ 3.0
-  + Export a boxed type for MetaRectangle
-  + Allow disabling -Werror with --enable-compile-warnings=yes
-  + Build fixes
-- Build against GTK+ 3: use gtk3-devel BuildRequires instead of
-  gtk2-devel and pass --with-gtk=3.0 to configure.
-
--------------------------------------------------------------------
-Mon Jul  5 20:40:09 CEST 2010 - dimstar@opensuse.org
-
-- Update to version 2.31.4:
-  + Clean up MutterPlugin effect interface
-  + Track damage as the bounding box, a significant optimizations
-    for rapidly drawing clients
-  + Add meta_window_is_remote()
-  + Add meta_add_debug_topic() for turning on logging of specific
-    topics
-  + Fix bug with window unmaximization
-  + Bugs fixed:
-    - bgo#611838: expose sub-stage redraws by streaming raw updates
-      to ClutterX11TexturePixmap
-    - bgo#620585: Add meta_window_is_remote
-    - bgo#620860: function ‘meta_display_open’
-    - bgo#621082: MutterPluginManager should call
-      plugin->switch_workspace, when screen doesn't have any
-      window. Or function should be renamed.
-    - bgo#621413: Maximize/Unmaximize not behaving properly for
-      some non-gnome based programs
-  + Updated translations.
-
--------------------------------------------------------------------
-Fri May 28 21:53:59 CEST 2010 - dimstar@opensuse.org
-
-- Update to version 2.31.2:
-  + Theme enhancements
-    - Add a flexible version mechanism for themes -
-      metacity-theme-3.xml is now supported, and can include
-      version="> 3.2" type attributes on the root element or
-      any subelement.
-    - Add frame_x_center/frame_y_center variables
-    - Allow a theme to turn on title ellipsization
-  + Performance enhancements:
-    - Stream raw damage updates to ClutterX11TexturePixmap
-      to enable partial stage updates when windos change
-    - Don't trap XErrors in meta_compositor_process_event
-  + Add meta_prefs_override_preference_location(); this allows
-    a plugin like GNOME Shell to redirect preferences to a
-    plugin-specific location.
-  + Support a _MUTTER_HINTS window property; this is a string
-    property holding key-value pairs with plugin-specific
-    interpretation
-  + Build with GSEAL_ENABLE
-  + Add meta_display_get_leader_window()
-  + Add meta_display_sort_windows_by_stacking
-  + Export
-     meta_display_get_last_user_time()
-     meta_display_xserver_time_is_before()
-     meta_window_foreach_ancestor(),
-     meta_window_foreach_transient()
-     meta_window_lower()
-     meta_window_raise()
-     meta_window_set_demands_attention()
-     meta_window_unset_demands_attention()
-  + Bug fixes
-  + Build fixes
-- Drop mutter-gcc45.patch, fixed upstream.
-
 -------------------------------------------------------------------
 Fri Mar 19 09:01:56 CET 2010 - dimstar@opensuse.org
 

mutter.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package mutter (Version 2.31.5)
+# spec file for package mutter (Version 2.29.1)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -22,9 +22,10 @@ Name:           mutter
 BuildRequires:  clutter-devel
 BuildRequires:  fdupes
 BuildRequires:  gconf2-devel
+BuildRequires:  gir-repository
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gobject-introspection-devel
-BuildRequires:  gtk3-devel
+BuildRequires:  gtk2-devel
 BuildRequires:  intltool
 BuildRequires:  libcanberra-devel
 BuildRequires:  startup-notification-devel
@@ -32,12 +33,12 @@ BuildRequires:  update-desktop-files
 BuildRequires:  zenity
 License:        GPLv2+
 Group:          System/GUI/GNOME
-Version:        2.31.5
+Version:        2.29.1
 Release:        1
 Summary:        Window and compositing manager based on Clutter
 Source:         %{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM mutter-gdk-cairo.patch dimstar@opensuse.org -- Replace GDK drawing API with cairo, upstream git commit 08cfdcd & 0839c1
+# PATCH-FIX-UPSTREAM mutter-gcc45.patch bgo#606719 dimstar@opensuse.org -- Fix build with GCC 4.5
-Patch0:         mutter-gdk-cairo.patch
+Patch1:         mutter-gcc45.patch
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       zenity
@@ -65,14 +66,13 @@ to develop applications that require these.
 %lang_package
 %prep
 %setup -q
-%patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
 	--libexecdir=%{_libexecdir}/%{name} \
 	--disable-static \
-	--disable-schemas-install \
+	--disable-schemas-install
-        --with-gtk=3.0
 %__make %{?jobs:-j%jobs}
 
 %install