[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 2 commits - distro-configs/CPOSX.conf solenv/bin

[Andras Timar]

 distro-configs/CPOSX.conf                     |    1 -
 solenv/bin/modules/installer/simplepackage.pm |    7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 1baeefbe596142484daed14576af09b30cce07db
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri May 8 11:38:56 2015 +0200

    tdf#78834 enable localized system dialogs on OS X
    
    Change-Id: I37f5b183b36f2a3077f591162402ddd83e4a46d4
    Reviewed-on: https://gerrit.libreoffice.org/15673
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 2df138b483f60ffdcd3b62c8c2884d2f5cc076af)

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 118d420..81d765d 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -395,6 +395,13 @@ sub create_package
         }
         else
         {
+            my $subdir = "$tempdir/$packagename/$volume_name_classic_app.app/Contents/Resources";
+            if ( ! -d $subdir ) { installer::systemactions::create_directory($subdir); }
+            # iterate over OS X localizations
+            foreach $lang ("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")
+            {
+                installer::systemactions::create_directory($subdir . "/" . $lang . ".lproj");
+            }
             if (($volume_name_classic_app eq 'LibreOffice' || $volume_name_classic_app eq 'LibreOfficeDev') &&
                 defined($ENV{'MACOSX_CODESIGNING_IDENTITY'}) && $ENV{'MACOSX_CODESIGNING_IDENTITY'} ne "" )
             {
commit 8d0ce0b2222e05a528632de49b6e1074554ab545
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri May 8 13:32:17 2015 +0200

    tweak CPOSX.conf
    
    Change-Id: I56ba01d0a7b3bad6cb152e080a5c6c9f926c7949

diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf
index f591a92..9767287 100644
--- a/distro-configs/CPOSX.conf
+++ b/distro-configs/CPOSX.conf
@@ -7,7 +7,6 @@
 --disable-online-update
 --disable-odk
 --enable-epm
---with-macosx-sdk=10.8
 --with-macosx-version-min-required=10.6
 --enable-ext-wiki-publisher
 --enable-report-builder