Makefile.in | 24 +++++++++++++++++++----- Repository.mk | 6 ++++-- desktop/source/app/officeipcthread.cxx | 5 +++++ lo.xcent.in | 9 --------- registry/Module_registry.mk | 6 ++++-- 5 files changed, 32 insertions(+), 18 deletions(-)
New commits: commit 6e9a41dbc25402350e4b767d8f10e8e855f7531a Author: Andras Timar <[email protected]> Date: Mon May 11 22:26:29 2015 +0200 create empty .lproj directories for languages supported by OS X The previous solution had problems. InfoPlist.strings were empty, because localization has not been working since the CFBundleTypeIconFile entries were removed from Info.plist. Icon file basename was the key in documents.ulf. So we packaged 0 bytes long files. The second problem was that we used LibreOffice language codes, and OS X language codes are different in some cases. This caused problems such as French strings on English UI (e.g. Open/Save dialogs), because the system did not recognize en-US.lproj and en-GB.lproj, and fell back to the next one: fr. Conflicts: Makefile.in (cherry picked from commit 91902ef1411943f65da296fefd15fff9170d9c0c) Change-Id: I9c502cdf737b497ca2ceef8f3c535ccfea2f6134 diff --git a/Makefile.in b/Makefile.in index 8e84f46..ff8f36b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -306,14 +306,13 @@ ifeq ($(OS_FOR_BUILD),WNT) else @$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR) ifneq ($(MACOSX_CODESIGNING_IDENTITY),) -# Unzip bin/InfoPlist_*.zip files into corresponding Resources/*.lproj directories. - set -x; for F in $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin/InfoPlist_*.zip; do \ - bn=`basename $$F .zip`; \ - lang=$${bn#InfoPlist_}; \ +# +# Create Resources/*.lproj directories for languages supported by OS X + set -x; for lang in ca cs da de el en es fi fr hr hu id it ja ko ms nl no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW; do \ lproj=$(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Resources/$$lang.lproj; \ mkdir $$lproj; \ - (cd $$lproj; unzip $$F); \ done +# # And remove the "bin" folder which should not be there rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin # commit ca3e8b0299b3a3f6e8029a47cb7391512c49ac4a Author: Tor Lillqvist <[email protected]> Date: Tue Sep 9 10:35:51 2014 +0300 Remove potential old leftover before moving the app bundle Change-Id: I7f0a8ae184a2f3d8a4476415b56df4ad8e4e342f (cherry picked from commit 53c396c7008b807cffcc501171520b28c3f2ad24) diff --git a/Makefile.in b/Makefile.in index 7ff9cb5..8e84f46 100644 --- a/Makefile.in +++ b/Makefile.in @@ -337,6 +337,7 @@ endif mac-app-store-package: test-install ifneq ($(MACOSX_PACKAGE_SIGNING_IDENTITY),) + rm -rf "$(MACOSX_APP_NAME).app" mv "$(TESTINSTALLDIR)/$(PRODUCTNAME).app" "$(MACOSX_APP_NAME).app" productbuild --component "$(MACOSX_APP_NAME).app" /Applications --sign $(MACOSX_PACKAGE_SIGNING_IDENTITY) $(shell echo "$(MACOSX_APP_NAME)" | tr ' ' '-').pkg else commit 8c25e92bb9c289598fc8c83d712d67c5539cd21b Author: Tor Lillqvist <[email protected]> Date: Sun Sep 21 23:55:38 2014 +0300 We don't build the Apple Remote code when sandboxed So no need for the related entitlements. Change-Id: I54ba7c0586ee77f30096b50755a9a85bbb7965a5 (cherry picked from commit a1379c6d2555c77b1b096165ac2aab42808e90a7) (cherry picked from commit d78c567c78e9d0f4e122caab527da23f69dec6d3) diff --git a/lo.xcent.in b/lo.xcent.in index 9b1f028..02d8929 100644 --- a/lo.xcent.in +++ b/lo.xcent.in @@ -18,13 +18,6 @@ <true/> <key>com.apple.security.device.bluetooth</key> <true/> - <!-- usb needed for the apple_remote thingie... --> - <key>com.apple.security.device.usb</key> - <true/> - <key>com.apple.security.temporary-exception.apple-events</key> - <array> - <string>mac.remotecontrols</string> - </array> <key>com.apple.security.print</key> <true/> </dict> commit fd34a19b4d8ccbd8740cf6056be87b8c267caaec Author: Tor Lillqvist <[email protected]> Date: Tue Sep 23 14:57:52 2014 +0300 Seems that we don't need the com.apple.application-identifier after all Conflicts: lo.xcent.in Change-Id: I3bc499b15c31724dca2d49123dcdbec8dfd934f6 (cherry picked from commit fc01d27ea172809ae7bdbd85df161d5a033d4533) diff --git a/lo.xcent.in b/lo.xcent.in index ca636d7..9b1f028 100644 --- a/lo.xcent.in +++ b/lo.xcent.in @@ -2,8 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";> <plist version="1.0"> <dict> - <key>com.apple.application-identifier</key> - <string>@MACOSX_BUNDLE_IDENTIFIER@</string> <key>com.apple.security.app-sandbox</key> <true/> <key>com.apple.security.files.bookmarks.app-scope</key> commit 2bcef51421963677daed826d6ea4be19ecdc174b Author: Tor Lillqvist <[email protected]> Date: Tue Jun 30 19:42:45 2015 +0300 tdf#92191: Don't use any IPC pipe in a sandboxed OS X app Creating the pipe fails when sandboxed. This caused us to not start the OfficeIPCThread, and that then meant that the file open requests coming in through VCL_NSApplication's application:openFile: method in vclnsapp.mm were not processed properly. The OS takes care of not starting multiple LO apps simultaneously anyway, so we don't really need any pipe, I hope. Conflicts: desktop/source/app/officeipcthread.cxx Change-Id: Ia920520ce2928787313f83199028f9c9942f61f3 (cherry picked from commit e2f4c9eae3f53aaba968d7567f912df6fa911326) diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 2a72627..b672ce7 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -527,6 +527,10 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() if ( aUserInstallPathHashCode.isEmpty() ) return IPC_STATUS_BOOTSTRAP_ERROR; // Something completely broken, we cannot create a valid hash code! +#if HAVE_FEATURE_MACOSX_SANDBOX + nPipeMode = PIPEMODE_CREATED; +#else + OUString aPipeIdent( "SingleOfficeIPC_" + aUserInstallPathHashCode ); do @@ -570,6 +574,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() } } while ( nPipeMode == PIPEMODE_DONTKNOW ); +#endif } if ( nPipeMode == PIPEMODE_CREATED ) commit 8ba6e0d6b1471d56fd0733d5966bdc2e34cc0a05 Author: Tor Lillqvist <[email protected]> Date: Sat Sep 20 01:01:09 2014 +0300 Skip some executables in the OS X sandboxed (Mac App Store) case I doubt end-users will miss gengal.bin, regview, or regmerge. We need the gengal program at build time. But don't bother shipping it on OS X, at least not in the sandboxed (App Store) case. Change-Id: Id73bef1ba71d126c2d2962fe846e9c31963d6c24 diff --git a/Makefile.in b/Makefile.in index a5461ca..7ff9cb5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -316,6 +316,20 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),) done # And remove the "bin" folder which should not be there rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin +# +# Remove unnecessary executables in the LibreOfficePython framework + rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/bin +# +# Remove the python.o object file which is weird and interferes with app store uploading +# And with it removed, presumably the other stuff in the Python lib/python3.3/config-3.3m probably does not make sense either. + rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]* +# +ifneq ($ENABLE_MACOSX_SANDBOX),) +# Remove the gengal.bin binary that we don't want + rm $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/gengal.bin +endif +# +# Then use the macosx-codesign-app-bundle script @$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app endif endif diff --git a/Repository.mk b/Repository.mk index df446f6..e9cd89a 100644 --- a/Repository.mk +++ b/Repository.mk @@ -190,8 +190,10 @@ endif $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ - regmerge \ - regview \ + $(if $(ENABLE_MACOSX_SANDBOX),, \ + regmerge \ + regview \ + ) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ )) diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk index cbb052e..907b90f 100644 --- a/registry/Module_registry.mk +++ b/registry/Module_registry.mk @@ -12,8 +12,10 @@ $(eval $(call gb_Module_Module,registry)) $(eval $(call gb_Module_add_targets,registry,\ Library_reg \ $(if $(filter-out $(OS),IOS), \ - Executable_regmerge \ - Executable_regview \ + $(if $(ENABLE_MACOSX_SANDBOX),, \ + Executable_regmerge \ + Executable_regview \ + ) \ StaticLibrary_registry_helper \ ) \ )) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
