diff -Nru gimp-2.10.8/debian/changelog gimp-2.10.8/debian/changelog
--- gimp-2.10.8/debian/changelog	2018-12-24 15:17:02.000000000 +0100
+++ gimp-2.10.8/debian/changelog	2019-09-09 11:12:52.000000000 +0200
@@ -1,3 +1,10 @@
+gimp (2.10.8-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Cherry-pick 986a298a from upstream (Closes: #939754)
+
+ -- Jakob Haufe <sur5r@debian.org>  Mon, 09 Sep 2019 11:12:52 +0200
+
 gimp (2.10.8-2) unstable; urgency=medium
 
   * Restore -Wl,-O1 to our LDFLAGS
diff -Nru gimp-2.10.8/debian/control gimp-2.10.8/debian/control
--- gimp-2.10.8/debian/control	2018-12-24 15:17:02.000000000 +0100
+++ gimp-2.10.8/debian/control	2019-09-09 11:12:52.000000000 +0200
@@ -10,7 +10,7 @@
 Build-Depends: debhelper (>= 11),
                desktop-file-utils <!nocheck>,
                dh-python,
-               gegl (>= 0.4.12),
+               gegl (>= 0.4.14),
                gettext,
                glib-networking,
                gnome-pkg-tools,
@@ -28,7 +28,7 @@
                libexif-dev (>= 0.6.15),
                libfreetype6-dev (>= 2.2),
                libfontconfig1-dev (>= 2.12.4),
-               libgegl-dev (>= 0.4.12),
+               libgegl-dev (>= 0.4.14),
                libgexiv2-dev (>= 0.10.6),
                libglib2.0-dev (>= 2.54.2),
                libglib2.0-doc,
@@ -145,7 +145,7 @@
 Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libgegl-dev (>= 0.4.12),
+         libgegl-dev (>= 0.4.14),
          libgimp2.0 (= ${binary:Version}),
          libgtk2.0-dev (>= 2.12.5),
          pkg-config
diff -Nru gimp-2.10.8/debian/patches/02_gegl_mask_is_empty.patch gimp-2.10.8/debian/patches/02_gegl_mask_is_empty.patch
--- gimp-2.10.8/debian/patches/02_gegl_mask_is_empty.patch	1970-01-01 01:00:00.000000000 +0100
+++ gimp-2.10.8/debian/patches/02_gegl_mask_is_empty.patch	2019-09-09 11:10:37.000000000 +0200
@@ -0,0 +1,39 @@
+diff --git a/app/gegl/gimp-gegl-mask.c b/app/gegl/gimp-gegl-mask.c
+index 311b05879db4800f23e2a15644ada64996efcfef..e67ae115905ba5556ff481792dc6c57677efd728 100644
+--- a/app/gegl/gimp-gegl-mask.c
++++ b/app/gegl/gimp-gegl-mask.c
+@@ -134,25 +134,24 @@ gboolean
+ gimp_gegl_mask_is_empty (GeglBuffer *buffer)
+ {
+   GeglBufferIterator *iter;
++  const Babl         *format;
++  gint                bpp;
+ 
+   g_return_val_if_fail (GEGL_IS_BUFFER (buffer), FALSE);
+ 
+-  iter = gegl_buffer_iterator_new (buffer, NULL, 0, babl_format ("Y float"),
++  format = gegl_buffer_get_format (buffer);
++  bpp    = babl_format_get_bytes_per_pixel (format);
++
++  iter = gegl_buffer_iterator_new (buffer, NULL, 0, format,
+                                    GEGL_ACCESS_READ, GEGL_ABYSS_NONE, 1);
+ 
+   while (gegl_buffer_iterator_next (iter))
+     {
+-      gfloat *data = iter->items[0].data;
+-      gint    i;
+-
+-      for (i = 0; i < iter->length; i++)
++      if (! gegl_memeq_zero (iter->items[0].data, bpp * iter->length))
+         {
+-          if (data[i])
+-            {
+-              gegl_buffer_iterator_stop (iter);
++          gegl_buffer_iterator_stop (iter);
+ 
+-              return FALSE;
+-            }
++          return FALSE;
+         }
+     }
+
diff -Nru gimp-2.10.8/debian/patches/series gimp-2.10.8/debian/patches/series
--- gimp-2.10.8/debian/patches/series	2018-12-24 15:17:02.000000000 +0100
+++ gimp-2.10.8/debian/patches/series	2019-09-09 11:10:44.000000000 +0200
@@ -1 +1,2 @@
 01_hurd_ftbfs.patch
+02_gegl_mask_is_empty.patch