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..36bbfcb 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Feb 3 20:31:43 CET 2010 - vuntz@opensuse.org - -- Add mutter-fix-build.patch and mutter-gl-no-cgl.patch to fix the - build with recent introspection data and with recent clutter. - ------------------------------------------------------------------- Wed Dec 2 12:04:17 CET 2009 - vuntz@opensuse.org diff --git a/mutter.spec b/mutter.spec index 760e1f9..7b90419 100644 --- a/mutter.spec +++ b/mutter.spec @@ -36,10 +36,6 @@ Version: 2.28.0 Release: 2 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 Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: zenity @@ -67,8 +63,6 @@ to develop applications that require these. %lang_package %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %configure \