Tue Apr 15 03:22:01 UTC 2014

2 files changed, 103 insertions, 7 deletions

diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD
index 9c411b3a0..ba0af8d4b 100644
--- a/community/muffin/PKGBUILD
+++ b/community/muffin/PKGBUILD
@@ -1,28 +1,38 @@
-# $Id: PKGBUILD 107039 2014-03-11 15:48:31Z andyrtr $
+# $Id: PKGBUILD 109427 2014-04-14 20:15:33Z jgc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Adam Hani Schakaki <adam@schakaki.net>
 # Contributor: Ner0
 
 pkgname=muffin
-pkgver=2.0.5
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="Cinnamon window manager based on Mutter"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/muffin"
 license=('GPL')
 depends=('clutter' 'gobject-introspection' 'cinnamon-desktop' 'libcanberra'
          'startup-notification' 'zenity' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
+makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') 
 options=('!emptydirs')
 install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz")
-sha256sums=('81a57d452ea88ea926b284248033f021960400b3b9d13f5a334a77cf3bd4c7ee')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
+        cogl_ABI.patch)
+sha256sums=('85332899ff4f441624b145af6ee9689dbab1d4b824517a35d01cc563bede9737'
+            'bce6cf03f7d635345db8a664084b98122aa23802867c7e6e4573273ffccc01e5')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  # Port to cogl 1.18
+  patch -Np1 -i ../cogl_ABI.patch
+}
 
 build() {
   cd ${pkgname}-${pkgver}
 
   PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
-  				 			 --localstatedir=/var --disable-static --disable-schemas-compile
+  				 			 --localstatedir=/var --disable-static --disable-schemas-compile \
+                 --enable-compile-warnings=minimum
   make
 }
 
diff --git a/community/muffin/cogl_ABI.patch b/community/muffin/cogl_ABI.patch
new file mode 100644
index 000000000..408b1d9dd
--- /dev/null
+++ b/community/muffin/cogl_ABI.patch
@@ -0,0 +1,86 @@
+From d2a1db8834bf0a9007bf6924b006a6f2c94ce88d Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre@mecheye.net>
+Date: Mon, 13 Jan 2014 18:03:19 +0000
+Subject: Update for Cogl API breaks
+
+---
+(limited to 'src/compositor')
+
+diff --git a/src/compositor/meta-texture-rectangle.c b/src/compositor/meta-texture-rectangle.c
+index 3fc9430..450155d 100644
+--- a/src/compositor/meta-texture-rectangle.c
++++ b/src/compositor/meta-texture-rectangle.c
+@@ -35,10 +35,8 @@ CoglTexture *
+ meta_texture_rectangle_new (unsigned int width,
+                             unsigned int height,
+                             CoglPixelFormat format,
+-                            CoglPixelFormat internal_format,
+                             unsigned int rowstride,
+-                            const guint8 *data,
+-                            GError **error)
++                            const guint8 *data)
+ {
+   ClutterBackend *backend =
+     clutter_get_default_backend ();
+@@ -46,10 +44,7 @@ meta_texture_rectangle_new (unsigned int width,
+     clutter_backend_get_cogl_context (backend);
+   CoglTextureRectangle *tex_rect;
+ 
+-  tex_rect = cogl_texture_rectangle_new_with_size (context,
+-                                                   width, height,
+-                                                   internal_format,
+-                                                   error);
++  tex_rect = cogl_texture_rectangle_new_with_size (context, width, height);
+   if (tex_rect == NULL)
+     return NULL;
+ 
+diff --git a/src/compositor/meta-texture-rectangle.h b/src/compositor/meta-texture-rectangle.h
+index 30f60d3..7b84229 100644
+--- a/src/compositor/meta-texture-rectangle.h
++++ b/src/compositor/meta-texture-rectangle.h
+@@ -34,10 +34,8 @@ CoglTexture *
+ meta_texture_rectangle_new (unsigned int width,
+                             unsigned int height,
+                             CoglPixelFormat format,
+-                            CoglPixelFormat internal_format,
+                             unsigned int rowstride,
+-                            const guint8 *data,
+-                            GError **error);
++                            const guint8 *data);
+ 
+ gboolean
+ meta_texture_rectangle_check (CoglTexture *texture);
+diff --git a/src/compositor/meta-texture-tower.c b/src/compositor/meta-texture-tower.c
+index 9a30de0..019aaf4 100644
+--- a/src/compositor/meta-texture-tower.c
++++ b/src/compositor/meta-texture-tower.c
+@@ -365,13 +365,9 @@ texture_tower_create_texture (MetaTextureTower *tower,
+         meta_texture_rectangle_new (width, height,
+                                     /* data format */
+                                     TEXTURE_FORMAT,
+-                                    /* internal cogl format */
+-                                    TEXTURE_FORMAT,
+                                     /* rowstride */
+                                     width * 4,
+                                     /* data */
+-                                    NULL,
+-                                    /* error */
+                                     NULL);
+     }
+   else
+--- a/src/compositor/meta-shaped-texture.c
++++ b/src/compositor/meta-shaped-texture.c
+@@ -295,10 +295,7 @@ meta_shaped_texture_ensure_mask (MetaSha
+       if (meta_texture_rectangle_check (paint_tex))
+         priv->mask_texture = meta_texture_rectangle_new (tex_width, tex_height,
+                                                          COGL_PIXEL_FORMAT_A_8,
+-                                                         COGL_PIXEL_FORMAT_A_8,
+-                                                         stride,
+-                                                         mask_data,
+-                                                         NULL /* error */);
++                                                         stride, mask_data);
+       else
+         priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
+                                                          COGL_TEXTURE_NONE,
+--
+cgit v0.9.2