muffin: Build fix.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>

muffin/0001-fix-warnings-when-compiling.patch

@@ -0,0 +1,26 @@
+From 9f380ffd93616832919ab45d9d5c24cb393d7df7 Mon Sep 17 00:00:00 2001
+From: Leigh Scott <leigh123linux@googlemail.com>
+Date: Fri, 27 Sep 2019 10:41:56 +0100
+Subject: [PATCH] fix warnings when compiling
+
+This reverts commit 312ab2bf6791fbad0a1b3139fc398d741ac4ed61.
+---
+ src/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index cbb5b3a..d2aa04f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -281,7 +281,7 @@ Meta-$(api_version).gir: libmuffin.la
+ 	muffin-enum-types.h			\
+ 	$(libmuffininclude_base_headers)	\
+ 	$(filter %.c,$(libmuffin_la_SOURCES))
+-@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all --warn-error
++@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all
+ 
+ endif
+ 
+-- 
+2.21.0
+

muffin/muffin.SlackBuild

@@ -71,7 +71,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+<<<<<<< HEAD
 sed -i "s|--warn-error||g" src/Makefile.am
+=======
+patch -p1 < $CWD/0001-fix-warnings-when-compiling.patch
+>>>>>>> muffin: Build fix.
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \