23245657 Deliver mutter 3.18.1 in Solaris
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Fri, 28 Oct 2016 14:58:48 -0700
changeset 7197 5001d53d2e77
parent 7196 b0e313a2264a
child 7198 337a99283a60
23245657 Deliver mutter 3.18.1 in Solaris PSARC/2016/396 GNOME 3 Window Manager Bundle
components/gnome/mutter/Makefile
components/gnome/mutter/depend.mk
components/gnome/mutter/mutter.p5m
components/gnome/mutter/patches/01-xopen-source.patch
components/gnome/mutter/patches/02-compile.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/mutter/Makefile	Fri Oct 28 14:58:48 2016 -0700
@@ -0,0 +1,108 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+BUILD_BITS =            64_and_32
+# All components using gobject-introspection must be built with gcc as
+# gobject-introspection does not produce correct results when using Studio.
+COMPILER =              gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		mutter
+COMPONENT_VERSION=	3.18.1
+COMPONENT_PROJECT_URL=  https://wiki.gnome.org/Projects/Mutter
+COMPONENT_ARCHIVE_HASH=	\
+	sha256:4fdee7c9dc2db3a48f18723f47c3122aa5bddaddb8751701ce243e577e2a69a9
+COMPONENT_BUGDB=        gnome/window-manager
+
+TPNO=			27162
+
+TEST_TARGET = $(NO_TESTS)
+
+# Needs gobject-introspection, not available on S11.
+include $(WS_MAKE_RULES)/no-evaluation.mk
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+# Requires non-standard extensions.
+CFLAGS += -std=c99 -D__EXTENSIONS__
+
+CONFIGURE_OPTIONS += --disable-schemas-compile
+CONFIGURE_OPTIONS += --disable-static
+CONFIGURE_OPTIONS += --disable-native-backend
+CONFIGURE_OPTIONS += --disable-wayland
+# Enable additional compiler warnings, but leave them as warnings, not errors
+# (upstream default if this isn't specified is =error which breaks SPARC)
+CONFIGURE_OPTIONS += --enable-compile-warnings=yes
+CONFIGURE_OPTIONS += --enable-gtk-doc
+# Required for other components.
+CONFIGURE_OPTIONS += --enable-introspection
+CONFIGURE_OPTIONS += --enable-shared
+CONFIGURE_OPTIONS += --enable-sm
+CONFIGURE_OPTIONS += --with-pic
+CONFIGURE_OPTIONS += --with-x
+
+# Needed due to patch to configure.ac.
+COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv);
+
+CONFIGURE_ENV += PATH=$(GNUBIN):$(PATH)
+
+# Delete this when build servers are installed with gnome-settings-daemon
+UNINSTALLED_DEPS = gnome-settings-daemon libgweather
+DEPENDED += $(UNINSTALLED_DEPS:%=../%/build/manifest-$(MACH)-*.depend)
+REQUIRED_PACKAGES += $(shell $(GSED) -n -e '/GSED/d' -e 's/REQUIRED_PACKAGES += //p' $(UNINSTALLED_DEPS:%=../%/Makefile))
+#end Delete
+
+REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
+REQUIRED_PACKAGES += gnome/gnome-settings-daemon
+REQUIRED_PACKAGES += gnome/gsettings-desktop-schemas
+REQUIRED_PACKAGES += library/desktop/cairo
+REQUIRED_PACKAGES += library/desktop/clutter
+REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
+REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
+REQUIRED_PACKAGES += library/desktop/gtk3
+REQUIRED_PACKAGES += library/desktop/pango
+REQUIRED_PACKAGES += library/desktop/startup-notification
+REQUIRED_PACKAGES += library/desktop/xdg/libcanberra
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/gnome/gnome-desktop
+REQUIRED_PACKAGES += library/graphics/cogl
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/library/upower
+REQUIRED_PACKAGES += x11/library/libice
+REQUIRED_PACKAGES += x11/library/libsm
+REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxcb
+REQUIRED_PACKAGES += x11/library/libxcomposite
+REQUIRED_PACKAGES += x11/library/libxcursor
+REQUIRED_PACKAGES += x11/library/libxdamage
+REQUIRED_PACKAGES += x11/library/libxext
+REQUIRED_PACKAGES += x11/library/libxfixes
+REQUIRED_PACKAGES += x11/library/libxi
+REQUIRED_PACKAGES += x11/library/libxinerama
+REQUIRED_PACKAGES += x11/library/libxkbcommon
+REQUIRED_PACKAGES += x11/library/libxkbfile
+REQUIRED_PACKAGES += x11/library/libxrandr
+REQUIRED_PACKAGES += x11/library/libxrender
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/mutter/depend.mk	Fri Oct 28 14:58:48 2016 -0700
@@ -0,0 +1,1 @@
+gnome/mutter: gnome/gnome-settings-daemon
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/mutter/mutter.p5m	Fri Oct 28 14:58:48 2016 -0700
@@ -0,0 +1,208 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> \
+    default mangler.man.stability "pass-through volatile">
+set name=pkg.fmri \
+    value=pkg:/gnome/window-manager/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="The GNOME window and compositing manager"
+set name=com.oracle.info.description value=$(COMPONENT_NAME)
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:Desktop (GNOME)/Window Managers"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/396
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/bin/mutter
+file path=usr/include/mutter/meta/barrier.h
+file path=usr/include/mutter/meta/boxes.h
+file path=usr/include/mutter/meta/common.h
+file path=usr/include/mutter/meta/compositor-mutter.h
+file path=usr/include/mutter/meta/compositor.h
+file path=usr/include/mutter/meta/display.h
+file path=usr/include/mutter/meta/errors.h
+file path=usr/include/mutter/meta/group.h
+file path=usr/include/mutter/meta/keybindings.h
+file path=usr/include/mutter/meta/main.h
+file path=usr/include/mutter/meta/meta-backend.h
+file path=usr/include/mutter/meta/meta-background-actor.h
+file path=usr/include/mutter/meta/meta-background-group.h
+file path=usr/include/mutter/meta/meta-background-image.h
+file path=usr/include/mutter/meta/meta-background.h
+file path=usr/include/mutter/meta/meta-cursor-tracker.h
+file path=usr/include/mutter/meta/meta-enum-types.h
+file path=usr/include/mutter/meta/meta-idle-monitor.h
+file path=usr/include/mutter/meta/meta-monitor-manager.h
+file path=usr/include/mutter/meta/meta-plugin.h
+file path=usr/include/mutter/meta/meta-shadow-factory.h
+file path=usr/include/mutter/meta/meta-shaped-texture.h
+file path=usr/include/mutter/meta/meta-version.h
+file path=usr/include/mutter/meta/meta-window-actor.h
+file path=usr/include/mutter/meta/meta-window-shape.h
+file path=usr/include/mutter/meta/prefs.h
+file path=usr/include/mutter/meta/screen.h
+file path=usr/include/mutter/meta/theme.h
+file path=usr/include/mutter/meta/types.h
+file path=usr/include/mutter/meta/util.h
+file path=usr/include/mutter/meta/window.h
+file path=usr/include/mutter/meta/workspace.h
+link path=usr/lib/$(MACH64)/libmutter.so target=libmutter.so.0.0.0
+link path=usr/lib/$(MACH64)/libmutter.so.0 target=libmutter.so.0.0.0
+file path=usr/lib/$(MACH64)/libmutter.so.0.0.0 \
+    pkg.depend.bypass-generate=.*libstartup-notification.*
+file path=usr/lib/$(MACH64)/mutter-restart-helper mode=0555
+file path=usr/lib/$(MACH64)/mutter/Meta-3.0.gir
+file path=usr/lib/$(MACH64)/mutter/Meta-3.0.typelib
+file path=usr/lib/$(MACH64)/mutter/plugins/default.so
+file path=usr/lib/$(MACH64)/pkgconfig/libmutter.pc
+link path=usr/lib/libmutter.so target=libmutter.so.0.0.0
+link path=usr/lib/libmutter.so.0 target=libmutter.so.0.0.0
+file path=usr/lib/libmutter.so.0.0.0 \
+    pkg.depend.bypass-generate=.*libstartup-notification.*
+file path=usr/lib/mutter-restart-helper mode=0555
+file path=usr/lib/mutter/Meta-3.0.gir
+file path=usr/lib/mutter/Meta-3.0.typelib
+file path=usr/lib/mutter/plugins/default.so
+file path=usr/lib/pkgconfig/libmutter.pc
+file path=usr/share/GConf/gsettings/mutter-schemas.convert
+# file path=usr/share/applications/mutter-wayland.desktop
+file path=usr/share/applications/mutter.desktop
+file path=usr/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml
+file path=usr/share/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml
+file path=usr/share/gnome-control-center/keybindings/50-mutter-navigation.xml
+file path=usr/share/gnome-control-center/keybindings/50-mutter-system.xml
+file path=usr/share/gnome-control-center/keybindings/50-mutter-windows.xml
+file path=usr/share/locale/am/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ar/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/as/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ast/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/az/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/be/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/[email protected]/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/bg/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/bn/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/bn_IN/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/br/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/bs/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ca/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/[email protected]/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/cs/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/cy/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/da/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/de/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/dz/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/el/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/en_CA/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/en_GB/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/eo/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/es/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/et/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/eu/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/fa/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/fi/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/fr/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ga/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/gl/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/gu/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ha/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/he/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/hi/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/hr/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/hu/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/hy/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/id/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ig/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/is/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/it/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ja/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ka/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/kk/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/kn/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ko/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ku/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/la/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/lt/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/lv/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/mai/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/mg/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/mk/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ml/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/mn/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/mr/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ms/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/nb/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/nds/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ne/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/nl/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/nn/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/oc/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/or/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/pa/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/pl/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/pt/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ro/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ru/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/rw/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/si/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/sk/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/sl/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/sq/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/sr/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/[email protected]/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/sv/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ta/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/te/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/tg/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/th/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/tk/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/tr/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/ug/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/uk/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/vi/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/wa/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/xh/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/yo/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/zh_HK/LC_MESSAGES/mutter.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/mutter.mo
+file path=usr/share/man/man1/mutter.1
+license COPYING license=GPLv2
+depend type=require fmri=__TBD \
+    pkg.debug.depend.reason=src/backends/meta-input-settings.c \
+    pkg.tmp.gsettings-schema=org.gnome.desktop.peripherals
+depend type=require fmri=__TBD pkg.debug.depend.reason=src/core/keybindings.c \
+    pkg.tmp.gsettings-schema=org.gnome.desktop.wm.keybindings
+depend type=require fmri=__TBD pkg.debug.depend.reason=src/core/prefs.c \
+    pkg.tmp.gsettings-schema=org.gnome.desktop.input-sources
+depend type=require fmri=__TBD pkg.debug.depend.reason=src/core/prefs.c \
+    pkg.tmp.gsettings-schema=org.gnome.desktop.interface
+depend type=require fmri=__TBD pkg.debug.depend.reason=src/core/prefs.c \
+    pkg.tmp.gsettings-schema=org.gnome.desktop.wm.preferences
+depend type=require fmri=__TBD pkg.debug.depend.reason=src/core/prefs.c \
+    pkg.tmp.gsettings-schema=org.gnome.settings-daemon.peripherals
+depend type=require fmri=__TBD pkg.debug.depend.reason=src/core/prefs.c \
+    pkg.tmp.gsettings-schema=org.gnome.settings-daemon.plugins.xsettings
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/mutter/patches/01-xopen-source.patch	Fri Oct 28 14:58:48 2016 -0700
@@ -0,0 +1,54 @@
+If _XOPEN_SOURCE is defined, the library must be built as an xpg6
+application, however it is not, so we instead define __EXTENSIONS__ in the
+Makefile and then avoid defining _XOPEN_SOURCE.
+
+Needs investigation before contributing to upstream.
+
+--- mutter-3.16.1/src/core/delete.c	2015-04-14 12:55:28.000000000 -0700
++++ mutter-3.16.1.new/src/core/delete.c	2015-07-18 12:57:28.387713815 -0700
[email protected]@ -20,7 +20,9 @@
+  * along with this program; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#ifndef __EXTENSIONS__
+ #define _XOPEN_SOURCE /* for kill() */
++#endif
+ 
+ #include <config.h>
+ #include "util-private.h"
+--- mutter-3.16.1/src/core/display.c	2015-04-14 12:56:09.000000000 -0700
++++ mutter-3.16.1.new/src/core/display.c	2015-07-18 12:57:03.109624404 -0700
[email protected]@ -28,7 +28,9 @@
+  * The display is represented as a #MetaDisplay struct.
+  */
+ 
++#ifndef __EXTENSIONS__
+ #define _XOPEN_SOURCE 600 /* for gethostname() */
++#endif
+ 
+ #include <config.h>
+ #include "display-private.h"
+--- mutter-3.16.1/src/core/main.c	2015-04-14 12:55:28.000000000 -0700
++++ mutter-3.16.1.new/src/core/main.c	2015-07-18 12:57:20.499111571 -0700
[email protected]@ -42,7 +42,9 @@
+  */
+ 
+ #define _GNU_SOURCE
++#ifndef __EXTENSIONS__
+ #define _XOPEN_SOURCE /* for putenv() and some signal-related functions */
++#endif
+ 
+ #include <config.h>
+ #include <meta/main.h>
+--- mutter-3.16.1/src/x11/window-props.c	2015-04-06 15:17:15.000000000 -0700
++++ mutter-3.16.1.new/src/x11/window-props.c	2015-07-18 12:56:41.006550890 -0700
[email protected]@ -35,7 +35,9 @@
+  */
+ 
+ #define _GNU_SOURCE
++#ifndef __EXTENSIONS__
+ #define _XOPEN_SOURCE 500 /* for gethostname() */
++#endif
+ 
+ #include <config.h>
+ #include "window-props.h"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/mutter/patches/02-compile.patch	Fri Oct 28 14:58:48 2016 -0700
@@ -0,0 +1,48 @@
+Fix compiler warnings.
+
+meta-cursor-renderer.c is already fixed upstream in a later release:
+https://git.gnome.org/browse/mutter/commit?id=ff312b69585cb0ec9f53483baa47678db8d44306
+
+Other two files need to be submitted upstream still.
+
+--- mutter-3.18.0/src/backends/meta-cursor-renderer.c	Sun Oct  4 19:47:56 2015
++++ mutter-3.18.0/src/backends/meta-cursor-renderer.c	Sun Oct  4 19:48:42 2015
[email protected]@ -26,6 +26,7 @@
+ 
+ #include "meta-cursor-renderer.h"
+ 
++#include <math.h> 
+ #include <meta/meta-backend.h>
+ #include <meta/util.h>
+ 
+--- mutter-3.18.0/src/core/window.c	Mon Sep 21 12:48:51 2015
++++ mutter-3.18.0/src/core/window.c	Tue Jan  5 13:34:16 2016
[email protected]@ -3488,7 +3488,7 @@
+     {
+       MetaMonitorInfo *info = &window->screen->monitor_infos[i];
+ 
+-      if (info->winsys_id == winsys_id)
++      if ((size_t)info->winsys_id == winsys_id)
+         return info;
+     }
+ 
[email protected]@ -3697,7 +3697,7 @@
+ 
+   meta_window_update_monitor (window, flags & META_MOVE_RESIZE_USER_ACTION);
+ 
+-  if (old_output_winsys_id != window->monitor->winsys_id &&
++  if (old_output_winsys_id != (size_t) window->monitor->winsys_id &&
+       flags & META_MOVE_RESIZE_MOVE_ACTION && flags & META_MOVE_RESIZE_USER_ACTION)
+     window->preferred_output_winsys_id = window->monitor->winsys_id;
+
+--- mutter-3.18.1/src/x11/session.c	Tue Jan  5 13:40:50 2016
++++ mutter-3.18.1/src/x11/session.c	Tue Jan  5 13:41:09 2016
[email protected]@ -336,7 +336,7 @@
+     prop3val.value = &hint;
+     prop3val.length = 1;
+ 
+-    sprintf (pid, "%d", getpid ());
++    sprintf (pid, "%ld", (long)getpid ());
+     prop4.name = (char *)SmProcessID;
+     prop4.type = (char *)SmARRAY8;
+     prop4.num_vals = 1;