[Libreoffice-commits] core.git: RepositoryExternal.mk
LuboÅ¡ LuÅák (via logerrit)
logerrit at kemper.freedesktop.org
Thu Apr 22 20:09:35 UTC 2021
RepositoryExternal.mk | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 04bd21d483c33c5011e31ac12d02c9e00dc410ce
Author: Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Thu Apr 22 17:10:53 2021 +0200
Commit: Luboš Luňák <l.lunak at collabora.com>
CommitDate: Thu Apr 22 22:08:55 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>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index dd1386b43bb8..12124f1fbbf7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1301,6 +1301,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),\
More information about the Libreoffice-commits
mailing list