odk/Package_examples.mk | 8 +++----- odk/Package_odk_headers.mk | 14 ++++++-------- 2 files changed, 9 insertions(+), 13 deletions(-)
New commits: commit 08f8d419e26e376cc26c620971c59ce7fcc0f9db Author: Hossein <[email protected]> AuthorDate: Sat Feb 21 23:05:14 2026 +0100 Commit: Christian Lohmaier <[email protected]> CommitDate: Fri Mar 6 14:28:22 2026 +0100 tdf#170954 Ship LibreOfficeKit headers / examples on macOS This reverts commit 20ee295dd11fcad8ba72439e6ad28f61ed740958, such that LibreOfficeKit headers and examples are usable on macOS again. After 5d4a689293d47c7671315452f6b90a185fe809c0 and 857a760f317ad6540a6f03169ef8dda97d2c1de7 among other related patches, LibreOfficeKit became usable on macOS. The build issues are fixed in d6773eccb382c0c6b9d78f406c96230c5f40f44c. Change-Id: Ifaac9c3652bf4b4f53b41997015f00b9083628a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199965 Tested-by: Jenkins Reviewed-by: Hossein <[email protected]> (cherry picked from commit 2a72ad755d75741a71eff8e75803072c871956f2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200251 Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk index fa72732d2ba5..a5a5c50faca4 100644 --- a/odk/Package_examples.mk +++ b/odk/Package_examples.mk @@ -441,11 +441,9 @@ $(eval $(call gb_Package_add_files_with_dir,odk_examples,$(SDKDIRNAME)/examples, cpp/Convertor/Convertor.cxx \ cpp/Convertor/Makefile \ cpp/Convertor/test.odt \ - $(if $(filter-out $(OS),MACOSX), \ - cpp/lokconvert/lokconvert.cxx \ - cpp/lokconvert/Makefile \ - cpp/lokconvert/test.odt \ - ) \ + 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 e9af36c0fe25..c103c23d4b27 100644 --- a/odk/Package_odk_headers.mk +++ b/odk/Package_odk_headers.mk @@ -184,14 +184,12 @@ $(eval $(call gb_Package_add_files_with_dir,odk_headers,$(SDKDIRNAME)/include,\ uno/mapping.hxx \ uno/sequence2.h \ uno/threadpool.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 \ - ) \ + $(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:
