diff -Nru efl-1.21.1/debian/changelog efl-1.21.1/debian/changelog
--- efl-1.21.1/debian/changelog	2019-02-12 03:56:43.000000000 +0000
+++ efl-1.21.1/debian/changelog	2019-02-12 22:43:45.000000000 +0000
@@ -1,3 +1,10 @@
+efl (1.21.1-5) unstable; urgency=medium
+
+  * d/patches/25_fix_glinptr_redef.diff: Fix FTBFS on 32-bit arches with
+    mesa >= 18.3.
+
+ -- Ross Vandegrift <ross@kallisti.us>  Tue, 12 Feb 2019 14:43:45 -0800
+
 efl (1.21.1-4) unstable; urgency=medium
 
   * d/control:
diff -Nru efl-1.21.1/debian/patches/25_fix_glinptr_redef.diff efl-1.21.1/debian/patches/25_fix_glinptr_redef.diff
--- efl-1.21.1/debian/patches/25_fix_glinptr_redef.diff	1970-01-01 00:00:00.000000000 +0000
+++ efl-1.21.1/debian/patches/25_fix_glinptr_redef.diff	2019-02-12 22:43:45.000000000 +0000
@@ -0,0 +1,25 @@
+Description: Don't redefine GLintptr unless necessary
+ This fixes FTBFS on 32-bit systems.
+Author: Carsten Haitzler (Rasterman) <raster@rasterman.com>
+Bug: https://phab.enlightenment.org/T7502
+Origin: upstream, 0d2b624f1e24240a1c4e651aa1cfe9a8dd10a573
+Last-Update: 2019-02-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h
+index b6b642400f..4f67b1695f 100644
+--- a/src/lib/evas/Evas_GL.h
++++ b/src/lib/evas/Evas_GL.h
+@@ -4272,9 +4272,11 @@ typedef signed int       GLfixed;      // Changed khronos_int32_t
+ 
+ #ifndef GL_ES_VERSION_2_0
+ /* GL types for handling large vertex buffer objects */
+-#include <stddef.h>
++# ifndef GL_VERSION_1_5
++#  include <stddef.h>
+ typedef ptrdiff_t GLintptr;     // Changed khronos_intptr_t
+ typedef ptrdiff_t GLsizeiptr;   // Changed khronos_ssize_t
++# endif
+ #endif
+ 
+ /* Some definitions from GLES 3.0.
diff -Nru efl-1.21.1/debian/patches/series efl-1.21.1/debian/patches/series
--- efl-1.21.1/debian/patches/series	2018-11-10 13:01:58.000000000 +0000
+++ efl-1.21.1/debian/patches/series	2019-02-12 22:43:45.000000000 +0000
@@ -2,6 +2,7 @@
 10_remove_google_analytics.diff
 15_try_curl-gnutls.diff
 20_disable_doxygen_timestamps.diff
+25_fix_glinptr_redef.diff
 45_disable_doc_pack.diff
 95-parallel-previews.diff
 99-fix-shader-regen.diff