From b8234228fbdfce80e79649ef54d319cfa59ec254 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 28 Mar 2013 08:50:40 +0100
Subject: [PATCH] muffin: rebuild against cogl-1.14.

---
 srcpkgs/muffin/libmuffin-devel.template |  6 +----
 srcpkgs/muffin/libmuffin.template       |  5 +---
 srcpkgs/muffin/template                 | 31 ++++++++++++++++---------
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/muffin/libmuffin-devel.template b/srcpkgs/muffin/libmuffin-devel.template
index 2e35c6a9381..dd817bc3c6d 100644
--- a/srcpkgs/muffin/libmuffin-devel.template
+++ b/srcpkgs/muffin/libmuffin-devel.template
@@ -1,11 +1,7 @@
 # Template file for 'libmuffin-devel'.
 #
-noarch=yes
 depends="libmuffin-${version}_${revision}"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
+short_desc="${short_desc} - development files"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/muffin/libmuffin.template b/srcpkgs/muffin/libmuffin.template
index 00c4743a785..a8e570a457e 100644
--- a/srcpkgs/muffin/libmuffin.template
+++ b/srcpkgs/muffin/libmuffin.template
@@ -1,9 +1,6 @@
 # Template file for 'libmuffin'.
 #
-short_desc="${short_desc} (library)"
-long_desc="${long_desc}
-
- This package contains the shared library."
+short_desc="${short_desc} -- runtime library"
 
 do_install() {
 	vmove "usr/lib/*.so*" usr/lib
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 686f7057729..e9aaf9072fe 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,22 +1,18 @@
 # Template file for 'muffin'
 pkgname=muffin
 version=1.1.2
-revision=1
+revision=2
 subpackages="libmuffin libmuffin-devel"
-build_style=gnu-configure
-configure_args="--disable-static"
-makedepends="automake gettext-devel pkg-config intltool gnome-doc-utils
- gobject-introspection cogl-devel>=1.12 clutter-devel>=1.12
- GConf-devel libcanberra-devel libXxf86vm-devel startup-notification-devel
- gsettings-desktop-schemas-devel>=3.6.0"
+hostmakedepends="automake gettext-devel pkg-config intltool
+ gnome-doc-utils gobject-introspection"
+makedepends="clutter-devel>=1.14 GConf-devel libcanberra-devel libXxf86vm-devel
+ startup-notification-devel gsettings-desktop-schemas-devel>=3.6.0"
 depends="desktop-file-utils gsettings-desktop-schemas>=3.6.0"
 fulldepends="zenity"
 short_desc="The Cinnamon window manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
-homepage="http://www.gnu.org/software/sed"
-long_desc="
- This package contains muffin, ${short_desc} based on Mutter 3.2.1."
+homepage="http://github.com/linuxmint/muffin.git"
 
 nofetch=yes
 noextract=yes
@@ -28,5 +24,18 @@ do_fetch() {
 }
 
 pre_configure() {
-	autoreconf -vfi
+	autoreconf -fi
+}
+
+do_configure() {
+	CFLAGS="$CFLAGS -Wno-error=switch" \
+		./configure ${CONFIGURE_SHARED_ARGS} --disable-static
+}
+
+do_build() {
+	make ${makejobs}
+}
+
+do_install() {
+	make DESTDIR=${DESTDIR} install
 }