[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 2 commits - instsetoo_native/CustomTarget_install.mk setup_native/source

[Andras Timar (via logerrit)]

 instsetoo_native/CustomTarget_install.mk       |    4 +++-
 setup_native/source/packinfo/osxdndinstall.png |binary
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2d3648e7f9f83feef88bb58896201e0132a60119
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Dec 5 00:55:03 2022 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Dec 5 00:57:05 2022 +0100

    [cp] resolution of osxdndinstall.png must be 72dpi
    
    Change-Id: Ib0a020fcbd855c97fc2294287e517b9f440c552a

diff --git a/setup_native/source/packinfo/osxdndinstall.png 
b/setup_native/source/packinfo/osxdndinstall.png
index 4998aa8ce9b2..eb5625392531 100644
Binary files a/setup_native/source/packinfo/osxdndinstall.png and 
b/setup_native/source/packinfo/osxdndinstall.png differ
commit ce0748b24d8a120b37f5b3cd297c7bb5d473b605
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Dec 5 00:18:53 2022 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Dec 5 00:57:05 2022 +0100

    [cp] fix multi-language DMG on macOS
    
    Change-Id: I56ec73fab321f7740accd14f956dfd1230fd9e01

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index b9b4a964b81f..2cf82c43ad2c 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -109,7 +109,9 @@ else # LIBO_TEST_INSTALL
                                        $(foreach lang,$(gb_HELP_LANGS), \
                                                
"ooohelppack:$(lang)::-helppack:$(pkgformat):nostrip" )) \
                        , \
-                               ":en-US:::$(pkgformat):$(if $(filter-out 
archive,$(pkgformat)),strip,nostrip)" \
+                               $(if $(filter MACOSX,$(OS)), \
+                                       ":$(subst 
$(WHITESPACE),$(COMMA),$(strip 
$(instsetoo_native_WITH_LANG))):::$(pkgformat):$(if $(filter-out 
archive,$(pkgformat)),strip,nostrip)", \
+                                       ":en-US:::$(pkgformat):$(if 
$(filter-out archive,$(pkgformat)),strip,nostrip)") \
                                $(if $(filter ODK,$(BUILD_TYPE)), \
                                        ":en-US:_SDK::$(pkgformat):nostrip") \
                                $(if $(and $(filter HELP,$(BUILD_TYPE)), 
$(filter-out MACOSX,$(OS))), \