[pkgsrc/trunk]: pkgsrc/devel/pango Fix g-ir-scanner issues on Mac OS X

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e2ff270ec898
branches:  trunk
changeset: 603867:e2ff270ec898
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue May 15 15:07:22 2012 +0000

description:
Fix g-ir-scanner issues on Mac OS X

diffstat:

 devel/pango/distinfo                            |   5 +++--
 devel/pango/patches/patch-pango_pangocoretext.h |   8 +++++---
 devel/pango/patches/patch-pangocairo-coretext.h |  16 ++++++++++++++++
 3 files changed, 24 insertions(+), 5 deletions(-)

diffs (59 lines):

diff -r 7189689eb48b -r e2ff270ec898 devel/pango/distinfo
--- a/devel/pango/distinfo      Tue May 15 14:05:01 2012 +0000
+++ b/devel/pango/distinfo      Tue May 15 15:07:22 2012 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.92 2012/04/30 14:06:02 drochner Exp $
+$NetBSD: distinfo,v 1.93 2012/05/15 15:07:22 adam Exp $
 
 SHA1 (pango-1.30.0.tar.xz) = d49c1ef1cbbe326b5d70e32d84f7163e7064c77c
 RMD160 (pango-1.30.0.tar.xz) = b94aedbbb314ccfbc9f075ee82c8cea39a913e62
 Size (pango-1.30.0.tar.xz) = 1158224 bytes
 SHA1 (patch-aa) = 1a87d055dc722eff28517a11d0832ae19df5eb59
 SHA1 (patch-ab) = 12c09b12ba31be19fa0d602f89909811e6221bd8
-SHA1 (patch-pango_pangocoretext.h) = 0f1f4ebcbe148d29e47bfa52216e5c980bc0f8c2
+SHA1 (patch-pango_pangocoretext.h) = f842e66a712d24f4f221be5fcdae18cc13c8b84b
+SHA1 (patch-pangocairo-coretext.h) = 2f7c8efad48b58398070f48e71c16d99d3d59f57
diff -r 7189689eb48b -r e2ff270ec898 devel/pango/patches/patch-pango_pangocoretext.h
--- a/devel/pango/patches/patch-pango_pangocoretext.h   Tue May 15 14:05:01 2012 +0000
+++ b/devel/pango/patches/patch-pango_pangocoretext.h   Tue May 15 15:07:22 2012 +0000
@@ -1,15 +1,17 @@
-$NetBSD: patch-pango_pangocoretext.h,v 1.1 2012/03/05 21:02:35 adam Exp $
+$NetBSD: patch-pango_pangocoretext.h,v 1.2 2012/05/15 15:07:23 adam Exp $
 
 Use correct CoreText header on Mac OS X.
 
---- pango/pangocoretext.h.orig 2012-03-05 20:36:03.000000000 +0000
+--- pango/pangocoretext.h.orig 2011-08-16 01:11:08.000000000 +0000
 +++ pango/pangocoretext.h
-@@ -25,7 +25,7 @@
+@@ -25,7 +25,9 @@
  
  #include <pango/pango-context.h>
  #include <pango/pango-font.h>
 -#include <Carbon/Carbon.h>
++#ifndef __GI_SCANNER__
 +#include <ApplicationServices/ApplicationServices.h>
++#endif
  
  G_BEGIN_DECLS
  
diff -r 7189689eb48b -r e2ff270ec898 devel/pango/patches/patch-pangocairo-coretext.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/pango/patches/patch-pangocairo-coretext.h   Tue May 15 15:07:22 2012 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-pangocairo-coretext.h,v 1.1 2012/05/15 15:07:23 adam Exp $
+
+Let g-ir-scanner skip this header file, since it cannot inspect frameworks.
+
+--- pango/pangocairo-coretext.h.orig   2012-05-15 14:55:59.000000000 +0000
++++ pango/pangocairo-coretext.h
+@@ -25,7 +25,9 @@
+ 
+ #include "pangocoretext-private.h"
+ #include <pango/pangocairo.h>
++#ifndef __GI_SCANNER__
+ #include <cairo-quartz.h>
++#endif
+ 
+ G_BEGIN_DECLS
+