[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - download.lst external/cairo

[Libreoffice Gerrit user]

 download.lst                                 |    6 +-
 external/cairo/ExternalPackage_cairo.mk      |    2 
 external/cairo/cairo/cairo.oldfreetype.patch |   78 +++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 4 deletions(-)

New commits:
commit 7c8397d45f6c6b9debbe4861b7c2a567cb1757ed
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Feb 20 13:31:44 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Mar 3 14:07:53 2019 +0100

    cairo: upgrade to release 1.16.0
    
    This fixes some minor CVEs.
    
    Not including the fix for CVE-2018-18064, which does not affect LO
    because we use the default implementation of FT_Memory which uses
    free/malloc.
    
    Change-Id: Ic047ed52cff3fdeba068f1b8d303c6c96c69addd
    Reviewed-on: https://gerrit.libreoffice.org/68088
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Reviewed-on: https://gerrit.libreoffice.org/68359
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/download.lst b/download.lst
index 46464c84164a..a5c2e4152f74 100644
--- a/download.lst
+++ b/download.lst
@@ -14,9 +14,9 @@ export BSH_SHA256SUM := 9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e6222
 export BSH_TARBALL := beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
 export BZIP2_SHA256SUM := a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
 export BZIP2_TARBALL := 00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz
-export CAIRO_SHA256SUM := 7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09
-export CAIRO_VERSION_MICRO := 10
-export CAIRO_TARBALL := cairo-1.14.$(CAIRO_VERSION_MICRO).tar.xz
+export CAIRO_SHA256SUM := 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
+export CAIRO_VERSION_MICRO := 0
+export CAIRO_TARBALL := cairo-1.16.$(CAIRO_VERSION_MICRO).tar.xz
 export CDR_SHA256SUM := e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d
 export CDR_TARBALL := libcdr-0.1.4.tar.xz
 export CLUCENE_SHA256SUM := ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
diff --git a/external/cairo/ExternalPackage_cairo.mk b/external/cairo/ExternalPackage_cairo.mk
index 3d0f1a9d4e54..3b78a52fed76 100644
--- a/external/cairo/ExternalPackage_cairo.mk
+++ b/external/cairo/ExternalPackage_cairo.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo))
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 ifneq ($(OS),ANDROID)
 
-$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11400.$(CAIRO_VERSION_MICRO)))
+$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.1160$(CAIRO_VERSION_MICRO).0))
 
 endif
 endif
diff --git a/external/cairo/cairo/cairo.oldfreetype.patch b/external/cairo/cairo/cairo.oldfreetype.patch
new file mode 100644
index 000000000000..d994dd5f4b1b
--- /dev/null
+++ b/external/cairo/cairo/cairo.oldfreetype.patch
@@ -0,0 +1,78 @@
+From c0ed8ce1a111cb9472aef080ac3aa31526443f7c Mon Sep 17 00:00:00 2001
+From: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
+Date: Thu, 13 Dec 2018 14:36:56 +0900
+Subject: [PATCH] [cairo-ft-font.c] conditionalize the changes by 3ec4aa24 on 2018-07-16 for legacy FreeType2 without color font feature
+
+---
+ src/cairo-ft-font.c |   10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
+index 325dd61..1841adb 100644
+--- misc/a/src/cairo-ft-font.c
++++ misc/b/src/cairo-ft-font.c
+@@ -976,10 +976,12 @@ _compute_xrender_bitmap_size(FT_Bitmap      *target,
+ 	pitch = width * 4;
+ 	break;
+ 
++#ifdef FT_PIXEL_MODE_BGRA
+     case FT_PIXEL_MODE_BGRA:
+ 	/* each pixel is replicated into a 32-bit ARGB value */
+ 	pitch = width * 4;
+ 	break;
++#endif
+ 
+     default:  /* unsupported source format */
+ 	return -1;
+@@ -1177,10 +1179,12 @@ _fill_xrender_bitmap(FT_Bitmap      *target,
+ 	}
+ 	break;
+ 
++#ifdef FT_PIXEL_MODE_BGRA
+     case FT_PIXEL_MODE_BGRA:
+ 	for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch)
+ 	    memcpy (dstLine, srcLine, width * 4);
+ 	break;
++#endif
+ 
+     default:
+ 	assert (0);
+@@ -1289,6 +1293,7 @@ _get_bitmap_surface (FT_Bitmap		     *bitmap,
+ 	    component_alpha = TRUE;
+ 	}
+ 	break;
++#ifdef FT_PIXEL_MODE_BGRA
+     case FT_PIXEL_MODE_BGRA:
+ 	stride = width * 4;
+ 	if (own_buffer) {
+@@ -1311,6 +1316,7 @@ _get_bitmap_surface (FT_Bitmap		     *bitmap,
+ 	}
+ 	format = CAIRO_FORMAT_ARGB32;
+ 	break;
++#endif
+     case FT_PIXEL_MODE_GRAY2:
+     case FT_PIXEL_MODE_GRAY4:
+     convert:
+@@ -2487,7 +2493,9 @@ _cairo_ft_scaled_glyph_init (void			*abstract_font,
+ 	vertical_layout = TRUE;
+     }
+ 
++#ifdef FT_LOAD_COLOR
+     load_flags |= FT_LOAD_COLOR;
++#endif
+ 
+ 
+     if (info & CAIRO_SCALED_GLYPH_INFO_METRICS) {
+@@ -2656,7 +2664,9 @@ LOAD:
+          */
+ 	scaled_glyph_loaded = FALSE;
+         info &= ~CAIRO_SCALED_GLYPH_INFO_METRICS;
++#ifdef FT_LOAD_COLOR
+         load_flags &= ~FT_LOAD_COLOR;
++#endif
+         goto LOAD;
+     }
+ 
+-- 
+1.7.1
+