[Libreoffice-commits] core.git: 2 commits - configure.ac vcl/ios

[Tor Lillqvist]

 configure.ac        |    4 ++--
 vcl/ios/iosinst.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a84fd7d3a2ea36072154ae6b43cccec5dcce6e3f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Dec 16 11:43:26 2015 +0200

    SvpSalFrame ctor parameter list has changed
    
    Change-Id: Ide3457c5baab3d7f84990f6c2311975002ba9f18

diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index f6ed871..8a0e249 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -89,7 +89,7 @@ public:
                      SalFrameStyleFlags  nSalFrameStyle,
                      SystemParentData   *pSysParent )
         : SvpSalFrame( pInstance, pParent, nSalFrameStyle,
-                       true, basebmp::Format::ThirtyTwoBitTcMaskRGBA,
+                       basebmp::Format::ThirtyTwoBitTcMaskRGBA,
                        pSysParent )
     {
         if (pParent == NULL && viewWidth > 1 && viewHeight > 1)
commit 56dabd64bcac51cbc75b6144fff1fb33860abb54
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Dec 16 10:25:26 2015 +0200

    Look for iOS SDK 9.2, too
    
    Change-Id: I2e16ae2ecb5f3a2a37c795e5ee26f72fc92b25bc

diff --git a/configure.ac b/configure.ac
index 157e7bc..49198a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3062,8 +3062,8 @@ if test $_os = iOS; then
 
     xcode_developer=`xcode-select -print-path`
 
-    current_sdk_ver=8.3
-    for sdkver in 9.1 9.0 8.4 8.3 8.2 8.1 8.0; do
+    current_sdk_ver=9.2
+    for sdkver in 9.2 9.1 9.0 8.4 8.3 8.2 8.1 8.0; do
         t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
         if test -d $t; then
             ios_sdk=$sdkver