diff --git a/mutter-cogl_texture-deprecated.patch b/mutter-cogl_texture-deprecated.patch index f0cb05d..3dbd4a5 100644 --- a/mutter-cogl_texture-deprecated.patch +++ b/mutter-cogl_texture-deprecated.patch @@ -2,6 +2,28 @@ 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); @@ -42,3 +64,25 @@ Index: mutter-2.29.0/src/compositor/mutter-texture-tower.c 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; + } + diff --git a/mutter-gcc45.patch b/mutter-gcc45.patch new file mode 100644 index 0000000..6a9f67c --- /dev/null +++ b/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; + diff --git a/mutter.changes b/mutter.changes index 2428fe3..f22561f 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 25 21:32:53 UTC 2010 - dominique.leuenberger@tmf-group.com + +- 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@opensuse.org diff --git a/mutter.spec b/mutter.spec index e8efbdf..3b46a07 100644 --- a/mutter.spec +++ b/mutter.spec @@ -39,6 +39,8 @@ 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 @@ -67,6 +69,7 @@ to develop applications that require these. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure \