Accepting request 43799 from home:dimstar:branches:GNOME:Factory

Copy from home:dimstar:branches:GNOME:Factory/mutter via accept of submit request 43799 revision 9.
Request was accepted with message:
thanks

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

mutter-2.29.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e4c1c46542f1251e9ec495729a3b753e5753ecd18fe35df586e474f6bf5ab90
-size 2001498

mutter-2.31.5.tar.bz2

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

mutter-cogl_texture-deprecated.patch

@@ -1,88 +0,0 @@
-Index: mutter-2.29.0/src/compositor/mutter-shaped-texture.c
-===================================================================
---- mutter-2.29.0.orig/src/compositor/mutter-shaped-texture.c
-+++ mutter-2.29.0/src/compositor/mutter-shaped-texture.c
-@@ -124,18 +124,18 @@ mutter_shaped_texture_dispose (GObject *
- 
-   if (priv->material != COGL_INVALID_HANDLE)
-     {
--      cogl_material_unref (priv->material);
-+      cogl_handle_unref (priv->material);
-       priv->material = COGL_INVALID_HANDLE;
-     }
-   if (priv->material_unshaped != COGL_INVALID_HANDLE)
-     {
--      cogl_material_unref (priv->material_unshaped);
-+      cogl_handle_unref (priv->material_unshaped);
-       priv->material_unshaped = COGL_INVALID_HANDLE;
-     }
- #if 1 /* see comment in mutter_shaped_texture_paint */
-   if (priv->material_workaround != COGL_INVALID_HANDLE)
-     {
--      cogl_material_unref (priv->material_workaround);
-+      cogl_handle_unref (priv->material_workaround);
-       priv->material_workaround = COGL_INVALID_HANDLE;
-     }
- #endif
-@@ -194,7 +194,7 @@ mutter_shaped_texture_dirty_mask (Mutter
-       if (mask_gl_target == GL_TEXTURE_RECTANGLE_ARB)
-         glDeleteTextures (1, &mask_gl_tex);
- 
--      cogl_texture_unref (priv->mask_texture);
-+      cogl_handle_unref (priv->mask_texture);
-       priv->mask_texture = COGL_INVALID_HANDLE;
-     }
- }
-Index: mutter-2.29.0/src/compositor/mutter-texture-tower.c
-===================================================================
---- mutter-2.29.0.orig/src/compositor/mutter-texture-tower.c
-+++ mutter-2.29.0/src/compositor/mutter-texture-tower.c
-@@ -131,7 +131,7 @@ free_texture (CoglHandle texture)
-   if (gl_target == GL_TEXTURE_RECTANGLE_ARB)
-     glDeleteTextures (1, &gl_tex);
- 
--  cogl_texture_unref (texture);
-+  cogl_handle_unref (texture);
- }
- 
- /**
-@@ -180,7 +180,7 @@ mutter_texture_tower_set_base_texture (M
- #endif
-         }
- 
--      cogl_texture_unref (tower->textures[0]);
-+      cogl_handle_unref (tower->textures[0]);
-     }
- 
-   tower->textures[0] = texture;
-@@ -189,7 +189,7 @@ mutter_texture_tower_set_base_texture (M
-     {
-       int width, height;
- 
--      cogl_texture_ref (tower->textures[0]);
-+      cogl_handle_ref (tower->textures[0]);
- 
-       width = cogl_texture_get_width (tower->textures[0]);
-       height = cogl_texture_get_height (tower->textures[0]);
-Index: mutter-2.29.0/src/compositor/tidy/tidy-texture-frame.c
-===================================================================
---- mutter-2.29.0.orig/src/compositor/tidy/tidy-texture-frame.c
-+++ mutter-2.29.0/src/compositor/tidy/tidy-texture-frame.c
-@@ -155,7 +155,7 @@ tidy_texture_frame_unrealize (ClutterAct
-   if (priv->material == COGL_INVALID_HANDLE)
-     return;
- 
--  cogl_material_unref (priv->material);
-+  cogl_handle_unref (priv->material);
-   priv->material = COGL_INVALID_HANDLE;
- 
-   CLUTTER_ACTOR_UNSET_FLAGS (self, CLUTTER_ACTOR_REALIZED);
-@@ -415,7 +415,7 @@ tidy_texture_frame_dispose (GObject *gob
- 
-   if (priv->material)
-     {
--      cogl_material_unref (priv->material);
-+      cogl_handle_unref (priv->material);
-       priv->material = COGL_INVALID_HANDLE;
-     }
- 

mutter-gcc45.patch

@@ -1,39 +0,0 @@
-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,3 +1,86 @@
+-------------------------------------------------------------------
+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 [Andreas, Florian, Owen]
+- BuildRequire gtk3-devel instead of gtk2-devel.
+
+-------------------------------------------------------------------
+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 by upstream.
+
+-------------------------------------------------------------------
+Fri Mar 19 09:01:56 CET 2010 - dimstar@opensuse.org
+
+- Update to version 2.29.1:
+  + Support and require Clutter 1.2
+  + Add meta_display_get_keybinding_action()
+  + Add meta_window_get_wm_class_instance()
+  + Remove workaround for bug fixed in intel driver Q2/2009 release
+  + Build fixes
+  + Updated translations.
+- Drop upstreamed patch mutter-cogl_texture-deprecated.patch.
+
 -------------------------------------------------------------------
 Thu Feb 25 21:32:53 UTC 2010 - dominique.leuenberger@tmf-group.com
 

mutter.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package mutter (Version 2.29.0)
+# spec file for package mutter (Version 2.31.5)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -25,7 +25,7 @@ BuildRequires:  gconf2-devel
 BuildRequires:  gir-repository
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gobject-introspection-devel
-BuildRequires:  gtk2-devel
+BuildRequires:  gtk3-devel
 BuildRequires:  intltool
 BuildRequires:  libcanberra-devel
 BuildRequires:  startup-notification-devel
@@ -33,14 +33,10 @@ BuildRequires:  update-desktop-files
 BuildRequires:  zenity
 License:        GPLv2+
 Group:          System/GUI/GNOME
-Version:        2.29.0
+Version:        2.31.5
 Release:        1
 Summary:        Window and compositing manager based on Clutter
 Source:         %{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM mutter-cogl_texture-deprecated.patch bgo#610454 dimstar@opensuse.org -- cogl_texture_[un]ref has been deprecated in favor of cogl_handle_[un]ref.
-Patch0:         mutter-cogl_texture-deprecated.patch
-# PATCH-FIX-UPSTREAM mutter-gcc45.patch bgo#606719 dimstar@opensuse.org -- Fix build with GCC 4.5
-Patch1:         mutter-gcc45.patch
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       zenity
@@ -68,13 +64,12 @@ to develop applications that require these.
 %lang_package
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure \
 	--libexecdir=%{_libexecdir}/%{name} \
 	--disable-static \
+        --with-gtk=3.0 \
 	--disable-schemas-install
 %__make %{?jobs:-j%jobs}