muffin: Upgraded to 4.0.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
This commit is contained in:
Willy Sudiarto Raharjo 2018-11-05 21:21:19 +07:00
parent d3306d98e1
commit 6c6f8fec9d
No known key found for this signature in database
GPG key ID: 887B8374D7333381
2 changed files with 64 additions and 1 deletions

53
muffin/99d9b0.patch Normal file
View file

@ -0,0 +1,53 @@
From 99d9b01dac12845d362c5cba14757f9ff90e416d Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Sat, 3 Nov 2018 22:40:36 -0400
Subject: [PATCH] always process clutter Makefile.in
The current check includes the subdir unless it's explicitly disabled,
but only builds the Makefile if it's explicitly disabled. This means
the entire project fails to build while processing the docs folder, even
if docs are disabled and a no-op... unless clutter docs are separately
disabled.
---
configure.ac | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac
index 39e6c1af..54388825 100644
--- a/configure.ac
+++ b/configure.ac
@@ -479,6 +479,8 @@ AC_ARG_ENABLE(clutter-doc,
[ --disable-clutter-doc disable Clutter docs generation],,
clutter_doc=yes)
+AM_CONDITIONAL(CLUTTER_DOC, test "$clutter_doc" = "yes")
+
AC_CONFIG_FILES([
Makefile
data/Makefile
@@ -487,18 +489,8 @@ doc/man/Makefile
doc/reference/Makefile
doc/reference/muffin/Makefile
doc/reference/muffin/muffin-docs.sgml
-])
-
-if test "x$clutter_doc" = "xno"; then
- AC_CONFIG_FILES([
- doc/reference/clutter/Makefile
- doc/reference/clutter/clutter-docs.xml
- ])
-fi
-
-AM_CONDITIONAL(CLUTTER_DOC, test "$clutter_doc" = "yes")
-
-AC_CONFIG_FILES([
+doc/reference/clutter/Makefile
+doc/reference/clutter/clutter-docs.xml
doc/reference/cogl/Makefile
doc/reference/cogl/cogl-docs.xml
src/Makefile
@@ -546,4 +538,3 @@ muffin-$VERSION
Xsync: ${found_xsync}
Xcursor: ${have_xcursor}
"
-

View file

@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=muffin
VERSION=${VERSION:-3.8.2}
VERSION=${VERSION:-4.0.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_csb}
@ -71,6 +71,7 @@ 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 {} \;
patch -p1 < $CWD/99d9b0.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./autogen.sh \
@ -81,9 +82,18 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--enable-introspection=yes \
--enable-startup-notification=yes \
--disable-silent-rules \
--disable-schemas-compile \
--disable-static \
--enable-compile-warnings=no \
--disable-gtk-doc \
--disable-clutter-doc \
--disable-wayland-egl-platform \
--disable-wayland-egl-server \
--disable-kms-egl-platform \
--disable-wayland \
--disable-native-backend \
--build=$ARCH-slackware-linux
make