cairo: upgrade 1.18.2 -> 1.18.4

(From OE-Core rev: 36cde7319bbdc2d4d69ea9cc8f54045c1c4e106b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 14 insertions, 7 deletions

diff --git a/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff b/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
index 6c761bf2a7..79ef16dfb9 100644
--- a/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
+++ b/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
@@ -1,4 +1,8 @@
-Cairo: Fix Denial-of-Service Attack due to Logical Problem in Program
+From 054ad9b65e074899c82e75cfc6623cfe29ab1fea Mon Sep 17 00:00:00 2001
+From: Fan Xin <fan.xin@jp.fujitsu.com>
+Date: Tue, 6 Jun 2017 15:57:52 +0900
+Subject: [PATCH] Cairo: Fix Denial-of-Service Attack due to Logical Problem in
+ Program
 
 https://bugs.freedesktop.org/show_bug.cgi?id=100763
 
@@ -6,12 +10,15 @@ CVE: CVE-2017-7475
 Upstream-Status: Submitted [https://gitlab.freedesktop.org/cairo/cairo/-/issues/80]
 
 Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
+---
+ src/cairo-ft-font.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: cairo-1.15.4/src/cairo-ft-font.c
-===================================================================
---- cairo-1.15.4.orig/src/cairo-ft-font.c
-+++ cairo-1.15.4/src/cairo-ft-font.c
-@@ -1149,7 +1149,7 @@ _get_bitmap_surface (FT_Bitmap                 *bi
+diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
+index b5d08ee..5e20ae1 100644
+--- a/src/cairo-ft-font.c
++++ b/src/cairo-ft-font.c
+@@ -1220,7 +1220,7 @@ _get_bitmap_surface (FT_Bitmap                 *bitmap,
      width = bitmap->width;
      height = bitmap->rows;
  
diff --git a/meta/recipes-graphics/cairo/cairo_1.18.2.bb b/meta/recipes-graphics/cairo/cairo_1.18.4.bb
index 65ee310212..81c7aa66f0 100644
--- a/meta/recipes-graphics/cairo/cairo_1.18.2.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.18.4.bb
@@ -32,7 +32,7 @@ SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \
            file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \
           "
 
-SRC_URI[sha256sum] = "a62b9bb42425e844cc3d6ddde043ff39dbabedd1542eba57a2eb79f85889d45a"
+SRC_URI[sha256sum] = "445ed8208a6e4823de1226a74ca319d3600e83f6369f99b14265006599c32ccb"
 
 inherit meson pkgconfig upstream-version-is-even gtk-doc multilib_script