[muffin] build fix

[leigh123linux]

commit 7e473df8ab5a7c8f8b6320e59f5da13bd9c5d1c9
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Feb 7 11:30:57 2014 +0000

    build fix

 automake.patch |   20 ++++++++++++++++++++
 cogl_ABI.patch |   14 ++++++++++++++
 gtkdoc.patch   |   41 +++++++++++++++++++++++++++++++++++++++++
 muffin.spec    |    3 ++-
 4 files changed, 77 insertions(+), 1 deletions(-)
---
diff --git a/automake.patch b/automake.patch
new file mode 100644
index 0000000..157cc5a
--- /dev/null
+++ b/automake.patch
@@ -0,0 +1,20 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,5 +1,6 @@
+ # Flag build for parallelism; see https://savannah.gnu.org/patch/?6905
+ .AUTOPARALLEL:
++AUTOMAKE_OPTIONS = subdir-objects
+ 
+ lib_LTLIBRARIES = libmuffin.la
+ 
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,8 @@
+ 
+ SUBDIRS=src po doc
+ 
++ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
++
+ EXTRA_DIST = HACKING MAINTAINERS rationales.txt
+ 
+ DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
diff --git a/cogl_ABI.patch b/cogl_ABI.patch
index fc42c46..408b1d9 100644
--- a/cogl_ABI.patch
+++ b/cogl_ABI.patch
@@ -68,5 +68,19 @@ index 9a30de0..019aaf4 100644
                                      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
diff --git a/gtkdoc.patch b/gtkdoc.patch
new file mode 100644
index 0000000..6398306
--- /dev/null
+++ b/gtkdoc.patch
@@ -0,0 +1,41 @@
+--- a/src/meta/prefs.h
++++ b/src/meta/prefs.h
+@@ -310,13 +310,13 @@ typedef struct
+    */
+   GSList *bindings;
+ 
+-  /** for keybindings that can have shift or not like Alt+Tab */
++  /* for keybindings that can have shift or not like Alt+Tab */
+   gboolean      add_shift:1;
+ 
+-  /** for keybindings that apply only to a window */
++  /* for keybindings that apply only to a window */
+   gboolean      per_window:1;
+ 
+-  /** for keybindings not added with meta_display_add_keybinding() */
++  /* for keybindings not added with meta_display_add_keybinding() */
+   gboolean      builtin:1;
+ } MetaKeyPref;
+ 
+@@ -339,5 +339,3 @@ CDesktopVisualBellType meta_prefs_get_vi
+ MetaPlacementMode meta_prefs_get_placement_mode (void);
+ 
+ #endif
+-
+-
+--- a/src/core/workspace.c
++++ b/src/core/workspace.c
+@@ -194,7 +194,7 @@ meta_workspace_new (MetaScreen *screen)
+   return workspace;
+ }
+ 
+-/** Foreach function for workspace_free_struts() */
++/* Foreach function for workspace_free_struts() */
+ static void
+ free_this (gpointer candidate, gpointer dummy)
+ {
+@@ -1390,4 +1390,3 @@ meta_workspace_get_screen (MetaWorkspace
+ {
+   return workspace->screen;
+ }
+-
diff --git a/muffin.spec b/muffin.spec
index afa88b5..9ee23bf 100644
--- a/muffin.spec
+++ b/muffin.spec
@@ -17,6 +17,8 @@ Source0:       http://leigh123linux.fedorapeople.org/pub/muffin/source/muffin-%{
 %if 0%{?fedora} > 20
 Patch0:        cogl_ABI.patch
 %endif
+Patch1:        automake.patch
+Patch2:        gtkdoc.patch
 
 BuildRequires: pkgconfig(clutter-1.0) >= 1.7.5
 BuildRequires: pkgconfig(sm)
@@ -58,7 +60,6 @@ utilities for testing Metacity/Muffin themes.
 %prep
 %autosetup -p1
 
-sed -i -e 's@{ACLOCAL_FLAGS}@{ACLOCAL_FLAGS} -I m4 at g' Makefile.am
 sed -i -e 's at configure.in@configure.ac at g' autogen.sh
 echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in
 mv configure.in configure.ac