mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop workarounds for Mac OS X SDKs 10.4 and 10.5

Browse Source 
Change-Id: Ifa07f9b5613b4a75c5b72178cb276b9c0b495a62
This commit is contained in:
Tor Lillqvist
2013-04-07 03:04:31 +03:00
parent d0d2c12a54
commit 07c9bb1038
21 changed files with 23 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apple_remote/inc/apple_remote/RemoteControl.h
View File

@@ -29,16 +29,6 @@
* *
*****************************************************************************/ *****************************************************************************/
#ifndef DID_DEFINE_SOME_FUTURE_TYPES
#import <Foundation/NSObjCRuntime.h>
#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050
@class CALayer;
@class NSViewController;
typedef int NSColorRenderingIntent;
#define DID_DEFINE_SOME_FUTURE_TYPES
#endif
#endif
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
// notifaction names that are being used to signal that an application wants to // notifaction names that are being used to signal that an application wants to

10
apple_remote/inc/apple_remote/RemoteMainController.h
View File

@@ -29,16 +29,6 @@
* *
*****************************************************************************/ *****************************************************************************/
#ifndef DID_DEFINE_SOME_FUTURE_TYPES
#import <Foundation/NSObjCRuntime.h>
#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050
@class CALayer;
@class NSViewController;
typedef int NSColorRenderingIntent;
#define DID_DEFINE_SOME_FUTURE_TYPES
#endif
#endif
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#define AppleRemoteControlEvent 15 #define AppleRemoteControlEvent 15

11
apple_remote/source/AppleRemote.h
View File

@@ -29,17 +29,8 @@
* *
*****************************************************************************/ *****************************************************************************/
#ifndef DID_DEFINE_SOME_FUTURE_TYPES
#import <Foundation/NSObjCRuntime.h>
#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050
@class CALayer;
@class NSViewController;
typedef int NSColorRenderingIntent;
#define DID_DEFINE_SOME_FUTURE_TYPES
#endif
#endif
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import "HIDRemoteControlDevice.h" #import "HIDRemoteControlDevice.h"
/* Interacts with the Apple Remote Control HID device /* Interacts with the Apple Remote Control HID device

80
apple_remote/source/AppleRemote.m
View File

@@ -39,14 +39,6 @@
const char* AppleRemoteDeviceName = "AppleIRController"; const char* AppleRemoteDeviceName = "AppleIRController";
// the WWDC 07 Leopard Build is missing the constant
#ifndef NSAppKitVersionNumber10_4
#define NSAppKitVersionNumber10_4 824
#endif
#ifndef NSAppKitVersionNumber10_5
#define NSAppKitVersionNumber10_5 949
#endif
@implementation AppleRemote @implementation AppleRemote
+ (const char*) remoteControlDeviceName { + (const char*) remoteControlDeviceName {
@@ -56,60 +48,24 @@ const char* AppleRemoteDeviceName = "AppleIRController";
- (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping { - (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping {
// TODO : avoid such magics // TODO : avoid such magics
if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) { #ifdef DEBUG
#ifdef DEBUG NSLog( @"setting 10.6 cookies" );
NSLog( @"setting 10.4 cookies" ); #endif
#endif // 10.6.x Snow Leopard
// 10.4.x Tiger [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"33_31_30_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"14_12_11_6_"]; [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"33_32_30_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"14_13_11_6_"]; [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu] forKey:@"33_22_21_20_2_33_22_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu] forKey:@"14_7_6_14_7_6_"]; [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay] forKey:@"33_23_21_20_2_33_23_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay] forKey:@"14_8_6_14_8_6_"]; [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight] forKey:@"33_24_21_20_2_33_24_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight] forKey:@"14_9_6_14_9_6_"]; [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft] forKey:@"33_25_21_20_2_33_25_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft] forKey:@"14_10_6_14_10_6_"]; [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold] forKey:@"33_21_20_14_12_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold] forKey:@"14_6_4_2_"]; [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold] forKey:@"33_21_20_13_12_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold] forKey:@"14_6_3_2_"]; [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"33_21_20_2_33_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"14_6_14_6_"]; [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"37_33_21_20_2_37_33_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"18_14_6_18_14_6_"]; [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"]; [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kMetallicRemote2009ButtonPlay] forKey:@"33_21_20_8_2_33_21_20_8_2_"];
} else if( floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_5 ) { [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kMetallicRemote2009ButtonMiddlePlay] forKey:@"33_21_20_3_2_33_21_20_3_2_"];
#ifdef DEBUG [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
NSLog( @"setting 10.5 cookies" );
#endif
// 10.5.x Leopard
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"31_29_28_19_18_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"31_30_28_19_18_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu] forKey:@"31_20_19_18_31_20_19_18_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay] forKey:@"31_21_19_18_31_21_19_18_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight] forKey:@"31_22_19_18_31_22_19_18_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft] forKey:@"31_23_19_18_31_23_19_18_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold] forKey:@"31_19_18_4_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold] forKey:@"31_19_18_3_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"31_19_18_31_19_18_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"35_31_19_18_35_31_19_18_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
}
else
{
#ifdef DEBUG
NSLog( @"setting 10.6 cookies" );
#endif
// 10.6.x Snow Leopard
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"33_31_30_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"33_32_30_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu] forKey:@"33_22_21_20_2_33_22_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay] forKey:@"33_23_21_20_2_33_23_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight] forKey:@"33_24_21_20_2_33_24_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft] forKey:@"33_25_21_20_2_33_25_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold] forKey:@"33_21_20_14_12_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold] forKey:@"33_21_20_13_12_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"33_21_20_2_33_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"37_33_21_20_2_37_33_21_20_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kMetallicRemote2009ButtonPlay] forKey:@"33_21_20_8_2_33_21_20_8_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kMetallicRemote2009ButtonMiddlePlay] forKey:@"33_21_20_3_2_33_21_20_3_2_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
}
} }
- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown { - (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {

12
apple_remote/source/KeyspanFrontRowControl.h
View File

@@ -29,18 +29,8 @@
* *
*****************************************************************************/ *****************************************************************************/
#ifndef DID_DEFINE_SOME_FUTURE_TYPES
#import <Foundation/NSObjCRuntime.h>
#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050
@class CALayer;
@class NSViewController;
typedef int NSColorRenderingIntent;
#define DID_DEFINE_SOME_FUTURE_TYPES
#endif
#endif
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import "HIDRemoteControlDevice.h" #import "HIDRemoteControlDevice.h"
/* Interacts with the Keyspan FrontRow Remote Control HID device /* Interacts with the Keyspan FrontRow Remote Control HID device

9
extensions/source/macosx/spotlight/GetMetadataForFile.m
View File

@@ -17,21 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#import <Foundation/NSObjCRuntime.h>
#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050
@class CALayer;
@class NSViewController;
typedef int NSColorRenderingIntent;
#endif
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <CoreServices/CoreServices.h> #include <CoreServices/CoreServices.h>
#include <Foundation/Foundation.h> #include <Foundation/Foundation.h>
#import "OOoSpotlightImporter.h" #import "OOoSpotlightImporter.h"
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Get metadata attributes from file Get metadata attributes from file

1
extensions/source/macosx/spotlight/OOoContentDataParser.h
View File

@@ -19,7 +19,6 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
@interface OOoContentDataParser : NSObject { @interface OOoContentDataParser : NSObject {
// indicates if we are interested in an element's content // indicates if we are interested in an element's content
BOOL shouldReadCharacters; BOOL shouldReadCharacters;

6
extensions/source/macosx/spotlight/OOoContentDataParser.m
View File

@@ -18,12 +18,6 @@
*/ */
#include <objc/objc-runtime.h> #include <objc/objc-runtime.h>
#import <Foundation/NSObjCRuntime.h>
#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050
@class CALayer;
@class NSViewController;
typedef int NSColorRenderingIntent;
#endif
#import "OOoContentDataParser.h" #import "OOoContentDataParser.h"

6
extensions/source/macosx/spotlight/OOoMetaDataParser.m
View File

@@ -18,12 +18,6 @@
*/ */
#include <objc/objc-runtime.h> #include <objc/objc-runtime.h>
#import <Foundation/NSObjCRuntime.h>
#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050
@class CALayer;
@class NSViewController;
typedef int NSColorRenderingIntent;
#endif
#import "OOoMetaDataParser.h" #import "OOoMetaDataParser.h"

8
extensions/source/macosx/spotlight/OOoSpotlightImporter.m
View File

@@ -17,14 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#import <Foundation/NSObjCRuntime.h>
#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050
@class CALayer;
@class NSViewController;
typedef int NSColorRenderingIntent;
#endif
#import <zlib.h> #import <zlib.h>
#import "OOoSpotlightImporter.h" #import "OOoSpotlightImporter.h"
#import "OOoMetaDataParser.h" #import "OOoMetaDataParser.h"
#import "OOoContentDataParser.h" #import "OOoContentDataParser.h"

2
nss/ExternalProject_nss.mk
View File

@@ -72,7 +72,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X,$(CPU)),USE_64=1)) \ $(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X,$(CPU)),USE_64=1)) \
$(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \ $(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
$(if $(filter 1060 1070 1080,$(MAC_OS_X_VERSION_MIN_REQUIRED)),NSS_USE_SYSTEM_SQLITE=1)) \ NSS_USE_SYSTEM_SQLITE=1) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(filter YES,$(CROSS_COMPILING)),\ $(if $(filter YES,$(CROSS_COMPILING)),\
NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/nss/nsinstall.py") \ NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/nss/nsinstall.py") \

14
scp2/source/ooo/file_library_ooo.scp
View File

@@ -1213,20 +1213,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_Softokn3,softokn3)
SPECIAL_LIB_FILE(gid_File_Lib_Smime3,smime3) SPECIAL_LIB_FILE(gid_File_Lib_Smime3,smime3)
#ifdef WNT #ifdef WNT
SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3) SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3)
#else
/*
For MacOSX >= 10.6 we can apparently use the system sqlite.
For MacOSX 10.4 we've delivered sqlite into a sqlite subdir for the duration
of the build to avoid #i106132#. Now we need to put it into the program dir of
the install.
*/
#if !defined(MACOSX) || (MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
File gid_File_Lib_Sqlite3
Name = "sqlite/" SPECIAL_NAME(sqlite3);
PACKED_LIB_FILE_BODY;
End
#endif //!defined(MACOSX) || (MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
#endif //WNT #endif //WNT
SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3) SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3)
#endif //SYSTEM_NSS #endif //SYSTEM_NSS

8
slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m
View File

@@ -26,16 +26,8 @@
* *
************************************************************************/ ************************************************************************/
#import <Foundation/NSObjCRuntime.h>
#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050
@class CALayer;
@class NSViewController;
typedef int NSColorRenderingIntent;
#endif
#import "OGLTrans_Shaders.h" #import "OGLTrans_Shaders.h"
@implementation OGLShaders @implementation OGLShaders
- (id) init - (id) init

7
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
View File

@@ -26,13 +26,6 @@
* *
************************************************************************/ ************************************************************************/
#import <Foundation/NSObjCRuntime.h>
#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050
@class CALayer;
@class NSViewController;
typedef int NSColorRenderingIntent;
#endif
#include "OGLTrans_TransitionImpl.hxx" #include "OGLTrans_TransitionImpl.hxx"
#include "OGLTrans_Shaders.h" #include "OGLTrans_Shaders.h"
#include <OpenGL/gl.h> #include <OpenGL/gl.h>

12
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
View File

@@ -205,19 +205,11 @@ private:
/** OpenGL handle to the leaving slide's texture /** OpenGL handle to the leaving slide's texture
*/ */
#if defined(MAC_OS_X_VERSION_10_5) || defined(MAC_OS_X_VERSION_10_6)
GLuint GLleavingSlide; GLuint GLleavingSlide;
#else /* build target 10.4 */
unsigned long int GLleavingSlide;
#endif
/** OpenGL handle to the entering slide's texture /** OpenGL handle to the entering slide's texture
*/ */
#if defined(MAC_OS_X_VERSION_10_5) || defined(MAC_OS_X_VERSION_10_6)
GLuint GLenteringSlide; GLuint GLenteringSlide;
#else /* build target 10.4 */
unsigned long int GLenteringSlide;
#endif
/** pointer to our window which we MIGHT create. /** pointer to our window which we MIGHT create.
*/ */
@@ -782,11 +774,7 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeExc
static_cast<double>(GLWin.Height) ); static_cast<double>(GLWin.Height) );
*/ */
// works but not mandatory // works but not mandatory
#if defined(MAC_OS_X_VERSION_10_5)
GLint swapInt = 1; GLint swapInt = 1;
#else /* build target 10.4 */
long swapInt = 1;
#endif
[[GLWin.pAquaOpenGLView openGLContext] setValues:&swapInt forParameter:NSOpenGLCPSwapInterval]; // set to vbl sync [[GLWin.pAquaOpenGLView openGLContext] setValues:&swapInt forParameter:NSOpenGLCPSwapInterval]; // set to vbl sync
NSOpenGLContext* context = [GLWin.pAquaOpenGLView openGLContext]; NSOpenGLContext* context = [GLWin.pAquaOpenGLView openGLContext];

12
slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
View File

@@ -3,13 +3,6 @@
* aquaOpenGLView.m * aquaOpenGLView.m
*/ */
#import <Foundation/NSObjCRuntime.h>
#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050
@class CALayer;
@class NSViewController;
typedef int NSColorRenderingIntent;
#endif
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
#include <OpenGL/OpenGL.h> #include <OpenGL/OpenGL.h>
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
@@ -81,12 +74,7 @@ typedef int NSColorRenderingIntent;
- (void)prepareOpenGL - (void)prepareOpenGL
{ {
// for overriding to initialize OpenGL state, occurs after context creation // for overriding to initialize OpenGL state, occurs after context creation
#if MACOSX_SDK_VERSION < 1050
long swapInt = 1;
#else
GLint swapInt = 1; GLint swapInt = 1;
#endif
[[self openGLContext] setValues:&swapInt forParameter:NSOpenGLCPSwapInterval]; // set to vbl sync [[self openGLContext] setValues:&swapInt forParameter:NSOpenGLCPSwapInterval]; // set to vbl sync

1
solenv/gbuild/platform/macosx.mk
View File

@@ -88,7 +88,6 @@ gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
gb_OBJCFLAGS := -x objective-c -fobjc-exceptions gb_OBJCFLAGS := -x objective-c -fobjc-exceptions
gb_LinkTarget_LDFLAGS := \ gb_LinkTarget_LDFLAGS := \
$(if $(filter 1040 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),-Wl$(COMMA)-syslibroot$(COMMA)$(gb_SDKDIR)) \
$(SOLARLIB) \ $(SOLARLIB) \
#man ld says: obsolete -Wl,-multiply_defined,suppress \ #man ld says: obsolete -Wl,-multiply_defined,suppress \

15
solenv/inc/premac.h
View File

@@ -47,19 +47,4 @@
#define StringPtr MacOSStringPtr #define StringPtr MacOSStringPtr
#define TimeValue MacOSTimeValue #define TimeValue MacOSTimeValue
#ifdef __OBJC__
#import <Foundation/NSObjCRuntime.h>
#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050
@class CALayer;
@class NSViewController;
typedef int NSColorRenderingIntent;
#endif
#endif
#if defined(MACOSX_SDK_VERSION) && MACOSX_SDK_VERSION < 1050
typedef float CGFloat;
typedef int NSInteger;
typedef unsigned NSUInteger;
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

24
vcl/aqua/source/gdi/atsui/salgdi.cxx
View File

@@ -452,21 +452,9 @@ static bool AddTempFontDir( const char* pDir )
ATSFontContainerRef aATSFontContainer; ATSFontContainerRef aATSFontContainer;
const ATSFontContext eContext = kATSFontContextLocal; // TODO: *Global??? const ATSFontContext eContext = kATSFontContextLocal; // TODO: *Global???
#if defined(MAC_OS_X_VERSION_10_5) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)
eStatus = ::ATSFontActivateFromFileReference( &aPathFSRef, eStatus = ::ATSFontActivateFromFileReference( &aPathFSRef,
eContext, kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault, eContext, kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault,
&aATSFontContainer ); &aATSFontContainer );
#else
FSSpec aPathFSSpec;
eStatus = ::FSGetCatalogInfo( &aPathFSRef, kFSCatInfoNone,
NULL, NULL, &aPathFSSpec, NULL );
if( eStatus != noErr )
return false;
eStatus = ::ATSFontActivateFromFileSpecification( &aPathFSSpec,
eContext, kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault,
&aATSFontContainer );
#endif
if( eStatus != noErr ) if( eStatus != noErr )
return false; return false;
@@ -541,21 +529,9 @@ bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*,
ATSFontContainerRef oContainer; ATSFontContainerRef oContainer;
const ATSFontContext eContext = kATSFontContextLocal; // TODO: *Global??? const ATSFontContext eContext = kATSFontContextLocal; // TODO: *Global???
#if defined(MAC_OS_X_VERSION_10_5) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)
eStatus = ::ATSFontActivateFromFileReference( &aNewRef, eStatus = ::ATSFontActivateFromFileReference( &aNewRef,
eContext, kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault, eContext, kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault,
&oContainer ); &oContainer );
#else
FSSpec aFontFSSpec;
eStatus = ::FSGetCatalogInfo( &aNewRef, kFSCatInfoNone,
NULL, NULL, &aFontFSSpec, NULL );
if( eStatus != noErr )
return false;
eStatus = ::ATSFontActivateFromFileSpecification( &aFontFSSpec,
eContext, kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault,
&oContainer );
#endif
if( eStatus != noErr ) if( eStatus != noErr )
return false; return false;

4
vcl/aqua/source/window/salframeview.mm
View File

@@ -1587,11 +1587,7 @@ private:
return 0; return 0;
} }
#if MACOSX_SDK_VERSION < 1050
- (long)conversationIdentifier
#else
- (NSInteger)conversationIdentifier - (NSInteger)conversationIdentifier
#endif
{ {
return (long)self; return (long)self;
} }

13
vcl/coretext/salcoretextfontutils.cxx
View File

@@ -45,17 +45,6 @@ static bool GetDevFontAttributes( CTFontDescriptorRef font_descriptor, ImplDevFo
rDFA.mbDevice = true; rDFA.mbDevice = true;
rDFA.mnQuality = 0; rDFA.mnQuality = 0;
#if defined(MACOSX) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060
CTFontRef font = CTFontCreateWithFontDescriptor(font_descriptor, 0.0, NULL);
CFDataRef rHeadTable = CTFontCopyTable(font, kCTFontTableHead, kCTFontTableOptionNoOptions);
CFRelease(font);
if(!rHeadTable || CFDataGetLength(rHeadTable) == 0)
{
SafeCFRelease(rHeadTable);
return false;
}
CFRelease(rHeadTable);
#else
CFNumberRef format = (CFNumberRef)CTFontDescriptorCopyAttribute(font_descriptor, kCTFontFormatAttribute); CFNumberRef format = (CFNumberRef)CTFontDescriptorCopyAttribute(font_descriptor, kCTFontFormatAttribute);
CFNumberGetValue(format, kCFNumberIntType, &value); CFNumberGetValue(format, kCFNumberIntType, &value);
CFRelease(format); CFRelease(format);
@@ -65,7 +54,7 @@ static bool GetDevFontAttributes( CTFontDescriptorRef font_descriptor, ImplDevFo
/* we don't want bitmap fonts */ /* we don't want bitmap fonts */
return false; return false;
} }
#endif
rDFA.mbSubsettable = true; rDFA.mbSubsettable = true;
rDFA.mbEmbeddable = false; rDFA.mbEmbeddable = false;