Add a workaround for GNOME bug 342079, so that graphics/cairo can enable

the atsui backend.

2 files changed, 114 insertions, 1 deletions

diff --git a/devel/pango/distinfo b/devel/pango/distinfo
index 3785ae19225..12a12607071 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.37 2006/05/29 17:08:43 drochner Exp $
+$NetBSD: distinfo,v 1.38 2006/07/23 05:07:55 minskim Exp $
 
 SHA1 (pango-1.12.3.tar.bz2) = ad493c4560c0ffd9dcdb8a1724d5bff058ef112c
 RMD160 (pango-1.12.3.tar.bz2) = 7692828276e9b5a54b0b8c32fa07d7db6ac45bed
 Size (pango-1.12.3.tar.bz2) = 1226579 bytes
 SHA1 (patch-aa) = 775b7e995770983e73fdecd38b6e2dc069950ccc
 SHA1 (patch-ab) = df812b166f944a549d09953e59a0689ae4f708b6
+SHA1 (patch-ac) = 9528f077acd00264a350cce0daaccd2fa0e7fb4c
diff --git a/devel/pango/patches/patch-ac b/devel/pango/patches/patch-ac
new file mode 100644
index 00000000000..e868f9abfc2
--- /dev/null
+++ b/devel/pango/patches/patch-ac
@@ -0,0 +1,112 @@
+$NetBSD: patch-ac,v 1.10 2006/07/23 05:07:55 minskim Exp $
+
+http://bugzilla.gnome.org/show_bug.cgi?id=342079
+
+--- pango/pangoatsui-private.h.orig	2006-07-22 22:02:02.000000000 -0700
++++ pango/pangoatsui-private.h
+@@ -0,0 +1,105 @@
++/* Pango
++ * pangoatsui-private.h:
++ *
++ * Copyright (C) 2003 Red Hat Software
++ * Copyright (C) 2005 Imendio AB
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#ifndef __PANGOATSUI_PRIVATE_H__
++#define __PANGOATSUI_PRIVATE_H__
++
++#include <pango/pango-fontmap.h>
++#include <pango/pango-context.h>
++
++G_BEGIN_DECLS
++
++#define PANGO_TYPE_ATSUI_FONT_MAP             (pango_atsui_font_map_get_type ())
++#define PANGO_ATSUI_FONT_MAP(object)          (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_ATSUI_FONT_MAP, PangoATSUIFontMap))
++#define PANGO_ATSUI_IS_FONT_MAP(object)       (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_ATSUI_FONT_MAP))
++#define PANGO_ATSUI_FONT_MAP_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_ATSUI_FONT_MAP, PangoATSUIFontMapClass))
++#define PANGO_IS_ATSUI_FONT_MAP_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_ATSUI_FONT_MAP))
++#define PANGO_ATSUI_FONT_MAP_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_ATSUI_FONT_MAP, PangoATSUIFontMapClass))
++
++#define PANGO_TYPE_ATSUI_FONT            (pango_atsui_font_get_type ())
++#define PANGO_ATSUI_FONT(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_ATSUI_FONT, PangoATSUIFont))
++#define PANGO_ATSUI_FONT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_ATSUI_FONT, PangoATSUIFontClass))
++#define PANGO_ATSUI_IS_FONT(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_ATSUI_FONT))
++#define PANGO_ATSUI_IS_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_ATSUI_FONT))
++#define PANGO_ATSUI_FONT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_ATSUI_FONT, PangoATSUIFontClass))
++
++#define PANGO_RENDER_TYPE_ATSUI "PangoRenderATSUI"
++
++typedef struct _PangoATSUIFontMap      PangoATSUIFontMap;
++typedef struct _PangoATSUIFontMapClass PangoATSUIFontMapClass;
++typedef struct _PangoATSUIFont         PangoATSUIFont;
++typedef struct _PangoATSUIFontClass    PangoATSUIFontClass;
++
++struct _PangoATSUIFontMap
++{
++  PangoFontMap parent_instance;
++
++  GHashTable *font_hash;
++
++  GHashTable *families;
++};
++
++struct _PangoATSUIFontMapClass
++{
++  PangoFontMapClass parent_class;
++
++  gconstpointer (*context_key_get)   (PangoATSUIFontMap             *atsuifontmap,
++				      PangoContext               *context);
++  gpointer     (*context_key_copy)   (PangoATSUIFontMap             *atsuifontmap,
++				      gconstpointer               key);
++  void         (*context_key_free)   (PangoATSUIFontMap             *atsuifontmap,
++				      gpointer                    key);
++  guint32      (*context_key_hash)   (PangoATSUIFontMap             *atsuifontmap,
++				      gconstpointer               key);
++  gboolean     (*context_key_equal)  (PangoATSUIFontMap             *atsuifontmap,
++				      gconstpointer               key_a,
++				      gconstpointer               key_b);
++
++  PangoATSUIFont * (* create_font) (PangoATSUIFontMap          *fontmap,
++				    PangoContext               *context,
++				    const char                 *postscript_name,
++				    const PangoFontDescription *desc);
++};
++
++struct _PangoATSUIFont
++{
++  PangoFont parent_instance;
++
++  char *postscript_name;
++  PangoFontDescription *desc;
++  PangoMatrix matrix;
++  gpointer context_key;
++
++  PangoFontMap *fontmap;
++};
++
++struct _PangoATSUIFontClass
++{
++  PangoFontClass parent_class;
++};
++
++GType pango_atsui_font_map_get_type (void);
++GType pango_atsui_font_get_type (void);
++
++G_END_DECLS
++
++#endif /* __PANGOATSUI_H__ */