[gimp] build: sync our nightly flatpak with last changes.

[Jehan <jehanp src gnome org>]

commit 1b2ed2efd23037c953a3d53578819c7795d37e2d
Author: Jehan <jehan girinstud io>
Date:   Mon Sep 27 12:43:36 2021 +0200

    build: sync our nightly flatpak with last changes.
    
    This is based from changes in wip/release/2-99-8 branch or the Flathub
    flatpak (so not necessarily released yet):
    
    - libheif bumped to 1.12.0
    - Cairo with new patch to fix #235.

 build/flatpak/org.gimp.GIMP-nightly.json |  8 ++++++--
 build/patches/cairo-mr245-issue325.patch | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/build/flatpak/org.gimp.GIMP-nightly.json b/build/flatpak/org.gimp.GIMP-nightly.json
index 566a417961..58be31f6d1 100644
--- a/build/flatpak/org.gimp.GIMP-nightly.json
+++ b/build/flatpak/org.gimp.GIMP-nightly.json
@@ -387,8 +387,8 @@
             ],
             "sources" : [
                 {
-                    "url" : 
"https://github.com/strukturag/libheif/releases/download/v1.9.1/libheif-1.9.1.tar.gz";,
-                    "sha256" : "5f65ca2bd2510eed4e13bdca123131c64067e9dd809213d7aef4dc5e37948bca",
+                    "url" : 
"https://github.com/strukturag/libheif/releases/download/v1.12.0/libheif-1.12.0.tar.gz";,
+                    "sha256" : "e1ac2abb354fdc8ccdca71363ebad7503ad731c84022cf460837f0839e171718",
                     "type" : "archive"
                 }
             ]
@@ -445,6 +445,10 @@
                 {
                     "type": "patch",
                     "path": "../patches/cairo-mr114-gimp-issue-6210.patch"
+                },
+                {
+                    "type": "patch",
+                    "path": "../patches/cairo-mr245-issue325.patch"
                 }
             ]
         },
diff --git a/build/patches/cairo-mr245-issue325.patch b/build/patches/cairo-mr245-issue325.patch
new file mode 100644
index 0000000000..b41883bbb4
--- /dev/null
+++ b/build/patches/cairo-mr245-issue325.patch
@@ -0,0 +1,22 @@
+diff -Naur cairo-1.16.0/src/cairo-composite-rectangles.c 
cairo-1.16.0.patched/src/cairo-composite-rectangles.c
+--- cairo-1.16.0/src/cairo-composite-rectangles.c      2018-08-17 03:10:53.000000000 +0200
++++ cairo-1.16.0.patched/src/cairo-composite-rectangles.c      2021-09-26 15:52:04.410502567 +0200
+@@ -431,18 +431,6 @@
+     if (! _cairo_composite_rectangles_init (extents, surface, op, source, clip))
+       return CAIRO_INT_STATUS_NOTHING_TO_DO;
+ 
+-    /* Computing the exact bbox and the overlap is expensive.
+-     * First perform a cheap test to see if the glyphs are all clipped out.
+-     */
+-    if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK &&
+-      _cairo_scaled_font_glyph_approximate_extents (scaled_font,
+-                                                    glyphs, num_glyphs,
+-                                                    &extents->mask))
+-    {
+-      if (! _cairo_rectangle_intersect (&extents->bounded, &extents->mask))
+-          return CAIRO_INT_STATUS_NOTHING_TO_DO;
+-    }
+-
+     status = _cairo_scaled_font_glyph_device_extents (scaled_font,
+                                                     glyphs, num_glyphs,
+                                                     &extents->mask,