From 5a3d85b1a2c281e39fcbdaf672513f914e23dafda640e1fda14d80dd37539da7 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 21 Feb 2010 15:59:28 +0000 Subject: [PATCH 1/3] Accepting request 32969 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/mutter via accept of submit request 32969 revision 3. Request was accepted with message: thanks, but bad patch name; I'll rename it OBS-URL: https://build.opensuse.org/request/show/32969 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=21 --- cogl_texture_deprecated.patch | 44 +++++++++++++++++++++++++++++++++++ mutter-2.28.0.tar.bz2 | 3 --- mutter-2.29.0.tar.bz2 | 3 +++ mutter-fix-build.patch | 36 ---------------------------- mutter-gl-no-cgl.patch | 41 -------------------------------- mutter.changes | 22 ++++++++++++++++++ mutter.spec | 14 +++++------ 7 files changed, 75 insertions(+), 88 deletions(-) create mode 100644 cogl_texture_deprecated.patch delete mode 100644 mutter-2.28.0.tar.bz2 create mode 100644 mutter-2.29.0.tar.bz2 delete mode 100644 mutter-fix-build.patch delete mode 100644 mutter-gl-no-cgl.patch diff --git a/cogl_texture_deprecated.patch b/cogl_texture_deprecated.patch new file mode 100644 index 0000000..f0cb05d --- /dev/null +++ b/cogl_texture_deprecated.patch @@ -0,0 +1,44 @@ +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 +@@ -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]); diff --git a/mutter-2.28.0.tar.bz2 b/mutter-2.28.0.tar.bz2 deleted file mode 100644 index 657923b..0000000 --- a/mutter-2.28.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1917172fa4fa622dcc2aa1d82a6c4796c2981566a5c9dc1df7da2a38cd8da80 -size 1986736 diff --git a/mutter-2.29.0.tar.bz2 b/mutter-2.29.0.tar.bz2 new file mode 100644 index 0000000..91c0bef --- /dev/null +++ b/mutter-2.29.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e4c1c46542f1251e9ec495729a3b753e5753ecd18fe35df586e474f6bf5ab90 +size 2001498 diff --git a/mutter-fix-build.patch b/mutter-fix-build.patch deleted file mode 100644 index 62a1a05..0000000 --- a/mutter-fix-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e14132b8269e4b2ff1194e2d3412198e7d8168f1 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Wed, 3 Feb 2010 14:17:10 -0500 -Subject: [PATCH] [introspection] Include xlib.gir - -We need this for KeySym at least. - -https://bugzilla.gnome.org/show_bug.cgi?id=607125 ---- - src/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -Index: mutter-2.28.0/src/Makefile.am -=================================================================== ---- mutter-2.28.0.orig/src/Makefile.am -+++ mutter-2.28.0/src/Makefile.am -@@ -212,6 +212,7 @@ Meta-$(api_version).gir: $(G_IR_SCANNER) - --include=Clutter-1.0 \ - --pkg=clutter-1.0 \ - --pkg=gtk+-2.0 \ -+ --include=xlib-2.0 \ - --include=xfixes-4.0 \ - --program=$$pwd/mutter \ - $(filter %.c,$(mutter_SOURCES)) \ -Index: mutter-2.28.0/src/Makefile.in -=================================================================== ---- mutter-2.28.0.orig/src/Makefile.in -+++ mutter-2.28.0/src/Makefile.in -@@ -2242,6 +2242,7 @@ uninstall-am: uninstall-binPROGRAMS unin - @WITH_INTROSPECTION_TRUE@ --include=Clutter-1.0 \ - @WITH_INTROSPECTION_TRUE@ --pkg=clutter-1.0 \ - @WITH_INTROSPECTION_TRUE@ --pkg=gtk+-2.0 \ -+@WITH_INTROSPECTION_TRUE@ --include=xlib-2.0 \ - @WITH_INTROSPECTION_TRUE@ --include=xfixes-4.0 \ - @WITH_INTROSPECTION_TRUE@ --program=$$pwd/mutter \ - @WITH_INTROSPECTION_TRUE@ $(filter %.c,$(mutter_SOURCES)) \ diff --git a/mutter-gl-no-cgl.patch b/mutter-gl-no-cgl.patch deleted file mode 100644 index 3a00c35..0000000 --- a/mutter-gl-no-cgl.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: mutter-2.28.0/src/compositor/mutter-shaped-texture.c -=================================================================== ---- mutter-2.28.0.orig/src/compositor/mutter-shaped-texture.c -+++ mutter-2.28.0/src/compositor/mutter-shaped-texture.c -@@ -151,7 +151,7 @@ mutter_shaped_texture_dirty_mask (Mutter - cogl_texture_get_gl_texture (priv->mask_texture, - &mask_gl_tex, &mask_gl_target); - -- if (mask_gl_target == CGL_TEXTURE_RECTANGLE_ARB) -+ if (mask_gl_target == GL_TEXTURE_RECTANGLE_ARB) - glDeleteTextures (1, &mask_gl_tex); - - cogl_texture_unref (priv->mask_texture); -@@ -214,23 +214,23 @@ mutter_shaped_texture_ensure_mask (Mutte - - cogl_texture_get_gl_texture (paint_tex, NULL, &paint_gl_target); - -- if (paint_gl_target == CGL_TEXTURE_RECTANGLE_ARB) -+ if (paint_gl_target == GL_TEXTURE_RECTANGLE_ARB) - { - GLuint tex; - - glGenTextures (1, &tex); -- glBindTexture (CGL_TEXTURE_RECTANGLE_ARB, tex); -+ glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex); - glPixelStorei (GL_UNPACK_ROW_LENGTH, tex_width); - glPixelStorei (GL_UNPACK_ALIGNMENT, 1); - glPixelStorei (GL_UNPACK_SKIP_ROWS, 0); - glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0); -- glTexImage2D (CGL_TEXTURE_RECTANGLE_ARB, 0, -+ glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, - GL_ALPHA, tex_width, tex_height, - 0, GL_ALPHA, GL_UNSIGNED_BYTE, mask_data); - - priv->mask_texture - = cogl_texture_new_from_foreign (tex, -- CGL_TEXTURE_RECTANGLE_ARB, -+ GL_TEXTURE_RECTANGLE_ARB, - tex_width, tex_height, - 0, 0, - COGL_PIXEL_FORMAT_A_8); diff --git a/mutter.changes b/mutter.changes index 34fc6cb..e780731 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Fri Feb 19 11:17:36 CET 2010 - dimstar@opensuse.org + +- 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 cogl_texture_deprecated.patch to fix build against clutter + 1.1.12. Reported upstream as bgo#610454. + ------------------------------------------------------------------- Wed Feb 3 20:31:43 CET 2010 - vuntz@opensuse.org diff --git a/mutter.spec b/mutter.spec index afdcc4c..da0c8bb 100644 --- a/mutter.spec +++ b/mutter.spec @@ -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,18 @@ BuildRequires: gnome-doc-utils-devel 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@opensuse.org -- Fix build with latest introspection data -Patch0: mutter-fix-build.patch -# PATCH-FIX-UPSTREAM mutter-gl-no-cgl.patch vuntz@opensuse.org -- Fix build with latest clutter, taken from upstream -Patch1: mutter-gl-no-cgl.patch +# PATCH-FIX-UPSTREAM cogl_texture_deprecated.patch bgo#610454 dimstar@opensuse.org -- cogl_texture_[un]ref has been deprecated in favor of cogl_handle_[un]ref. +Patch0: cogl_texture_deprecated.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: zenity @@ -68,7 +67,6 @@ to develop applications that require these. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %configure \ From 7433162fa7a97fdc97cc0c1379a812961b88e1cf199c599cb2161757087041b3 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 21 Feb 2010 16:01:56 +0000 Subject: [PATCH 2/3] rename patch OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=22 --- ...e_deprecated.patch => mutter-cogl_texture-deprecated.patch | 0 mutter.changes | 4 ++-- mutter.spec | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename cogl_texture_deprecated.patch => mutter-cogl_texture-deprecated.patch (100%) diff --git a/cogl_texture_deprecated.patch b/mutter-cogl_texture-deprecated.patch similarity index 100% rename from cogl_texture_deprecated.patch rename to mutter-cogl_texture-deprecated.patch diff --git a/mutter.changes b/mutter.changes index e780731..2428fe3 100644 --- a/mutter.changes +++ b/mutter.changes @@ -17,8 +17,8 @@ Fri Feb 19 11:17:36 CET 2010 - dimstar@opensuse.org + Merge Metacity changes since 2.26. Includes themable sound support via libcanberra - BuildRequire libcanberra-devel for new themable sounds. -- Add cogl_texture_deprecated.patch to fix build against clutter - 1.1.12. Reported upstream as bgo#610454. +- Add mutter-cogl_texture-deprecated.patch to fix build against + clutter 1.1.12. Reported upstream as bgo#610454. ------------------------------------------------------------------- Wed Feb 3 20:31:43 CET 2010 - vuntz@opensuse.org diff --git a/mutter.spec b/mutter.spec index da0c8bb..e8efbdf 100644 --- a/mutter.spec +++ b/mutter.spec @@ -37,8 +37,8 @@ Version: 2.29.0 Release: 1 Summary: Window and compositing manager based on Clutter Source: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM cogl_texture_deprecated.patch bgo#610454 dimstar@opensuse.org -- cogl_texture_[un]ref has been deprecated in favor of cogl_handle_[un]ref. -Patch0: cogl_texture_deprecated.patch +# 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 Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: zenity From 394a1c850ef206d4fb6ff20df5510c9b2fbfb79015961a08a56b8d4f6597f3ca Mon Sep 17 00:00:00 2001 From: Magnus Boman Date: Sun, 28 Feb 2010 08:17:25 +0000 Subject: [PATCH 3/3] Accepting request 33540 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/mutter via accept of submit request 33540 revision 4. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/33540 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=23 --- mutter-cogl_texture-deprecated.patch | 44 ++++++++++++++++++++++++++++ mutter-gcc45.patch | 39 ++++++++++++++++++++++++ mutter.changes | 7 +++++ mutter.spec | 3 ++ 4 files changed, 93 insertions(+) create mode 100644 mutter-gcc45.patch 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 \