Mailinglist Archive: opensuse-commit (1093 mails)
| < Previous | Next > |
commit mutter for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 02 Mar 2010 12:42:55 +0100
- Message-id: <20100302114255.D434A202A8@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package mutter for openSUSE:Factory
checked in at Tue Mar 2 12:42:55 CET 2010.
--------
--- mutter/mutter.changes 2010-02-03 20:33:27.000000000 +0100
+++ /mounts/work_src_done/STABLE/mutter/mutter.changes 2010-02-25
22:35:09.000000000 +0100
@@ -1,0 +2,29 @@
+Thu Feb 25 21:32:53 UTC 2010 - dominique.leuenberger@xxxxxxxxxxxxx
+
+- Refresh mutter-cogl_texture-deprecated.patch to also take care
+ of cogl_material_[un]ref, which is deprecated with clutter
+ 1.1.14.
+
+-------------------------------------------------------------------
+Fri Feb 19 11:17:36 CET 2010 - dimstar@xxxxxxxxxxxx
+
+- Update to version 2.29.0:
+ + Improve appearance of scaled down windows using mipmap
+ emulation
+ + Added signals: MetaDisplay::window-created,
+ MetaDisplay::window-marked-urgent,
+ MetaDisplay::window-demands-attention, MetaWindow::unmanaged
+ + Added properties: MetaWindow:demands-attention,
+ MetaWindow:urgent, MetaWindow:maximized-horizontally,
+ MetaWindow:maximized-vertically
+ + Fix nasty crash when workspace "struts" changed during a window
+ move
+ + Bug fixes
+ + Build fixes
+ + Merge Metacity changes since 2.26. Includes themable sound
+ support via libcanberra
+- BuildRequire libcanberra-devel for new themable sounds.
+- Add mutter-cogl_texture-deprecated.patch to fix build against
+ clutter 1.1.12. Reported upstream as bgo#610454.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
mutter-2.28.0.tar.bz2
mutter-fix-build.patch
mutter-gl-no-cgl.patch
New:
----
mutter-2.29.0.tar.bz2
mutter-cogl_texture-deprecated.patch
mutter-gcc45.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mutter.spec ++++++
--- /var/tmp/diff_new_pack.WmGDR0/_old 2010-03-02 12:42:38.000000000 +0100
+++ /var/tmp/diff_new_pack.WmGDR0/_new 2010-03-02 12:42:38.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package mutter (Version 2.28.0)
+# spec file for package mutter (Version 2.29.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -27,19 +27,20 @@
BuildRequires: gobject-introspection-devel
BuildRequires: gtk2-devel
BuildRequires: intltool
+BuildRequires: libcanberra-devel
BuildRequires: startup-notification-devel
BuildRequires: update-desktop-files
BuildRequires: zenity
License: GPLv2+
Group: System/GUI/GNOME
-Version: 2.28.0
-Release: 3
+Version: 2.29.0
+Release: 1
Summary: Window and compositing manager based on Clutter
Source: %{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM mutter-fix-build.patch bgo607125 vuntz@xxxxxxxxxxxx --
Fix build with latest introspection data
-Patch0: mutter-fix-build.patch
-# PATCH-FIX-UPSTREAM mutter-gl-no-cgl.patch vuntz@xxxxxxxxxxxx -- Fix build
with latest clutter, taken from upstream
-Patch1: mutter-gl-no-cgl.patch
+# PATCH-FIX-UPSTREAM mutter-cogl_texture-deprecated.patch bgo#610454
dimstar@xxxxxxxxxxxx -- 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@xxxxxxxxxxxx -- Fix
build with GCC 4.5
+Patch1: mutter-gcc45.patch
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: zenity
++++++ mutter-2.28.0.tar.bz2 -> mutter-2.29.0.tar.bz2 ++++++
++++ 23133 lines of diff (skipped)
++++++ mutter-cogl_texture-deprecated.patch ++++++
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 ++++++
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;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |