diff --git a/mutter-3.23.2-eglformat-security.patch b/mutter-3.23.2-eglformat-security.patch new file mode 100644 index 0000000..38f4889 --- /dev/null +++ b/mutter-3.23.2-eglformat-security.patch @@ -0,0 +1,12 @@ +diff -Nur mutter-3.32.2.orig/src/backends/meta-egl.c mutter-3.23.2/src/backends/meta-egl.c +--- mutter-3.32.2.orig/src/backends/meta-egl.c 2016-11-22 08:27:46.000000000 -0700 ++++ mutter-3.23.2/src/backends/meta-egl.c 2016-11-24 11:14:48.612133544 -0700 +@@ -141,7 +141,7 @@ + + error_str = get_egl_error_str (); + g_set_error (error, G_IO_ERROR, +- G_IO_ERROR_FAILED, ++ G_IO_ERROR_FAILED, "%s", + error_str); + } + diff --git a/mutter.spec b/mutter.spec index 0200ead..2d85b1e 100644 --- a/mutter.spec +++ b/mutter.spec @@ -5,7 +5,7 @@ Name: mutter Version: 3.23.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Window and compositing manager based on Clutter License: GPLv2+ @@ -16,6 +16,10 @@ Source0: http://download.gnome.org/sources/%{name}/3.23/%{name}-%{version} # https://bugzilla.gnome.org/show_bug.cgi?id=772422 Patch0: 0001-Use-eglGetPlatformDisplay.patch Patch1: startup-notification.patch +# +# Fix format security issue that prevents compiling under Fedora +# +Patch2: mutter-3.23.2-eglformat-security.patch BuildRequires: chrpath BuildRequires: pango-devel @@ -38,6 +42,8 @@ BuildRequires: libxcb-devel BuildRequires: libxkbcommon-devel BuildRequires: libxkbcommon-x11-devel BuildRequires: libxkbfile-devel +BuildRequires: libXtst-devel +BuildRequires: mesa-libGLES-devel BuildRequires: mesa-libGL-devel BuildRequires: mesa-libgbm-devel BuildRequires: pam-devel @@ -107,8 +113,9 @@ the functionality of the installed %{name} package. %prep %setup -q -%patch0 -p1 +#patch0 -p1 %patch1 -p1 +%patch2 -p1 %build autoreconf -f -i @@ -183,6 +190,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/mutter/tests %changelog +* Thu Nov 24 2016 Kevin Fenzi - 3.23.2-2 +- Some fixes to get building. Still needs patch1 rebased. + * Wed Nov 23 2016 Florian Müllner - 3.23.2-1 - Update to 3.23.2