[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - RepositoryExternal.mk

[Luboš Luňák (via logerrit)]

 RepositoryExternal.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 84ede3b4c1021d6ec49fd653e6c8bebb26d9fb67
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Thu Apr 22 17:10:53 2021 +0200
Commit:     Pranam Lashkari <lpranam at collabora.com>
CommitDate: Thu Jul 8 10:13:40 2021 +0200

    fix cairocanvas build with internal cairo
    
    3a4bfe3e45be2d5b591ab5cae3694c9492ca9e1b made cairocanvas #include
    also a pixman header, but the internal cairo case wasn't setting
    up the pixman include path.
    
    Change-Id: Ib0daab3a5ec1a6ebf1b29eb37b039d2f41f770c9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114491
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit 04bd21d483c33c5011e31ac12d02c9e00dc410ce)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118499
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Pranam Lashkari <lpranam at collabora.com>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 7a4fd496d654..a937feead3cb 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1279,6 +1279,7 @@ $(call gb_LinkTarget_use_external,$(1),freetype_headers)
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,cairo) \
 	-I$(call gb_UnpackedTarball_get_dir,cairo)/src \
+	-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\