[Libreoffice-commits] core.git: download.lst external/cairo

[David Tardon]

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

New commits:
commit 9b9cee57b79a11b329c0d5f7c56ee5f37a661633
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Nov 8 19:26:01 2017 +0100

    upload cairo 1.14.10
    
    Change-Id: Ibdb107d816fe51399e54e02b529bbca77ce12ae0
    Reviewed-on: https://gerrit.libreoffice.org/44506
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/download.lst b/download.lst
index 3e4cfea1b31f..763bf72e8935 100644
--- a/download.lst
+++ b/download.lst
@@ -14,8 +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 := d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20
-export CAIRO_TARBALL := cairo-1.14.8.tar.xz
+export CAIRO_SHA256SUM := 7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09
+export CAIRO_VERSION_MICRO := 10
+export CAIRO_TARBALL := cairo-1.14.$(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 dc762247648c..3d0f1a9d4e54 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.8))
+$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11400.$(CAIRO_VERSION_MICRO)))
 
 endif
 endif