From dac70b9debb7c68def456ae90463ef6ced44c07d Mon Sep 17 00:00:00 2001
From: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Date: Tue, 8 Jun 2021 20:04:46 +0200
Subject: fix packaging on mac/linux re cairo/pixman

1193c331945481dd155a55c6695ff6fd88bd3d10 tried to simplify the makefiles
for the Android case, but removed the conditional that would skip
registering cairo/pixman for install for mac/windows (USING_X11,
ENABLE_CAIRO_CANVAS & DISABLE_GUI all unset)

Change-Id: I21509aaa1b2b1bffb583885148190b28fb097ecc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116860
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
---
 RepositoryExternal.mk | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'RepositoryExternal.mk')

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index df4a8f15c703..36c74ee95985 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1286,6 +1286,8 @@ endef
 
 else # !SYSTEM_CAIRO
 
+ifneq ($(filter-out MACOSX WNT,$(OS)),)
+
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	cairo \
     pixman \
@@ -1308,6 +1310,8 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
+endif # !MACOSX, !WNT
+
 endif # !SYSTEM_CAIRO
 
 ifneq ($(SYSTEM_FREETYPE),)
-- 
cgit