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

When building with MAC_OS_X_VERSION_MAX_ALLOWED <
MAC_OS_X_VERSION_10_7, <CoreData/NSFetchRequest.h> does #define
NSPersistentStoreRequest NSObject (i.e. as a dummy) and does not
import <CoreData/NSPersistentStoreRequest.h>.

But <CoreData/NSIncrementalStore.h> doesn't do anything similar, it
imports <CoreData/NSPersistentStoreRequest.h> unconditionally. So if
<CoreData/NSFetchRequest.h> has already been included by then, it will
end up quite confusing.

Change-Id: I9de6885ea444a73bf5fd50aa6a3d132b9fcc2f31

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,12 @@
+@@ -27,6 +27,17 @@
  #include "pango-impl-utils.h"
  #include "modules.h"
  
@@ -74,13 +74,18 @@
 +@class NSViewController;
 +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,12 @@
+@@ -22,6 +22,17 @@
  
  #include "config.h"
  
@@ -89,6 +94,11 @@
 +@class NSViewController;
 +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>