[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - download.lst external/cairo

[Libreoffice Gerrit user]

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

New commits:
commit 7b1eacbac5d104f34b6e35db4430b03a7caf8125
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 26 16:04:06 2018 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Mon Feb 25 10:57:42 2019 +0100

    bump to latest cairo
    
    Reviewed-on: https://gerrit.libreoffice.org/58134
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 00f6bec6b70130327313b9e203625272ef05ae93)
    
    fix own-cairo edge case build
    Reviewed-on: https://gerrit.libreoffice.org/59663
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 30020423bd76c6770db1627cfec684708ab3427c)
    
    Change-Id: I001da359569d37afe482cdbb50e9c8b3ced24aff
    Reviewed-on: https://gerrit.libreoffice.org/68216
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Jenkins

diff --git a/download.lst b/download.lst
index 2524c42f8cde..362234fecc16 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 := 7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9
+export CAIRO_VERSION_MICRO := 12
+export CAIRO_TARBALL := cairo-1.15.$(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..154c84919a03 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.115$(CAIRO_VERSION_MICRO).0))
 
 endif
 endif