[Libreoffice-commits] .: 2 commits - pango/pango-1.28.3.patch solenv/gbuild solenv/inc

[Tor Lillqvist]

 pango/pango-1.28.3.patch         |   14 ++++++++++++--
 solenv/gbuild/platform/macosx.mk |    1 +
 solenv/inc/unxmacx.mk            |    2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit abf0ff683bc87fe6b2d88df0ae101d89740d6238
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jul 23 16:27:57 2012 +0300

    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

diff --git a/pango/pango-1.28.3.patch b/pango/pango-1.28.3.patch
index 539bef7..ba6edcb 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,12 @@
+@@ -27,6 +27,17 @@
  #include "pango-impl-utils.h"
  #include "modules.h"
  
@@ -75,12 +75,17 @@
 +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"
  
@@ -90,6 +95,11 @@
 +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"
commit 59fa9d92972e60ef5d7278454d584dae582401c0
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jul 23 16:26:38 2012 +0300

    Define also MACOSX_SDK_VERSION in compilations
    
    Change-Id: I1f9810b1230c4e3e5ca0571e5392297c1daf6a47

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 425c7d6..084c4c0 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -44,6 +44,7 @@ gb_OSDEFS := \
 	-DQUARTZ \
 	-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) \
 	-DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) \
+	-DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) \
 	$(EXTRA_CDEFS) \
 
 
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 1a7c891..a5ea287 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -49,7 +49,7 @@ CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFI
 #.EXPORT: MACOSX_DEPLOYMENT_TARGET
 CDEFS+:=-DQUARTZ
 
-EXTRA_CDEFS+:=-isysroot $(MACOSX_SDK_PATH)  -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED)
+EXTRA_CDEFS+:=-isysroot $(MACOSX_SDK_PATH)  -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION)
 
 # Name of library where static data members are initialized
 # STATICLIBNAME=static$(DLLPOSTFIX)