ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#170954 Ship LibreOfficeKit headers / examples on macOS

Browse Source 
This reverts commit 20ee295dd11fcad8ba72439e6ad28f61ed740958, such that
LibreOfficeKit headers and examples are usable on macOS again.

After 5d4a689293 and
857a760f31 among other related patches,
LibreOfficeKit became usable on macOS. The build issues are fixed in
d6773eccb3.

Change-Id: Ifaac9c3652bf4b4f53b41997015f00b9083628a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199965
Tested-by: Jenkins
Reviewed-by: Hossein <hossein@libreoffice.org>
This commit is contained in:
Hossein
2026-02-23 20:49:54 +01:00
parent adc3cbe787
commit 2a72ad755d
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
odk/Package_examples.mk
+3 -5
View File
@@ -435,11 +435,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 \
odk/Package_odk_headers.mk
+6 -8
View File
@@ -182,14 +182,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: