Makefile.in | 4 ++-
configure.ac | 4 +++
extensions/Package_quicklookpreviewappex.mk | 2 -
extensions/Package_quicklookthumbnailappex.mk | 2 -
extensions/source/macosx/quicklookpreview/appex/.gitignore | 9 +++++++
extensions/source/macosx/quicklookpreview/appex/Info.plist.in | 12
++++++----
extensions/source/macosx/quicklookthumbnail/appex/.gitignore | 9 +++++++
extensions/source/macosx/quicklookthumbnail/appex/Info.plist.in | 12
++++++----
8 files changed, 43 insertions(+), 11 deletions(-)
New commits:
commit a53f44ce842b30da14463f282eddec21c32b016f
Author: Patrick Luby <guibmac...@gmail.com>
AuthorDate: Tue Jan 14 19:48:32 2025 -0500
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Feb 14 20:13:28 2025 +0100
Set bundle identifier to match Mac App Store requirements
The Mac App Store expects the bundle identifier to be the application's
bundle identifier + "." + the extension name and the extension name
cannot have any period characters.
Change-Id: I8c2ee048dc52bec961e6d740edfd05cf3e11d631
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180257
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins
diff --git a/Makefile.in b/Makefile.in
index 17f84342a997..b049de46620e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -236,7 +236,9 @@ distclean : clean compilerplugins-clean
mac-app-store-package.clean
$(BUILDDIR)/solenv/lockfile/autoconf.h \
$(BUILDDIR)/lo.xcent \
$(BUILDDIR)/sysui/desktop/macosx/Info.plist \
- $(BUILDDIR)/vs-code*.code-workspace*
+ $(BUILDDIR)/vs-code*.code-workspace* \
+ $(BUILDDIR)/extensions/source/macosx/quicklookpreview/appex/Info.plist
\
+
$(BUILDDIR)/extensions/source/macosx/quicklookthumbnail/appex/Info.plist
$(if $(filter WNT,$(OS)),env -i PATH="$$PATH") $(FIND)
$(SRCDIR)/solenv/gdb -name \*.pyc -exec rm -f {} \;
#
diff --git a/configure.ac b/configure.ac
index 41cc74e1648c..f5f04c8eff42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6051,6 +6051,8 @@ if test "$cross_compiling" = "yes"; then
sysui/desktop/macosx/lo.xcent.in \
.vscode/vs-code-template.code-workspace.in \
solenv/lockfile/autoconf.h.in \
+ extensions/source/macosx/quicklookpreview/appex/Info.plist.in \
+ extensions/source/macosx/quicklookthumbnail/appex/Info.plist.in \
) \
| (cd CONF-FOR-BUILD && tar xf -)
cp configure CONF-FOR-BUILD
@@ -15852,6 +15854,8 @@ AC_CONFIG_FILES([
sysui/desktop/macosx/Info.plist
hardened_runtime.xcent:sysui/desktop/macosx/hardened_runtime.xcent.in
lo.xcent:sysui/desktop/macosx/lo.xcent.in
+ extensions/source/macosx/quicklookpreview/appex/Info.plist
+ extensions/source/macosx/quicklookthumbnail/appex/Info.plist
])
# map unix-style mount dirs to windows directories: /mnt/c/foobar -> C:/foobar
# easier to do it in a postprocessing command than to modify every single
variable
diff --git a/extensions/Package_quicklookpreviewappex.mk
b/extensions/Package_quicklookpreviewappex.mk
index c90db2546833..85bc0b2560e3 100644
--- a/extensions/Package_quicklookpreviewappex.mk
+++ b/extensions/Package_quicklookpreviewappex.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_Package_Package,extensions_quicklookpreviewappex,$(SRCDIR)/extensions/source/macosx/quicklookpreview/appex))
+$(eval $(call
gb_Package_Package,extensions_quicklookpreviewappex,$(BUILDDIR)/extensions/source/macosx/quicklookpreview/appex))
$(eval $(call
gb_Package_add_files,extensions_quicklookpreviewappex,PlugIns/QuickLookPreview.appex/Contents,\
Info.plist \
diff --git a/extensions/Package_quicklookthumbnailappex.mk
b/extensions/Package_quicklookthumbnailappex.mk
index 32628d50452d..715270df7d49 100644
--- a/extensions/Package_quicklookthumbnailappex.mk
+++ b/extensions/Package_quicklookthumbnailappex.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_Package_Package,extensions_quicklookthumbnailappex,$(SRCDIR)/extensions/source/macosx/quicklookthumbnail/appex))
+$(eval $(call
gb_Package_Package,extensions_quicklookthumbnailappex,$(BUILDDIR)/extensions/source/macosx/quicklookthumbnail/appex))
$(eval $(call
gb_Package_add_files,extensions_quicklookthumbnailappex,PlugIns/QuickLookThumbnail.appex/Contents,\
Info.plist \
diff --git a/extensions/source/macosx/quicklookpreview/appex/.gitignore
b/extensions/source/macosx/quicklookpreview/appex/.gitignore
new file mode 100644
index 000000000000..f690390fcd6a
--- /dev/null
+++ b/extensions/source/macosx/quicklookpreview/appex/.gitignore
@@ -0,0 +1,9 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+/Info.plist
diff --git a/extensions/source/macosx/quicklookpreview/appex/Info.plist
b/extensions/source/macosx/quicklookpreview/appex/Info.plist.in
similarity index 88%
rename from extensions/source/macosx/quicklookpreview/appex/Info.plist
rename to extensions/source/macosx/quicklookpreview/appex/Info.plist.in
index e17296d9de07..2010e8a1bca2 100644
--- a/extensions/source/macosx/quicklookpreview/appex/Info.plist
+++ b/extensions/source/macosx/quicklookpreview/appex/Info.plist.in
@@ -12,15 +12,15 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
- <string>LibreOffice Quick Look Preview</string>
+ <string>@PRODUCTNAME@ Quick Look Preview</string>
<key>CFBundleExecutable</key>
<string>QuickLookPreview</string>
<key>CFBundleIdentifier</key>
- <string>org.libreoffice.quicklookpreview</string>
+ <string>@MACOSX_BUNDLE_IDENTIFIER@.quicklookpreview</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
- <string>QuickLookPreview</string>
+ <string>@PRODUCTNAME_WITHOUT_SPACES@QuickLookPreview</string>
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
@@ -32,7 +32,11 @@
<key>CFBundleVersion</key>
<string>1</string>
<key>LSMinimumSystemVersion</key>
- <string>12.0</string>
+ <string>@MACOSX_DEPLOYMENT_TARGET@.0</string>
+ <key>DTXcodeBuild</key>
+ <string>@MACOSX_XCODE_BUILD_VERSION@</string>
+ <key>DTSDKBuild</key>
+ <string>@MACOSX_SDK_BUILD_VERSION@</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
diff --git a/extensions/source/macosx/quicklookthumbnail/appex/.gitignore
b/extensions/source/macosx/quicklookthumbnail/appex/.gitignore
new file mode 100644
index 000000000000..f690390fcd6a
--- /dev/null
+++ b/extensions/source/macosx/quicklookthumbnail/appex/.gitignore
@@ -0,0 +1,9 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+/Info.plist
diff --git a/extensions/source/macosx/quicklookthumbnail/appex/Info.plist
b/extensions/source/macosx/quicklookthumbnail/appex/Info.plist.in
similarity index 88%
rename from extensions/source/macosx/quicklookthumbnail/appex/Info.plist
rename to extensions/source/macosx/quicklookthumbnail/appex/Info.plist.in
index d8a1d1338371..7ae631f1dc59 100644
--- a/extensions/source/macosx/quicklookthumbnail/appex/Info.plist
+++ b/extensions/source/macosx/quicklookthumbnail/appex/Info.plist.in
@@ -12,15 +12,15 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
- <string>LibreOffice Quick Look Thumbnail</string>
+ <string>@PRODUCTNAME@ Quick Look Thumbnail</string>
<key>CFBundleExecutable</key>
<string>QuickLookThumbnail</string>
<key>CFBundleIdentifier</key>
- <string>org.libreoffice.quicklookthumbnail</string>
+ <string>@MACOSX_BUNDLE_IDENTIFIER@.quicklookthumbnail</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
- <string>QuickLookThumbnail</string>
+ <string>@PRODUCTNAME_WITHOUT_SPACES@QuickLookThumbnail</string>
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
@@ -32,7 +32,11 @@
<key>CFBundleVersion</key>
<string>1</string>
<key>LSMinimumSystemVersion</key>
- <string>10.15</string>
+ <string>@MACOSX_DEPLOYMENT_TARGET@.0</string>
+ <key>DTXcodeBuild</key>
+ <string>@MACOSX_XCODE_BUILD_VERSION@</string>
+ <key>DTSDKBuild</key>
+ <string>@MACOSX_SDK_BUILD_VERSION@</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
