instsetoo_native/CustomTarget_install.mk | 4 ++-- sysui/desktop/icons/macos/app-launcher/main.iconset/icon_128x128.png |binary sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] |binary sysui/desktop/icons/macos/app-launcher/main.iconset/icon_16x16.png |binary sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] |binary sysui/desktop/icons/macos/app-launcher/main.iconset/icon_256x256.png |binary sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] |binary sysui/desktop/icons/macos/app-launcher/main.iconset/icon_32x32.png |binary sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] |binary sysui/desktop/icons/macos/app-launcher/main.iconset/icon_512x512.png |binary sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] |binary 11 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit ffedcad53531d456cc0b503176ada76f4fc5c8f1 Author: Andras Timar <[email protected]> AuthorDate: Mon Feb 13 00:05:36 2023 +0100 Commit: Andras Timar <[email protected]> CommitDate: Mon Feb 13 00:05:36 2023 +0100 [cp] multilingual DMG for macOS Change-Id: Ib2c8e162c13099dc4ad324f89d68acdf97527199 diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 0c33e32e43f7..82d6b1ccf773 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -50,7 +50,7 @@ export instsetoo_OUT := $(WORKDIR)/installation export LOCAL_OUT := $(instsetoo_OUT) export LOCAL_COMMON_OUT := $(instsetoo_OUT) -ifeq (WNT,$(OS)) +ifeq ($(filter $(OS),MACOSX WNT),$(OS)) instsetoo_installer_langs := $(subst $(WHITESPACE),$(COMMA),$(strip en-US $(filter-out en-US,$(gb_WITH_LANG)))) else instsetoo_installer_langs := en-US @@ -70,7 +70,7 @@ instsetoo_installer_targets := $(foreach pkgformat,$(PKGFORMAT),\ $(if $(filter ODK,$(BUILD_TYPE)),sdkoo‧en-US‧_SDK‧‧$(pkgformat)‧nostrip) \ $(if $(and $(filter HELP,$(BUILD_TYPE)),$(filter-out MACOSX,$(OS))), \ $(foreach lang,$(gb_HELP_LANGS),ooohelppack‧$(lang)‧‧-helppack‧$(pkgformat)‧nostrip)) \ - $(if $(filter-out WNT,$(OS)), \ + $(if $(and $(filter-out WNT,$(OS)),$(filter-out MACOSX,$(OS))), \ $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),ooolangpack‧$(lang)‧‧-languagepack‧$(pkgformat)‧nostrip))) endif commit 37dd8e42d3a21ed8df986796fb816902d9a64dd0 Author: Andras Timar <[email protected]> AuthorDate: Mon Feb 13 00:03:59 2023 +0100 Commit: Andras Timar <[email protected]> CommitDate: Mon Feb 13 00:04:06 2023 +0100 [cp] macOS main.icns source files fopr Collabora Office Change-Id: Ie5d10ee97c78705a3d701a6965f2bcfe48e1eb0f diff --git a/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_128x128.png b/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_128x128.png index 7deb6eedbaf2..624cdab34e5f 100644 Binary files a/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_128x128.png and b/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_128x128.png differ diff --git a/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] b/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] index 59ab781955ca..42f62f9b6548 100644 Binary files a/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] and b/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] differ diff --git a/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_16x16.png b/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_16x16.png index 937eed321a4a..4b9e9f769142 100644 Binary files a/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_16x16.png and b/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_16x16.png differ diff --git a/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] b/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] index 8de8bf5a9b2e..ae2e0b42ee76 100644 Binary files a/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] and b/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] differ diff --git a/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_256x256.png b/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_256x256.png index 59ab781955ca..42f62f9b6548 100644 Binary files a/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_256x256.png and b/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_256x256.png differ diff --git a/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] b/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] index 493fb92f2efa..c2f4f21bc2e5 100644 Binary files a/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] and b/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] differ diff --git a/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_32x32.png b/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_32x32.png index 8de8bf5a9b2e..ae2e0b42ee76 100644 Binary files a/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_32x32.png and b/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_32x32.png differ diff --git a/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] b/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] index f13f8285935e..8d2ca82d16c9 100644 Binary files a/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] and b/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] differ diff --git a/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_512x512.png b/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_512x512.png index 493fb92f2efa..c2f4f21bc2e5 100644 Binary files a/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_512x512.png and b/sysui/desktop/icons/macos/app-launcher/main.iconset/icon_512x512.png differ diff --git a/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] b/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] index 817cc0cb1766..e83663837199 100644 Binary files a/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] and b/sysui/desktop/icons/macos/app-launcher/main.iconset/[email protected] differ
