From 9859cddb0b8a849267185a3ea6f7d784acf88023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 21 Jul 2016 00:00:54 +0200 Subject: [PATCH] Fix build error on 32 bit --- ...2-Don-t-leak-gles2-types-into-mutter.patch | 29 +++++++++++++++++++ mutter.spec | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 0001-cogl-gles2-Don-t-leak-gles2-types-into-mutter.patch diff --git a/0001-cogl-gles2-Don-t-leak-gles2-types-into-mutter.patch b/0001-cogl-gles2-Don-t-leak-gles2-types-into-mutter.patch new file mode 100644 index 0000000..f17b3d5 --- /dev/null +++ b/0001-cogl-gles2-Don-t-leak-gles2-types-into-mutter.patch @@ -0,0 +1,29 @@ +From 991f2d696af5fcac3a419ae64623e9703ea4bb2f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Wed, 20 Jul 2016 23:46:23 +0200 +Subject: [PATCH] cogl-gles2: Don't leak gles2 types into mutter + +On i686, the GLsizeiptr typedef in cogl-gles2.h conflicts with the +system GL headers, so make sure we don't include both. + +https://bugzilla.gnome.org/show_bug.cgi?id=769014 +--- + cogl/cogl/cogl-gles2.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cogl/cogl/cogl-gles2.h b/cogl/cogl/cogl-gles2.h +index a90d0ce..87a06f1 100644 +--- a/cogl/cogl/cogl-gles2.h ++++ b/cogl/cogl/cogl-gles2.h +@@ -65,7 +65,7 @@ + * conflicts we only expose the minimal set of GLES 2.0 types and enums + * publicly. + */ +-#ifdef COGL_COMPILATION ++#if defined(COGL_COMPILATION) || defined(COGL_ENABLE_MUTTER_API) + #include "cogl-gl-header.h" + #else + #include +-- +2.7.4 + diff --git a/mutter.spec b/mutter.spec index 147369b..adc93db 100644 --- a/mutter.spec +++ b/mutter.spec @@ -14,6 +14,8 @@ License: GPLv2+ URL: http://www.gnome.org Source0: http://download.gnome.org/sources/%{name}/3.21/%{name}-%{version}.tar.xz +Patch0: 0001-cogl-gles2-Don-t-leak-gles2-types-into-mutter.patch + BuildRequires: chrpath BuildRequires: pango-devel BuildRequires: startup-notification-devel @@ -106,6 +108,7 @@ the functionality of the installed %{name} package. %prep %setup -q +%patch0 -p1 -b .fix-type-error-on-i686 %build autoreconf -f -i @@ -183,6 +186,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : * Wed Jul 20 2016 Florian Müllner - 3.21.4-1 - Update to 3.21.4 - Drop downstream patch +- Fix build error on 32-bit * Tue Jun 21 2016 Florian Müllner - 3.21.3-1 - Update to 3.21.3