diff options
| author | adam <adam> | 2012-05-15 15:07:22 +0000 |
|---|---|---|
| committer | adam <adam> | 2012-05-15 15:07:22 +0000 |
| commit | 8d5296fd0f5f0633b87f5cfbb7e08325491a48be (patch) | |
| tree | 6da78583bd364df894525007a12033ef1dcc0b7e /devel/pango | |
| parent | ad6efe3ec9ac270b584b74e43e02efe5062fc304 (diff) | |
| download | pkgsrc-8d5296fd0f5f0633b87f5cfbb7e08325491a48be.tar.gz | |
Fix g-ir-scanner issues on Mac OS X
Diffstat (limited to 'devel/pango')
| -rw-r--r-- | devel/pango/distinfo | 5 | ||||
| -rw-r--r-- | devel/pango/patches/patch-pango_pangocoretext.h | 8 | ||||
| -rw-r--r-- | devel/pango/patches/patch-pangocairo-coretext.h | 16 |
3 files changed, 24 insertions, 5 deletions
diff --git a/devel/pango/distinfo b/devel/pango/distinfo index b0af2f1cdcf..6bc06f02837 100644 --- a/devel/pango/distinfo +++ b/devel/pango/distinfo @@ -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 --git a/devel/pango/patches/patch-pango_pangocoretext.h b/devel/pango/patches/patch-pango_pangocoretext.h index fbf7a23b322..693e6897cb1 100644 --- a/devel/pango/patches/patch-pango_pangocoretext.h +++ b/devel/pango/patches/patch-pango_pangocoretext.h @@ -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 --git a/devel/pango/patches/patch-pangocairo-coretext.h b/devel/pango/patches/patch-pangocairo-coretext.h new file mode 100644 index 00000000000..1a08f133bb8 --- /dev/null +++ b/devel/pango/patches/patch-pangocairo-coretext.h @@ -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 + |