5 files changed, 310 insertions, 55 deletions

diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
index 083a43ec1e4d..afe628a36286 100644
--- a/x11-wm/muffin/Makefile
+++ b/x11-wm/muffin/Makefile
@@ -2,48 +2,73 @@
 # $FreeBSD$
 
 PORTNAME=	muffin
-PORTVERSION=	2.4.4
-PORTREVISION=	2
+PORTVERSION=	4.8.0
 CATEGORIES=	x11-wm gnome
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Compositing window manager forked from Mutter for use with Cinnamon
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	zenity>=3.0.0:x11/zenity \
 		gnome-autogen.sh:devel/gnome-common \
-		gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
-		libclutter-glx-1.0.so:graphics/clutter \
+		gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas \
+		gtkdocize:textproc/gtk-doc \
+		xkeyboard-config>0:x11/xkeyboard-config
+LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
-		libcinnamon-desktop.so:x11/cinnamon-desktop
-RUN_DEPENDS=	zenity>=3.0.0:x11/zenity
+		libcinnamon-desktop.so:x11/cinnamon-desktop \
+		libdrm.so:graphics/libdrm \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libjson-glib-1.0.so:devel/json-glib \
+		libstartup-notification-1.so:x11/startup-notification \
+		libwacom.so:x11/libwacom \
+		libxkbcommon.so:x11/libxkbcommon \
+		libharfbuzz.so:print/harfbuzz
+RUN_DEPENDS=	zenity>=3.0.0:x11/zenity \
+		xkeyboard-config>0:x11/xkeyboard-config
+
+USES=		autoreconf:build gettext-tools gl gmake gnome libtool pathfix pkgconfig \
+		xorg
 
-USES=		autoreconf:build gettext gmake gnome libtool pathfix pkgconfig \
-		python:2.7 xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-USE_GNOME=	gconf2 gnomeprefix gtk30 \
-		intlhack introspection:build
-USE_XORG=	x11 xext xrandr xcomposite xcursor xinerama ice sm
+
+USE_GNOME=	cairo dconf gdkpixbuf2 gnomeprefix glib20 gtk30 intltool \
+		introspection
+
+USE_XORG=	ice sm x11 xcb xcomposite xcursor xdamage xext xfixes xi xinerama \
+		xkbfile xrandr xrender xtst
+
+USE_GL=		egl gl
+
 USE_LDCONFIG=	yes
-USE_CSTD=	gnu89
+
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include -Wno-error=unused-function
-CFLAGS+=	-I${LOCALBASE}/include -Wno-error=unused-function
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LIBS="-lexecinfo"
-CONFIGURE_ARGS=	--enable-compile-warnings=maximum
-MAKE_ARGS=	V=1
-GLIB_SCHEMAS=	org.cinnamon.muffin.gschema.xml
+CONFIGURE_ARGS=	--enable-maintainer-flags=no
+CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 INSTALL_TARGET=	install-strip
 
-pre-configure:
-		@cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} autogen.sh
+GLIB_SCHEMAS=	org.cinnamon.muffin.gschema.xml
+
+OPTIONS_DEFINE=		WAYLAND
+OPTIONS_DEFAULT=	WAYLAND
+OPTIONS_SUB=		yes
+
+WAYLAND_BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
+WAYLAND_LIB_DEPENDS=	libinput.so:x11/libinput \
+			libudev.so:devel/libudev-devd \
+			libwayland-server.so:graphics/wayland
+WAYLAND_CONFIGURE_ENABLE=	wayland-egl-server
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|REQUIRED_AUTOMAKE_VERSION=1.10|REQUIRED_AUTOMAKE_VERSION=1.14|g' \
-		${WRKSRC}/autogen.sh
-	@${REINPLACE_CMD} -e 's|--warn-error||g' ${WRKSRC}/src/Makefile.am
+	@${REINPLACE_CMD} 's/--warn-error//' ${WRKSRC}/src/Makefile.am
+
+pre-configure:
+	@cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} autogen.sh
 
 .include <bsd.port.mk>
diff --git a/x11-wm/muffin/distinfo b/x11-wm/muffin/distinfo
index 53235ebb5ece..c55ccdb8e541 100644
--- a/x11-wm/muffin/distinfo
+++ b/x11-wm/muffin/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/linuxmint-muffin-2.4.4_GH0.tar.gz) = 027641f3bc12a5770f063ffbf9ff0a4797768d256449941ae0be779700b90805
-SIZE (gnome3/linuxmint-muffin-2.4.4_GH0.tar.gz) = 2706446
+TIMESTAMP = 1606817463
+SHA256 (gnome/linuxmint-muffin-4.8.0_GH0.tar.gz) = a4f1cb9ed80b7ea1e51d30b97ea3ae2f196b06fc9fd56c0283e64c9ee1322c18
+SIZE (gnome/linuxmint-muffin-4.8.0_GH0.tar.gz) = 5196236
diff --git a/x11-wm/muffin/files/patch-configure.ac b/x11-wm/muffin/files/patch-configure.ac
deleted file mode 100644
index 034a2609221a..000000000000
--- a/x11-wm/muffin/files/patch-configure.ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.ac.orig	2015-02-02 16:02:44 UTC
-+++ configure.ac
-@@ -412,9 +412,6 @@ fi
- # For fix-meta-rectangle.py
- AM_PATH_PYTHON([2.5])
- 
--# Use gnome-doc-utils:
--GNOME_DOC_INIT([0.8.0])
--
- #### Warnings (last since -Werror can disturb other tests)
- 
- # Stay command-line compatible with the gnome-common configure option. Here
diff --git a/x11-wm/muffin/files/patch-src_core_main.c b/x11-wm/muffin/files/patch-src_core_main.c
deleted file mode 100644
index c2ee5f5e8625..000000000000
--- a/x11-wm/muffin/files/patch-src_core_main.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/core/main.c.orig	2015-02-02 16:02:44 UTC
-+++ src/core/main.c
-@@ -61,7 +61,11 @@
- 
- #include <stdlib.h>
- #include <sys/types.h>
-+#ifdef __linux__
- #include <wait.h>
-+#else
-+#include <sys/wait.h>
-+#endif
- #include <stdio.h>
- #include <string.h>
- #include <signal.h>
diff --git a/x11-wm/muffin/pkg-plist b/x11-wm/muffin/pkg-plist
index 52afe198937f..3c2bfc94c17a 100644
--- a/x11-wm/muffin/pkg-plist
+++ b/x11-wm/muffin/pkg-plist
@@ -2,6 +2,237 @@ bin/muffin
 bin/muffin-message
 bin/muffin-theme-viewer
 bin/muffin-window-demo
+include/muffin/clutter-0/cally/cally-actor.h
+include/muffin/clutter-0/cally/cally-clone.h
+include/muffin/clutter-0/cally/cally-factory.h
+include/muffin/clutter-0/cally/cally-group.h
+include/muffin/clutter-0/cally/cally-main.h
+include/muffin/clutter-0/cally/cally-rectangle.h
+include/muffin/clutter-0/cally/cally-root.h
+include/muffin/clutter-0/cally/cally-stage.h
+include/muffin/clutter-0/cally/cally-text.h
+include/muffin/clutter-0/cally/cally-texture.h
+include/muffin/clutter-0/cally/cally-util.h
+include/muffin/clutter-0/cally/cally.h
+include/muffin/clutter-0/clutter/clutter-action.h
+include/muffin/clutter-0/clutter/clutter-actor-meta.h
+include/muffin/clutter-0/clutter/clutter-actor.h
+include/muffin/clutter-0/clutter/clutter-align-constraint.h
+include/muffin/clutter-0/clutter/clutter-animatable.h
+include/muffin/clutter-0/clutter/clutter-autocleanups.h
+include/muffin/clutter-0/clutter/clutter-backend.h
+include/muffin/clutter-0/clutter/clutter-bin-layout.h
+include/muffin/clutter-0/clutter/clutter-bind-constraint.h
+include/muffin/clutter-0/clutter/clutter-binding-pool.h
+include/muffin/clutter-0/clutter/clutter-blur-effect.h
+include/muffin/clutter-0/clutter/clutter-box-layout.h
+include/muffin/clutter-0/clutter/clutter-brightness-contrast-effect.h
+include/muffin/clutter-0/clutter/clutter-cairo.h
+include/muffin/clutter-0/clutter/clutter-canvas.h
+include/muffin/clutter-0/clutter/clutter-child-meta.h
+include/muffin/clutter-0/clutter/clutter-click-action.h
+include/muffin/clutter-0/clutter/clutter-clone.h
+include/muffin/clutter-0/clutter/clutter-color-static.h
+include/muffin/clutter-0/clutter/clutter-color.h
+include/muffin/clutter-0/clutter/clutter-colorize-effect.h
+include/muffin/clutter-0/clutter/clutter-config.h
+include/muffin/clutter-0/clutter/clutter-constraint.h
+include/muffin/clutter-0/clutter/clutter-container.h
+include/muffin/clutter-0/clutter/clutter-content.h
+include/muffin/clutter-0/clutter/clutter-deform-effect.h
+include/muffin/clutter-0/clutter/clutter-deprecated.h
+include/muffin/clutter-0/clutter/clutter-desaturate-effect.h
+include/muffin/clutter-0/clutter/clutter-device-manager.h
+include/muffin/clutter-0/clutter/clutter-drag-action.h
+include/muffin/clutter-0/clutter/clutter-drop-action.h
+include/muffin/clutter-0/clutter/clutter-effect.h
+include/muffin/clutter-0/clutter/clutter-enum-types.h
+include/muffin/clutter-0/clutter/clutter-enums.h
+include/muffin/clutter-0/clutter/clutter-event.h
+include/muffin/clutter-0/clutter/clutter-feature.h
+include/muffin/clutter-0/clutter/clutter-fixed-layout.h
+include/muffin/clutter-0/clutter/clutter-flow-layout.h
+include/muffin/clutter-0/clutter/clutter-gesture-action.h
+include/muffin/clutter-0/clutter/clutter-grid-layout.h
+include/muffin/clutter-0/clutter/clutter-group.h
+include/muffin/clutter-0/clutter/clutter-image.h
+include/muffin/clutter-0/clutter/clutter-input-device-tool.h
+include/muffin/clutter-0/clutter/clutter-input-device.h
+include/muffin/clutter-0/clutter/clutter-input-focus.h
+include/muffin/clutter-0/clutter/clutter-input-method.h
+include/muffin/clutter-0/clutter/clutter-interval.h
+include/muffin/clutter-0/clutter/clutter-keyframe-transition.h
+include/muffin/clutter-0/clutter/clutter-keysyms.h
+include/muffin/clutter-0/clutter/clutter-layout-manager.h
+include/muffin/clutter-0/clutter/clutter-layout-meta.h
+include/muffin/clutter-0/clutter/clutter-macros.h
+include/muffin/clutter-0/clutter/clutter-main.h
+include/muffin/clutter-0/clutter/clutter-marshal.h
+include/muffin/clutter-0/clutter/clutter-muffin.h
+include/muffin/clutter-0/clutter/clutter-offscreen-effect.h
+include/muffin/clutter-0/clutter/clutter-page-turn-effect.h
+include/muffin/clutter-0/clutter/clutter-paint-node.h
+include/muffin/clutter-0/clutter/clutter-paint-nodes.h
+include/muffin/clutter-0/clutter/clutter-pan-action.h
+include/muffin/clutter-0/clutter/clutter-path-constraint.h
+include/muffin/clutter-0/clutter/clutter-path.h
+include/muffin/clutter-0/clutter/clutter-property-transition.h
+include/muffin/clutter-0/clutter/clutter-rotate-action.h
+include/muffin/clutter-0/clutter/clutter-script.h
+include/muffin/clutter-0/clutter/clutter-scriptable.h
+include/muffin/clutter-0/clutter/clutter-scroll-actor.h
+include/muffin/clutter-0/clutter/clutter-settings.h
+include/muffin/clutter-0/clutter/clutter-shader-effect.h
+include/muffin/clutter-0/clutter/clutter-shader-types.h
+include/muffin/clutter-0/clutter/clutter-snap-constraint.h
+include/muffin/clutter-0/clutter/clutter-stage-manager.h
+include/muffin/clutter-0/clutter/clutter-stage.h
+include/muffin/clutter-0/clutter/clutter-swipe-action.h
+include/muffin/clutter-0/clutter/clutter-tap-action.h
+include/muffin/clutter-0/clutter/clutter-test-utils.h
+include/muffin/clutter-0/clutter/clutter-text-buffer.h
+include/muffin/clutter-0/clutter/clutter-text.h
+include/muffin/clutter-0/clutter/clutter-texture.h
+include/muffin/clutter-0/clutter/clutter-timeline.h
+include/muffin/clutter-0/clutter/clutter-transition-group.h
+include/muffin/clutter-0/clutter/clutter-transition.h
+include/muffin/clutter-0/clutter/clutter-types.h
+include/muffin/clutter-0/clutter/clutter-units.h
+include/muffin/clutter-0/clutter/clutter-version.h
+include/muffin/clutter-0/clutter/clutter-virtual-input-device.h
+include/muffin/clutter-0/clutter/clutter-zoom-action.h
+include/muffin/clutter-0/clutter/clutter.h
+include/muffin/clutter-0/clutter/deprecated/clutter-actor.h
+include/muffin/clutter-0/clutter/deprecated/clutter-alpha.h
+include/muffin/clutter-0/clutter/deprecated/clutter-animatable.h
+include/muffin/clutter-0/clutter/deprecated/clutter-animation.h
+include/muffin/clutter-0/clutter/deprecated/clutter-animator.h
+include/muffin/clutter-0/clutter/deprecated/clutter-backend.h
+include/muffin/clutter-0/clutter/deprecated/clutter-behaviour-depth.h
+include/muffin/clutter-0/clutter/deprecated/clutter-behaviour-ellipse.h
+include/muffin/clutter-0/clutter/deprecated/clutter-behaviour-opacity.h
+include/muffin/clutter-0/clutter/deprecated/clutter-behaviour-path.h
+include/muffin/clutter-0/clutter/deprecated/clutter-behaviour-rotate.h
+include/muffin/clutter-0/clutter/deprecated/clutter-behaviour-scale.h
+include/muffin/clutter-0/clutter/deprecated/clutter-behaviour.h
+include/muffin/clutter-0/clutter/deprecated/clutter-bin-layout.h
+include/muffin/clutter-0/clutter/deprecated/clutter-box.h
+include/muffin/clutter-0/clutter/deprecated/clutter-cairo-texture.h
+include/muffin/clutter-0/clutter/deprecated/clutter-container.h
+include/muffin/clutter-0/clutter/deprecated/clutter-frame-source.h
+include/muffin/clutter-0/clutter/deprecated/clutter-group.h
+include/muffin/clutter-0/clutter/deprecated/clutter-input-device.h
+include/muffin/clutter-0/clutter/deprecated/clutter-keysyms.h
+include/muffin/clutter-0/clutter/deprecated/clutter-list-model.h
+include/muffin/clutter-0/clutter/deprecated/clutter-main.h
+include/muffin/clutter-0/clutter/deprecated/clutter-media.h
+include/muffin/clutter-0/clutter/deprecated/clutter-model.h
+include/muffin/clutter-0/clutter/deprecated/clutter-rectangle.h
+include/muffin/clutter-0/clutter/deprecated/clutter-score.h
+include/muffin/clutter-0/clutter/deprecated/clutter-shader.h
+include/muffin/clutter-0/clutter/deprecated/clutter-stage-manager.h
+include/muffin/clutter-0/clutter/deprecated/clutter-stage.h
+include/muffin/clutter-0/clutter/deprecated/clutter-state.h
+include/muffin/clutter-0/clutter/deprecated/clutter-table-layout.h
+include/muffin/clutter-0/clutter/deprecated/clutter-texture.h
+include/muffin/clutter-0/clutter/deprecated/clutter-timeline.h
+include/muffin/clutter-0/clutter/deprecated/clutter-timeout-pool.h
+include/muffin/clutter-0/clutter/deprecated/clutter-util.h
+%%WAYLAND%%include/muffin/clutter-0/clutter/egl/clutter-egl-headers.h
+%%WAYLAND%%include/muffin/clutter-0/clutter/egl/clutter-egl.h
+%%WAYLAND%%include/muffin/clutter-0/clutter/evdev/clutter-evdev.h
+%%WAYLAND%%include/muffin/clutter-0/clutter/wayland/clutter-wayland-compositor.h
+%%WAYLAND%%include/muffin/clutter-0/clutter/wayland/clutter-wayland-surface.h
+include/muffin/clutter-0/clutter/x11/clutter-x11-texture-pixmap.h
+include/muffin/clutter-0/clutter/x11/clutter-x11.h
+include/muffin/cogl/cogl-pango/cogl-pango.h
+include/muffin/cogl/cogl-path/cogl-path-enum-types.h
+include/muffin/cogl/cogl-path/cogl-path-functions.h
+include/muffin/cogl/cogl-path/cogl-path-types.h
+include/muffin/cogl/cogl-path/cogl-path.h
+include/muffin/cogl/cogl/cogl-atlas-texture.h
+include/muffin/cogl/cogl/cogl-attribute-buffer.h
+include/muffin/cogl/cogl/cogl-attribute.h
+include/muffin/cogl/cogl/cogl-auto-texture.h
+include/muffin/cogl/cogl/cogl-bitmap.h
+include/muffin/cogl/cogl/cogl-buffer.h
+include/muffin/cogl/cogl/cogl-clutter.h
+include/muffin/cogl/cogl/cogl-color.h
+include/muffin/cogl/cogl/cogl-context.h
+include/muffin/cogl/cogl/cogl-defines.h
+include/muffin/cogl/cogl/cogl-deprecated.h
+include/muffin/cogl/cogl/cogl-depth-state.h
+include/muffin/cogl/cogl/cogl-display.h
+include/muffin/cogl/cogl/cogl-egl-defines.h
+include/muffin/cogl/cogl/cogl-egl.h
+include/muffin/cogl/cogl/cogl-error.h
+include/muffin/cogl/cogl/cogl-euler.h
+include/muffin/cogl/cogl/cogl-fence.h
+include/muffin/cogl/cogl/cogl-frame-info.h
+include/muffin/cogl/cogl/cogl-framebuffer.h
+include/muffin/cogl/cogl/cogl-gles2-types.h
+include/muffin/cogl/cogl/cogl-gles2.h
+include/muffin/cogl/cogl/cogl-glib-source.h
+include/muffin/cogl/cogl/cogl-glx.h
+include/muffin/cogl/cogl/cogl-gtype-private.h
+include/muffin/cogl/cogl/cogl-index-buffer.h
+include/muffin/cogl/cogl/cogl-indices.h
+include/muffin/cogl/cogl/cogl-macros.h
+include/muffin/cogl/cogl/cogl-material-compat.h
+include/muffin/cogl/cogl/cogl-matrix-stack.h
+include/muffin/cogl/cogl/cogl-matrix.h
+include/muffin/cogl/cogl/cogl-meta-texture.h
+include/muffin/cogl/cogl/cogl-muffin.h
+include/muffin/cogl/cogl/cogl-object.h
+include/muffin/cogl/cogl/cogl-offscreen.h
+include/muffin/cogl/cogl/cogl-onscreen-template.h
+include/muffin/cogl/cogl/cogl-onscreen.h
+include/muffin/cogl/cogl/cogl-output.h
+include/muffin/cogl/cogl/cogl-pango.h
+include/muffin/cogl/cogl/cogl-pipeline-layer-state.h
+include/muffin/cogl/cogl/cogl-pipeline-state.h
+include/muffin/cogl/cogl/cogl-pipeline.h
+include/muffin/cogl/cogl/cogl-pixel-buffer.h
+include/muffin/cogl/cogl/cogl-poll.h
+include/muffin/cogl/cogl/cogl-primitive-texture.h
+include/muffin/cogl/cogl/cogl-primitive.h
+include/muffin/cogl/cogl/cogl-primitives.h
+include/muffin/cogl/cogl/cogl-quaternion.h
+include/muffin/cogl/cogl/cogl-renderer.h
+include/muffin/cogl/cogl/cogl-shader.h
+include/muffin/cogl/cogl/cogl-snippet.h
+include/muffin/cogl/cogl/cogl-sub-texture.h
+include/muffin/cogl/cogl/cogl-swap-chain.h
+include/muffin/cogl/cogl/cogl-texture-2d-gl.h
+include/muffin/cogl/cogl/cogl-texture-2d-sliced.h
+include/muffin/cogl/cogl/cogl-texture-2d.h
+include/muffin/cogl/cogl/cogl-texture-3d.h
+include/muffin/cogl/cogl/cogl-texture-pixmap-x11.h
+include/muffin/cogl/cogl/cogl-texture-rectangle.h
+include/muffin/cogl/cogl/cogl-texture.h
+include/muffin/cogl/cogl/cogl-type-casts.h
+include/muffin/cogl/cogl/cogl-types.h
+include/muffin/cogl/cogl/cogl-vector.h
+include/muffin/cogl/cogl/cogl-version.h
+include/muffin/cogl/cogl/cogl-vertex-buffer.h
+%%WAYLAND%%include/muffin/cogl/cogl/cogl-wayland-server.h
+include/muffin/cogl/cogl/cogl-xlib-renderer.h
+include/muffin/cogl/cogl/cogl-xlib.h
+include/muffin/cogl/cogl/cogl.h
+include/muffin/cogl/cogl/cogl1-context.h
+include/muffin/cogl/cogl/deprecated/cogl-auto-texture.h
+include/muffin/cogl/cogl/deprecated/cogl-clutter-xlib.h
+include/muffin/cogl/cogl/deprecated/cogl-clutter.h
+include/muffin/cogl/cogl/deprecated/cogl-framebuffer-deprecated.h
+include/muffin/cogl/cogl/deprecated/cogl-material-compat.h
+include/muffin/cogl/cogl/deprecated/cogl-shader.h
+include/muffin/cogl/cogl/deprecated/cogl-type-casts.h
+include/muffin/cogl/cogl/deprecated/cogl-vertex-buffer.h
+include/muffin/cogl/cogl/gl-prototypes/cogl-core-functions.h
+include/muffin/cogl/cogl/gl-prototypes/cogl-gles2-functions.h
+include/muffin/cogl/cogl/gl-prototypes/cogl-glsl-functions.h
+include/muffin/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h
+include/muffin/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
 include/muffin/meta/atomnames.h
 include/muffin/meta/boxes.h
 include/muffin/meta/common.h
@@ -26,15 +257,38 @@ include/muffin/meta/types.h
 include/muffin/meta/util.h
 include/muffin/meta/window.h
 include/muffin/meta/workspace.h
-lib/libmuffin.a
 lib/libmuffin.so
 lib/libmuffin.so.0
 lib/libmuffin.so.0.0.0
+lib/libmuffin-clutter-0.so
+lib/libmuffin-cogl-0.so
+lib/libmuffin-cogl-pango-0.so
+lib/libmuffin-cogl-path-0.so
+lib/muffin/Cally-0.gir
+lib/muffin/Cally-0.typelib
+lib/muffin/Clutter-0.gir
+lib/muffin/Clutter-0.typelib
+lib/muffin/ClutterX11-0.gir
+lib/muffin/ClutterX11-0.typelib
+lib/muffin/Cogl-0.gir
+lib/muffin/Cogl-0.typelib
+lib/muffin/CoglPango-0.gir
+lib/muffin/CoglPango-0.typelib
 lib/muffin/Meta-Muffin.0.gir
 lib/muffin/Meta-Muffin.0.typelib
+lib/muffin/libmuffin-clutter-0.so
+lib/muffin/libmuffin-cogl-0.so
+lib/muffin/libmuffin-cogl-pango-0.so
+lib/muffin/libmuffin-cogl-path-0.so
 lib/muffin/plugins/default.so
+libdata/pkgconfig/muffin-clutter-0.pc
+libdata/pkgconfig/muffin-clutter-x11-0.pc
+libdata/pkgconfig/muffin-cogl-0.pc
+libdata/pkgconfig/muffin-cogl-pango-0.pc
+libdata/pkgconfig/muffin-cogl-path-0.pc
 libdata/pkgconfig/libmuffin.pc
 libdata/pkgconfig/muffin-plugins.pc
+libexec/muffin-restart-helper
 man/man1/muffin-message.1.gz
 man/man1/muffin-theme-viewer.1.gz
 man/man1/muffin-window-demo.1.gz
@@ -133,3 +387,4 @@ share/locale/zh_CN/LC_MESSAGES/muffin.mo
 share/locale/zh_HK/LC_MESSAGES/muffin.mo
 share/locale/zh_TW/LC_MESSAGES/muffin.mo
 %%DATADIR%%/icons/muffin-window-demo.png
+%%DATADIR%%/theme/metacity-theme-3.xml