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

Revert "Avoid confusion in 10.7 SDK headers in at least Xcode45-DP3"

Browse Source 
Nah, don't bother going down this path for now, just require
max-allowed to be equal to the SDK version...

This reverts commit abf0ff683b.

Change-Id: I0a3d765533866dad6bf604b1ebbfaef9e168f667
This commit is contained in:
Tor Lillqvist
2012-07-27 22:36:00 +03:00
parent eb9d49e605
commit 39080dfd4f
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pango/pango-1.28.3.patch
View File

@@ -65,7 +65,7 @@
# Checks for LibThai # Checks for LibThai
--- misc/pango-1.28.3/pango/pangoatsui-fontmap.c --- misc/pango-1.28.3/pango/pangoatsui-fontmap.c
+++ misc/build/pango-1.28.3/pango/pangoatsui-fontmap.c +++ misc/build/pango-1.28.3/pango/pangoatsui-fontmap.c
@@ -27,6 +27,17 @@ @@ -27,6 +27,12 @@
#include "pango-impl-utils.h" #include "pango-impl-utils.h"
#include "modules.h" #include "modules.h"
@@ -74,18 +74,13 @@
+@class NSViewController; +@class NSViewController;
+typedef int NSColorRenderingIntent; +typedef int NSColorRenderingIntent;
+#endif +#endif
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 && MACOSX_SDK_VERSION >= 1070
+// Avoid a problem in at least the XCode 4.5DP3 SDK 10.7 headers
+#import <CoreData/NSPersistentStoreRequest.h>
+#endif
+ +
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
typedef struct _FontHashKey FontHashKey; typedef struct _FontHashKey FontHashKey;
--- misc/pango-1.28.3/pango/pangocairo-atsuifont.c --- misc/pango-1.28.3/pango/pangocairo-atsuifont.c
+++ misc/build/pango-1.28.3/pango/pangocairo-atsuifont.c +++ misc/build/pango-1.28.3/pango/pangocairo-atsuifont.c
@@ -22,6 +22,17 @@ @@ -22,6 +22,12 @@
#include "config.h" #include "config.h"
@@ -94,11 +89,6 @@
+@class NSViewController; +@class NSViewController;
+typedef int NSColorRenderingIntent; +typedef int NSColorRenderingIntent;
+#endif +#endif
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 && MACOSX_SDK_VERSION >= 1070
+// Avoid a problem in at least the XCode 4.5DP3 SDK 10.7 headers
+#import <CoreData/NSPersistentStoreRequest.h>
+#endif
+ +
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>