desktop/Module_desktop.mk | 2 +- scp2/source/ooo/common_brand.scp | 4 +++- shell/Module_shell.mk | 11 +++++++++-- 3 files changed, 13 insertions(+), 4 deletions(-)
New commits: commit af5d2d20ae88e7863dbce39d523246fe941e85a8 Author: Tor Lillqvist <[email protected]> Date: Fri Mar 7 14:44:13 2014 +0200 Fixup build breakage Change-Id: I287a55a2d174e4714486d5e893499151db2380cc diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index 40d7547..1e93743 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -101,8 +101,17 @@ ifeq ($(filter DESKTOP,$(BUILD_TYPE)),DESKTOP) $(eval $(call gb_Module_add_targets,shell,\ Executable_lngconvex \ + Library_syssh \ +)) + +ifneq ($(OS),WNT) + +$(eval $(call gb_Module_add_targets,shell,\ + StaticLibrary_xmlparser \ )) +endif + ifneq ($(filter-out MACOSX WNT,$(OS)),) $(eval $(call gb_Module_add_targets,shell,\ @@ -110,12 +119,10 @@ $(eval $(call gb_Module_add_targets,shell,\ Executable_uri_encode \ Library_cmdmail \ Library_recentfile \ - Library_syssh \ Package_scripts \ Package_scripts_gnome \ Package_scripts_kde \ Package_senddoc \ - StaticLibrary_xmlparser \ )) endif commit 7bec0c3aaafa21f30d3e563f402540ca04ec9621 Author: Tor Lillqvist <[email protected]> Date: Fri Mar 7 14:42:30 2014 +0200 No unopkg in the sandboxed case, I think Change-Id: I39d17cc9bf05ca33c0d0f36bdb71417ae5cc4caf diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index ed9e4d9..bcde93b 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -38,7 +38,7 @@ endif ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,desktop,\ Executable_soffice.bin \ - Executable_unopkg.bin \ + $(if $(ENABLE_MACOSX_SANDBOX),,Executable_unopkg.bin) \ Library_migrationoo2 \ Library_migrationoo3 \ Library_unopkgapp \ diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 2498822..6582bc9 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -599,7 +599,7 @@ File gid_Brand_File_Script_Unopkg End #endif -#if defined MACOSX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE +#if defined MACOSX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE && !defined ENABLE_MACOSX_SANDBOX Unixlink gid_Brand_Unixlink_Unopkg BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; @@ -609,12 +609,14 @@ Unixlink gid_Brand_Unixlink_Unopkg End #endif +#if !defined ENABLE_MACOSX_SANDBOX File gid_Brand_File_Bin_Unopkg BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Styles = (PACKED); Name = "unopkg.bin"; End +#endif // Due to Windows DLL search order, OOo executables might pick up a libxml2 DLL // from a Windows system directory instead of the one from the URE; to avoid _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
