[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - configure.ac vcl/source

[Libreoffice Gerrit user]

 configure.ac               |   16 ++++++++++------
 vcl/source/image/Image.cxx |    1 -
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 7d08ded117e2bac4eb47c886000c82d7fe16e739
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Jan 4 10:15:08 2019 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jan 4 20:35:31 2019 +0000

    Allow iOS build on older Mac Minis which can't upgrade.
    
    Change-Id: I118838f1c97c174bd825ab9fcc64341ab9172a64

diff --git a/configure.ac b/configure.ac
index e4142899c824..81fada168e9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2862,17 +2862,15 @@ dnl ===================================================================
 
 if test $_os = iOS; then
     AC_MSG_CHECKING([what iOS SDK to use])
-    current_sdk_ver=12.1
+    current_sdks_ver="12.1 11.2"
     if test "$enable_ios_simulator" = "yes"; then
         platform=iPhoneSimulator
-        versionmin=-mios-simulator-version-min=$current_sdk_ver
     else
         platform=iPhoneOS
-        versionmin=-miphoneos-version-min=11.0
     fi
     xcode_developer=`xcode-select -print-path`
 
-    for sdkver in $current_sdk_ver; do
+    for sdkver in $current_sdks_ver; do
         t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
         if test -d $t; then
             ios_sdk=$sdkver
@@ -2881,14 +2879,20 @@ if test $_os = iOS; then
         fi
     done
 
+    if test "$enable_ios_simulator" = "yes"; then
+        versionmin=-mios-simulator-version-min=$ios_sdk
+    else
+        versionmin=-miphoneos-version-min=11.0
+    fi
+
     if test -z "$sysroot"; then
-        AC_MSG_ERROR([Could not find iOS SDK, expected something like $xcode_developer/Platforms/$platform.platform/Developer/SDKs/${platform}${current_sdk_ver}.sdk])
+        AC_MSG_ERROR([Could not find iOS SDK, expected something like $xcode_developer/Platforms/$platform.platform/Developer/SDKs/${platform}(${current_sdks_ver}).sdk])
     fi
 
     AC_MSG_RESULT($sysroot)
 
     IOS_SDK=`echo $platform | tr A-Z a-z`$ios_sdk
-    IOS_DEPLOYMENT_VERSION=$current_sdk_ver
+    IOS_DEPLOYMENT_VERSION=$ios_sdk
 
     # LTO is not really recommended for iOS builds,
     # the link time will be astronomical
commit a5290885cfbb289c362dbe2d993ce977f0930781
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Jan 4 20:31:43 2019 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jan 4 20:31:43 2019 +0000

    Fix trivial warning.
    
    Change-Id: Id1dd556b10e734553cc85ab4641d1a2f9bae6c82

diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx
index 9dd585081206..7cc5e994ac92 100644
--- a/vcl/source/image/Image.cxx
+++ b/vcl/source/image/Image.cxx
@@ -129,7 +129,6 @@ void Image::Draw(OutputDevice* pOutDev, const Point& rPos, DrawImageFlags nStyle
     if (!mpImplData || (!pOutDev->IsDeviceOutputNecessary() && pOutDev->GetConnectMetaFile() == nullptr))
         return;
 
-    const Point aSrcPos(0, 0);
     Size aBitmapSizePixel = mpImplData->getSizePixel();
 
     Size aOutSize = pSize ? *pSize : pOutDev->PixelToLogic(aBitmapSizePixel);