[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - 14 commits - configure.ac jurt/com lo.xcent.in Makefile.in postprocess/Rdb_services.mk registry/Module_registry.mk Repository.mk sysui/desktop
Stephan Bergmann
sbergman at redhat.com
Tue May 19 04:19:11 PDT 2015
Makefile.in | 44 +++++++++++++++++++-
Repository.mk | 6 +-
configure.ac | 24 ++++++++++
jurt/com/sun/star/lib/util/NativeLibraryLoader.java | 10 ++++
lo.xcent.in | 9 ----
postprocess/Rdb_services.mk | 12 +++--
registry/Module_registry.mk | 6 +-
sysui/desktop/macosx/Info.plist.in | 2
8 files changed, 93 insertions(+), 20 deletions(-)
New commits:
commit f07e87a000aff3639ea1aa3bcbd2555f365f52c5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 16 14:24:45 2015 +0100
Exclude Python components if --disable-python
Change-Id: I05c1e9d7b270bcafa7fbfe526c8b12733d8ed708
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index affb629..9b398cf 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -168,16 +168,18 @@ $(eval $(call gb_Rdb_add_components,services,\
scripting/source/basprov/basprov \
scripting/source/dlgprov/dlgprov \
scripting/source/protocolhandler/protocolhandler \
- scripting/source/pyprov/mailmerge \
- wizards/com/sun/star/wizards/fax/fax \
- wizards/com/sun/star/wizards/letter/letter \
- wizards/com/sun/star/wizards/agenda/agenda \
- wizards/com/sun/star/wizards/web/web \
scripting/source/stringresource/stringresource \
scripting/source/vbaevents/vbaevents \
scripting/util/scriptframe \
sw/util/vbaswobj \
vbahelper/util/msforms \
+ $(ifneq ($(DISABLE_PYTHON),TRUE) \
+ scripting/source/pyprov/mailmerge \
+ wizards/com/sun/star/wizards/agenda/agenda \
+ wizards/com/sun/star/wizards/fax/fax \
+ wizards/com/sun/star/wizards/letter/letter \
+ wizards/com/sun/star/wizards/web/web \
+ ) \
) \
$(if $(ENABLE_CAIRO_CANVAS), \
canvas/source/cairo/cairocanvas \
commit 093ab33a858e5da4d508bcb33bacf2ce31a47eb3
Author: Andras Timar <andras.timar at collabora.com>
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 packages 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.
Change-Id: I9c502cdf737b497ca2ceef8f3c535ccfea2f6134
Conflicts:
Makefile.in
diff --git a/Makefile.in b/Makefile.in
index d5c008c..cf61549 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -297,14 +297,13 @@ ifeq ($(OS_FOR_BUILD),WNT)
else
@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 68c4ab7facd3cf8d406f7b3e3e94a4427d02e8f6
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Sep 9 10:35:51 2014 +0300
Remove potential old leftover before moving the app bundle
Change-Id: I7f0a8ae184a2f3d8a4476415b56df4ad8e4e342f
diff --git a/Makefile.in b/Makefile.in
index 1585d0b..d5c008c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -328,6 +328,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 a6f79248a166261129be08d9d99b7724d29089c4
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Sep 23 21:45:32 2014 +0300
Add targets 'patch' and 'unpatch' to assist in handling of temporary patches
'make patch' applies any patch file in the uncommitted-patches
directory, if it exists. These files should be as produced by git
format-patch. 'make unpatch' correspondingly undos what 'make patch'
did. None of this is done using git, that is the very point.
Change-Id: I348d96be54bc8e544e833206c922cb4bdcbabc4c
Conflicts:
Makefile.in
diff --git a/Makefile.in b/Makefile.in
index e0c2bcf..1585d0b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@
gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck
-.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
+.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS) patch unpatch
MAKECMDGOALS?=all
build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
@@ -389,4 +389,22 @@ $(eval $(call gb_Top_GbuildToIdeIntegration,$(ide))))
endif # MAKE_RESTARTS
+patch:
+ test -d uncommitted-patches || exit 0
+ for F in uncommitted-patches/*.patch; do \
+ patch --dry-run -p1 <$$F || exit 1; \
+ done
+ mkdir -p uncommitted-patches.applied
+ for F in uncommitted-patches/*.patch; do \
+ patch -p1 <$$F || exit 1; \
+ cp $$F uncommitted-patches.applied; \
+ done
+
+unpatch:
+ test -d uncommitted-patches.applied || exit 0
+ for F in uncommitted-patches.applied/*.patch; do \
+ patch -R -p1 <$$F || exit 1; \
+ rm $$F; \
+ done
+
# vim: set noet sw=4 ts=4:
commit 9835149450ad08ac0525761ac18e6aeb63fe4536
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Sep 23 14:57:52 2014 +0300
Seems that we don't need the com.apple.application-identifier after all
Change-Id: I3bc499b15c31724dca2d49123dcdbec8dfd934f6
diff --git a/lo.xcent.in b/lo.xcent.in
index f804daf..02d8929 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_TEAMID at .@MACOSX_BUNDLE_IDENTIFIER@</string>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.files.bookmarks.app-scope</key>
commit c11ec4a5caa9452e78975ff24e9e1679cf0d0a57
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Sep 23 00:27:58 2014 +0300
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
(cherry picked from commit 11b4f4bfbee257d63f6a52808fb02b903ddea0d5)
Conflicts:
Makefile.in
Repository.mk
diff --git a/Makefile.in b/Makefile.in
index 6781e73..e0c2bcf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -307,6 +307,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
@macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app
endif
endif
diff --git a/Repository.mk b/Repository.mk
index ef03edf..3396fe9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -142,9 +142,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,writer_brand, \
))
$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
- $(if $(ENABLE_MACOSX_SANDBOX),, \
- gengal \
- )\
+ gengal \
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \
$(if $(filter WNT,$(OS)),,uri-encode) \
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index ab26b9f..67dbe01 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Module_add_check_targets,svx,\
))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-ifeq (,$(ENABLE_MACOSX_SANDBOX))
$(eval $(call gb_Module_add_targets,svx,\
Executable_gengal \
$(if $(filter-out WNT,$(OS)), \
@@ -45,7 +44,6 @@ $(eval $(call gb_Module_add_targets,svx,\
Executable_pixelctl) \
))
endif
-endif
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
commit b077e2796e7e45549f69081db9c1a337ce31220b
Author: Tor Lillqvist <tml at collabora.com>
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)
diff --git a/lo.xcent.in b/lo.xcent.in
index 1088cbb..f804daf 100644
--- a/lo.xcent.in
+++ b/lo.xcent.in
@@ -20,13 +20,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 211c3184bbc689c338dc4ce9cb3e2fb19e6fdb75
Author: Tor Lillqvist <tml at collabora.com>
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.
Change-Id: I353610c0d039f25fa415f35902fe2b9890cd423f
(cherry picked from commit beb30bbd867f9a28878e0d004458c3507f6c0956)
Conflicts:
Repository.mk
diff --git a/Repository.mk b/Repository.mk
index 006f231..ef03edf 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -142,7 +142,9 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,writer_brand, \
))
$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
- gengal \
+ $(if $(ENABLE_MACOSX_SANDBOX),, \
+ gengal \
+ )\
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \
$(if $(filter WNT,$(OS)),,uri-encode) \
@@ -187,8 +189,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 fb962c6..5f70ed9 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 \
) \
))
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 67dbe01..ab26b9f 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_check_targets,svx,\
))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+ifeq (,$(ENABLE_MACOSX_SANDBOX))
$(eval $(call gb_Module_add_targets,svx,\
Executable_gengal \
$(if $(filter-out WNT,$(OS)), \
@@ -44,6 +45,7 @@ $(eval $(call gb_Module_add_targets,svx,\
Executable_pixelctl) \
))
endif
+endif
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
commit 52e35fae59972a4fe397c17570256392fdee7481
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Sep 19 15:45:07 2014 +0300
We need CFBundleVersion, too
Change-Id: I50c12ffd741baf12589069d90f47566c5324ce7f
(cherry picked from commit 68d186d3428df91c3efddb26294807d573c6306e)
diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in
index b9c78c0..6f6f711 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1541,6 +1541,8 @@
<string>main.icns</string>
<key>CFBundleShortVersionString</key>
<string>@MACOSX_BUNDLE_SHORTVERSION@</string>
+ <key>CFBundleVersion</key>
+ <string>@MACOSX_BUNDLE_SHORTVERSION@</string>
<key>CFBundleIdentifier</key>
<string>@MACOSX_BUNDLE_IDENTIFIER@</string>
<key>CFBundleInfoDictionaryVersion</key>
commit c2749874ff538bebe57e56df80bf1142ba1d8b66
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Sep 19 12:47:02 2014 +0300
Unzip the InfoPlist.strings files into correct locations
Not sure how useful it is to only provide translations for the ODF
document format names, though.
Change-Id: I22a2e5b896e077ca3067a30635f7cdf67c2f5e7c
(cherry picked from commit 16f62d80c38f3920a40fc078edecad905ba2b196)
diff --git a/Makefile.in b/Makefile.in
index 220a260..6781e73 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -297,9 +297,15 @@ ifeq ($(OS_FOR_BUILD),WNT)
else
@ooinstall $(TESTINSTALLDIR)
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-# The InfoPlist_*.zip files in "bin" are totally pointless and should
-# not be there. I am too lazy at the moment to figure out how to
-# prevent them from ending up there.
+# 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_}; \
+ 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
@macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app
endif
commit ee1fb7401a89be288418580cd84c9e021e5ced4d
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Sep 15 21:50:35 2014 +0300
We don't want those bin/InfoPlist_*.zip files in the app bundle
Change-Id: I29eefa599f175d98303fca8f5ccf1c8fe85b0bbc
(cherry picked from commit 7956d38fa3c0db77b9b2b41f870bd3587e3dc1af)
diff --git a/Makefile.in b/Makefile.in
index 22d8a01..220a260 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -297,6 +297,10 @@ ifeq ($(OS_FOR_BUILD),WNT)
else
@ooinstall $(TESTINSTALLDIR)
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
+# The InfoPlist_*.zip files in "bin" are totally pointless and should
+# not be there. I am too lazy at the moment to figure out how to
+# prevent them from ending up there.
+ rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin
@macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app
endif
endif
commit 14508448de969332916d2dac960311628cdacea8
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Aug 7 23:26:10 2014 +0300
Make this work better in the ENABLE_MACOSX_MACLIKE_APP_STRUCTURE case
In that case the dylibs won't be in the parent directory of where the
jars are (Resources), but in Frameworks.
Change-Id: I628d828ca820d07724947050f54f9f5f9148e159
(cherry picked from commit 6ac523554213f11838443de0cd9b62415f5d2ffd)
diff --git a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java b/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
index d948655..d429a7b 100644
--- a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
+++ b/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
@@ -117,6 +117,16 @@ public final class NativeLibraryLoader {
if (path.exists()) {
return path;
}
+ // In case of ENABLE_MACOSX_MACLIKE_APP_STRUCTURE,
+ // dir is now the Resources dir, we want to look in Frameworks
+ if (System.getProperty("os.name").startsWith("Mac")
+ && dir.getName().equals("Resources")) {
+ dir = dir.getParentFile();
+ path = new File(dir, "Frameworks/" + name);
+ if (path.exists()) {
+ return path;
+ }
+ }
}
}
}
commit 0ee23424eb5217fffff2a8c0c45ff09d93902bf2
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Aug 16 21:59:11 2013 +0300
Decouple the "Mac-like" app bundle structure choice from sandboxing choice
Add a switch --enable-canonical-installation-tree-structure. Only implemented
for OS X for now, but the same switch can be used if and when we want to make
it possible to make the Unix installation tree more "standard", too.
Change-Id: Icb0ad500b77d7e986f2f188fd17faabaf2e2fe99
Conflicts:
configure.ac
diff --git a/configure.ac b/configure.ac
index 65c9124..69a2e7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1350,6 +1350,13 @@ AC_ARG_WITH(macosx-teamid,
in the entitlements when building a sandboxed LibreOffice.]),
,)
+AC_ARG_ENABLE(canonical-installation-tree-structure,
+ AS_HELP_STRING([--enable-canonical-installation-tree-structure],
+ [Make the installation tree structure be more canonical for
+ the platform. Implemented only for OS X. Experimental.]),
+,)
+
+
AC_ARG_WITH(macosx-bundle-identifier,
AS_HELP_STRING([--with-macosx-bundle-identifier=tld.mumble.orifice.TheOffice],
[Define the OS X bundle identifier. Default is the somewhat weird
@@ -3042,7 +3049,7 @@ dnl ===================================================================
dnl Structure of install set
dnl ===================================================================
-if test $_os = Darwin; then
+if test $_os = Darwin -a "$enable_canonical_installation_tree_structure" = yes; then
LIBO_BIN_FOLDER=MacOS
LIBO_ETC_FOLDER=Resources
LIBO_LIBEXEC_FOLDER=MacOS
@@ -3059,6 +3066,8 @@ if test $_os = Darwin; then
LIBO_URE_LIB_FOLDER=Frameworks
LIBO_URE_SHARE_FOLDER=Resources/ure/share
LIBO_URE_SHARE_JAVA_FOLDER=Resources/java
+ ENABLE_MACOSX_MACLIKE_APP_STRUCTURE=YES
+ AC_DEFINE(HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE)
elif test $_os = WINNT; then
LIBO_BIN_FOLDER=program
LIBO_ETC_FOLDER=program
commit 49d048a2c8a8159e0e478d405f4c29d652362d75
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Sep 22 00:07:53 2014 +0300
The com.apple.application-identifier value should be prefixed with the teamid
Change-Id: I6b58492ba051bb5032870aa47cfacbe3a292e31f
Conflicts:
configure.ac
diff --git a/configure.ac b/configure.ac
index 4cdb969..65c9124 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1344,6 +1344,12 @@ AC_ARG_ENABLE(macosx-sandbox,
adherence to App Store rules.]),
,)
+AC_ARG_WITH(macosx-teamid,
+ AS_HELP_STRING([--with-macosx-teamid=<teamid>],
+ [The "team id" to be used for com.apple.application-identifier
+ in the entitlements when building a sandboxed LibreOffice.]),
+,)
+
AC_ARG_WITH(macosx-bundle-identifier,
AS_HELP_STRING([--with-macosx-bundle-identifier=tld.mumble.orifice.TheOffice],
[Define the OS X bundle identifier. Default is the somewhat weird
@@ -2892,8 +2898,14 @@ if test $_os = Darwin; then
AC_MSG_CHECKING([whether to sandbox the application])
+ if test -n "$with_macosx_teamid" -a "$with_macosx_teamid != yes -a "$with_macosx_teamid != no; then
+ MACOSX_TEAMID="$with_macosx_teamid"
+ fi
+
if test -z "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" = yes; then
AC_MSG_ERROR([OS X sandboxing requires code signing])
+ elif test -z "$MACOSX_TEAMID" -a "$enable_macosx_sandbox" = yes; then
+ AC_MSG_ERROR([OS X sandboxing requires a team id])
elif test -n "$ENABLE_JAVA" -a "$enable_macosx_sandbox" = yes; then
AC_MSG_ERROR([OS X sandboxing (actually App Store rules) disallows use of Java])
elif test -n "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" = yes; then
@@ -2924,6 +2936,7 @@ AC_SUBST(MACOSX_CODESIGNING_IDENTITY)
AC_SUBST(MACOSX_PACKAGE_SIGNING_IDENTITY)
AC_SUBST(ENABLE_MACOSX_SANDBOX)
AC_SUBST(MACOSX_BUNDLE_IDENTIFIER)
+AC_SUBST(MACOSX_TEAMID)
AC_SUBST(MACOSX_APP_NAME)
AC_SUBST(MACOSX_HIGH_RESOLUTION_VALUE)
diff --git a/lo.xcent.in b/lo.xcent.in
index ca636d7..1088cbb 100644
--- a/lo.xcent.in
+++ b/lo.xcent.in
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>com.apple.application-identifier</key>
- <string>@MACOSX_BUNDLE_IDENTIFIER@</string>
+ <string>@MACOSX_TEAMID at .@MACOSX_BUNDLE_IDENTIFIER@</string>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.files.bookmarks.app-scope</key>
More information about the Libreoffice-commits
mailing list