[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - configure.ac solenv/bin

[Tor Lillqvist (via logerrit)]

 configure.ac         |    4 ++--
 solenv/bin/ooinstall |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 9b47e9dbd0c425335fc1b8871135c27481683b4c
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Nov 22 21:05:48 2017 +0200
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Thu May 14 13:21:10 2020 +0300

    Use the same solenv/bin/ooinstall as in the cp-5.3 branch
    
    Specifically, pass the correct product name and not a hardcoded
    "LibreOffice" for the make_installer.pl script's -p option.
    
    As such, instsetoo_native/util/openoffice.lst.in hardcodes the product
    name as "CollaboraOffice" so we could as well do that also in
    ooinstall.
    
    (cherry picked from commit 852ffcae172c8ce1536f847410d94b6fcb486b96)
    
    Change-Id: I9b2d84bcc18e21b325960f7057e259daa37234a5
    Reviewed-on: https://gerrit.libreoffice.org/55640
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 12d1b08aac8cc8c3176040efc7290377e380f0c4)
    Reviewed-on: https://gerrit.libreoffice.org/79128
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit 0069417b55c99166aec5489ccef803eba25d2b4f)

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index efb1f28de824..71f10c739036 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -88,11 +88,14 @@ if ($destdir && "$ENV{DESTDIR}" ne "/" && -d "$ENV{DESTDIR}") {
 
 print "Running LibreOffice installer\n";
 
+my $PRODUCTNAME_no_spaces = $ENV{PRODUCTNAME};
+$PRODUCTNAME_no_spaces =~ s/ //g;
+
 system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
         "perl " .
         (scalar keys(%DB::sub) ? "-d " : "") .
         "-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " .
-        "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p LibreOffice " .
+        "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p $PRODUCTNAME_no_spaces " .
         "-u $tmp_dir " .
         "-buildid $BUILD $destdir $strip $msi " .
         "-simple $path") && die "Failed to install: $!";
commit 7126fe0f57428ff57341b1d00a9d467ab10df50e
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Mar 24 21:45:18 2020 +0200
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Thu May 14 13:09:39 2020 +0300

    Accept iOS SDK 13.4
    
    Change-Id: I7ef4acfd009c9e7fa0adf31a2f50f507b957bac9

diff --git a/configure.ac b/configure.ac
index db540e9f47fe..18451469f752 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3037,8 +3037,8 @@ dnl ===================================================================
 
 if test $_os = iOS; then
     AC_MSG_CHECKING([what iOS SDK to use])
-    current_sdk_ver=13.2
-    older_sdk_vers="13.1 13.0 12.4 12.2"
+    current_sdk_ver=13.4
+    older_sdk_vers="13.2 13.1 13.0 12.4 12.2"
     if test "$enable_ios_simulator" = "yes"; then
         platform=iPhoneSimulator
         versionmin=-mios-simulator-version-min=12.2