set_soenv.in | 8 ++++++-- vcl/aqua/source/gdi/salprn.cxx | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-)
New commits: commit 603a37eb46a5ed08d3c9c9b342386705cbd00109 Author: Herbert Dürr <[email protected]> Date: Tue Oct 21 07:43:39 2014 +0000 #i125776# handle OSX SDK 10.9 changes regarding NSPrintingOrientation -> NSPaperOrientation SDK 10.9 changed the NSPrintInfo::orientation method to take a parameter of type NSPaperOrientation (i.e. enum) instead of NSPrintingOrientation (i.e. NSUInteger). The actual values are the same so the binaries work fine on older and newer platforms, but the type mismatch on the newer SDK would break the build. diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index ae5edf5..2d6a496 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -76,8 +76,13 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) : { mpPrintInfo = [pShared copy]; [mpPrintInfo setPrinter: mpPrinter]; +#ifdef __MAC_10_9 // code for SDK 10.9 or newer + mePageOrientation = ([mpPrintInfo orientation] == NSPaperOrientationLandscape) ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT; + [mpPrintInfo setOrientation: NSPaperOrientationPortrait]; +#else // code for SDK 10.8 or older mePageOrientation = ([mpPrintInfo orientation] == NSLandscapeOrientation) ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT; [mpPrintInfo setOrientation: NSPortraitOrientation]; +#endif } mpGraphics = new AquaSalGraphics(); commit 2786d200b010a44a41a9453bfb56f0e41358422e Author: Jürgen Schmidt <[email protected]> Date: Tue Oct 21 07:25:11 2014 +0000 #125776# adapt STL include path for Xcode 6 diff --git a/set_soenv.in b/set_soenv.in index 5cd279f..ae70515 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1482,8 +1482,12 @@ elsif ($platform =~ m/darwin/) { $FRAMEWORKSHOME = "@MACOSX_SDK_PATH@/System/Library/Frameworks"; chomp( my $TOOLSPATH = `xcode-select --print-path` ); - my $STLINC .= $I."$TOOLSPATH/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/"; - $SOLARINC .= $STLINC . $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers"; + my $STLINC = "$TOOLSPATH/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/"; + if ( !(-e $STLINC) && !(-d $STLINC) ) { + # Xcode 5 + $STLINC = "$TOOLSPATH/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/"; + } + $SOLARINC .= $I.$STLINC . $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers"; $GUIBASE = "aqua"; } else
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
