diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-07-27 22:36:00 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-07-28 09:07:31 +0300 |
| commit | 39080dfd4f57b1c4d5cd716a661d9368bb6210a3 (patch) | |
| tree | 8c98c573a657515736cb6076c878036691c2b578 /pango | |
| parent | eb9d49e605994c08eba249f1af946845dd31b839 (diff) | |
Revert "Avoid confusion in 10.7 SDK headers in at least Xcode45-DP3"
Nah, don't bother going down this path for now, just require
max-allowed to be equal to the SDK version...
This reverts commit abf0ff683bc87fe6b2d88df0ae101d89740d6238.
Change-Id: I0a3d765533866dad6bf604b1ebbfaef9e168f667
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/pango-1.28.3.patch | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pango/pango-1.28.3.patch b/pango/pango-1.28.3.patch index ba6edcb4623d..539bef79a035 100644 --- a/pango/pango-1.28.3.patch +++ b/pango/pango-1.28.3.patch @@ -65,7 +65,7 @@ # Checks for LibThai --- misc/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 "modules.h" @@ -75,17 +75,12 @@ +typedef int NSColorRenderingIntent; +#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> typedef struct _FontHashKey FontHashKey; --- misc/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" @@ -95,11 +90,6 @@ +typedef int NSColorRenderingIntent; +#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> #include "pango-impl-utils.h" |