odk/Package_examples.mk | 8 +++++---
odk/Package_odk_headers.mk | 14 ++++++++------
2 files changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 67afda89557cd0d3bd181e7c3c8d1406075ea364
Author: Hossein <hoss...@libreoffice.org>
AuthorDate: Sat Jul 27 15:24:50 2024 +0200
Commit: Hossein <hoss...@libreoffice.org>
CommitDate: Sat Aug 3 10:04:51 2024 +0200
No LibreOfficeKit headers and examples for macOS
LibreOfficeKit has issues in macOS, as discussed in LibreOffice
development mailing List and also in tdf#145127.
LibreOfficeKit unrunnable on macOS
https://lists.freedesktop.org/archives/libreoffice/2024-July/092256.html
Therefore, let's not ship the LibreOfficeKit headers and examples with
LibreOffice Community for macOS. If the above issue is solved, then it
will be possible to ship those again later.
Change-Id: I5ba62ee84432a09732d96a5d86eb0a1bf866671f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171095
Reviewed-by: Patrick Luby <guibomac...@gmail.com>
Tested-by: Jenkins
Reviewed-by: Hossein <hoss...@libreoffice.org>
diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk
index 28d60b329016..568735ec1ff7 100644
--- a/odk/Package_examples.mk
+++ b/odk/Package_examples.mk
@@ -428,9 +428,11 @@ $(eval $(call
gb_Package_add_files_with_dir,odk_examples,$(SDKDIRNAME)/examples,
cpp/Convertor/Convertor.cxx \
cpp/Convertor/Makefile \
cpp/Convertor/test.odt \
- cpp/lokconvert/lokconvert.cxx \
- cpp/lokconvert/Makefile \
- cpp/lokconvert/test.odt \
+ $(if $(filter-out $(OS),MACOSX), \
+ cpp/lokconvert/lokconvert.cxx \
+ cpp/lokconvert/Makefile \
+ cpp/lokconvert/test.odt \
+ ) \
cpp/Draw/Draw.cxx \
cpp/Draw/Makefile \
cpp/DocumentLoader/DocumentLoader.cxx \
diff --git a/odk/Package_odk_headers.mk b/odk/Package_odk_headers.mk
index c103c23d4b27..e9af36c0fe25 100644
--- a/odk/Package_odk_headers.mk
+++ b/odk/Package_odk_headers.mk
@@ -184,12 +184,14 @@ $(eval $(call
gb_Package_add_files_with_dir,odk_headers,$(SDKDIRNAME)/include,\
uno/mapping.hxx \
uno/sequence2.h \
uno/threadpool.h \
- $(if $(ENABLE_GTK3),LibreOfficeKit/LibreOfficeKitGtk.h) \
- LibreOfficeKit/LibreOfficeKit.hxx \
- LibreOfficeKit/LibreOfficeKitEnums.h \
- LibreOfficeKit/LibreOfficeKit.h \
- LibreOfficeKit/LibreOfficeKitInit.h \
- LibreOfficeKit/LibreOfficeKitTypes.h \
+ $(if $(filter-out $(OS),MACOSX), \
+ $(if $(ENABLE_GTK3),LibreOfficeKit/LibreOfficeKitGtk.h) \
+ LibreOfficeKit/LibreOfficeKit.hxx \
+ LibreOfficeKit/LibreOfficeKitEnums.h \
+ LibreOfficeKit/LibreOfficeKit.h \
+ LibreOfficeKit/LibreOfficeKitInit.h \
+ LibreOfficeKit/LibreOfficeKitTypes.h \
+ ) \
))
# vim: set noet sw=4 ts=4:
