[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2024: some pango fixes (bug 3548)
Mats Wichmann
mats at linuxfoundation.org
Thu Dec 13 18:36:00 UTC 2012
------------------------------------------------------------
revno: 2024
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Thu 2012-12-13 11:36:00 -0700
message:
some pango fixes (bug 3548)
modified:
headers/All/3.1/pango-1.0/pango/pangoxft.h.defs
headers/All/3.2/pango-1.0/pango/pangoxft.h.defs
headers/All/4.0/pango-1.0/pango/pangoxft.h.defs
headers/All/4.1/pango-1.0/pango/pangoxft.h.defs
headers/All/5.0/pango-1.0/pango/pangoxft.h.defs
headers/X11/Xft/Xft.h
headers/pango-1.0/pango/pangocairo.h
headers/pango-1.0/pango/pangofc-decoder.h
headers/pango-1.0/pango/pangoft2.h
headers/pango-1.0/pango/pangoxft.h
package/Makefile
-------------- next part --------------
=== modified file 'headers/All/3.1/pango-1.0/pango/pangoxft.h.defs'
--- a/headers/All/3.1/pango-1.0/pango/pangoxft.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/3.1/pango-1.0/pango/pangoxft.h.defs 2012-12-13 18:36:00 +0000
@@ -1,22 +1,50 @@
+#define PANGO_XFT_RENDERER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRendererClass))
+#define PANGO_IS_XFT_RENDERER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_XFT_RENDERER))
#define PANGO_XFT_FONT(object) \
(G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT, \
PangoXftFont))
#define PANGO_XFT_FONT_MAP(object) \
(G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT_MAP, \
PangoXftFontMap))
+#define PANGO_XFT_RENDERER(object) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRenderer))
#define PANGO_XFT_IS_FONT(object) \
(G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT))
#define PANGO_XFT_IS_FONT_MAP(object) \
(G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT_MAP))
+#define PANGO_IS_XFT_RENDERER(object) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_RENDERER))
+#define PANGO_XFT_RENDERER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRendererClass))
#define PANGO_TYPE_XFT_FONT (pango_xft_font_get_type ())
#define PANGO_TYPE_XFT_FONT_MAP (pango_xft_font_map_get_type ())
+#define PANGO_TYPE_XFT_RENDERER (pango_xft_renderer_get_type())
#define PANGO_RENDER_TYPE_XFT "PangoRenderXft"
+typedef struct _PangoXftRenderer PangoXftRenderer;
typedef void (*PangoXftSubstituteFunc) (FcPattern * pattern,
gpointer data);
typedef struct _PangoXftFontMap PangoXftFontMap;
+typedef struct _PangoXftRendererClass {
+ PangoRendererClass parent_class;
+ void (*composite_trapezoids) (PangoXftRenderer * xftrenderer,
+ PangoRenderPart part,
+ XTrapezoid * trapezoids,
+ int n_trapezoids);
+ void (*composite_glyphs) (PangoXftRenderer * xftrenderer,
+ XftFont * xft_font, XftGlyphSpec * glyphs,
+ int n_glyphs);
+} PangoXftRendererClass;
+typedef struct _PangoFcFontClass PangoFcFontClass;
+typedef struct _PangoFcFont PangoFcFont;
typedef struct _PangoXftFont PangoXftFont;
+typedef struct _PangoXftRendererPrivate PangoXftRendererPrivate;
extern GType pango_xft_font_get_type(void);
extern GType pango_xft_font_map_get_type(void);
extern PangoContext *pango_xft_get_context(Display * display, int screen);
@@ -27,6 +55,28 @@
PangoFont * font,
PangoGlyphString * glyphs, gint x,
gint y);
+extern void pango_xft_render(XftDraw * draw, XftColor * color,
+ PangoFont * font, PangoGlyphString * glyphs,
+ gint x, gint y);
+extern void pango_xft_render_layout(XftDraw * draw, XftColor * color,
+ PangoLayout * layout, int x, int y);
+extern void pango_xft_render_layout_line(XftDraw * draw, XftColor * color,
+ PangoLayoutLine * line, int x,
+ int y);
+extern void pango_xft_render_transformed(XftDraw * draw, XftColor * color,
+ PangoMatrix * matrix,
+ PangoFont * font,
+ PangoGlyphString * glyphs, int x,
+ int y);
+extern GType pango_xft_renderer_get_type(void);
+extern PangoRenderer *pango_xft_renderer_new(Display * display,
+ int screen);
+extern void pango_xft_renderer_set_default_color(PangoXftRenderer *
+ xftrenderer,
+ PangoColor *
+ default_color);
+extern void pango_xft_renderer_set_draw(PangoXftRenderer * xftrenderer,
+ XftDraw * draw);
extern void pango_xft_set_default_substitute(Display * display, int screen,
PangoXftSubstituteFunc func,
gpointer data,
=== modified file 'headers/All/3.2/pango-1.0/pango/pangoxft.h.defs'
--- a/headers/All/3.2/pango-1.0/pango/pangoxft.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/3.2/pango-1.0/pango/pangoxft.h.defs 2012-12-13 18:36:00 +0000
@@ -1,22 +1,50 @@
+#define PANGO_XFT_RENDERER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRendererClass))
+#define PANGO_IS_XFT_RENDERER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_XFT_RENDERER))
#define PANGO_XFT_FONT(object) \
(G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT, \
PangoXftFont))
#define PANGO_XFT_FONT_MAP(object) \
(G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT_MAP, \
PangoXftFontMap))
+#define PANGO_XFT_RENDERER(object) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRenderer))
#define PANGO_XFT_IS_FONT(object) \
(G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT))
#define PANGO_XFT_IS_FONT_MAP(object) \
(G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT_MAP))
+#define PANGO_IS_XFT_RENDERER(object) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_RENDERER))
+#define PANGO_XFT_RENDERER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRendererClass))
#define PANGO_TYPE_XFT_FONT (pango_xft_font_get_type ())
#define PANGO_TYPE_XFT_FONT_MAP (pango_xft_font_map_get_type ())
+#define PANGO_TYPE_XFT_RENDERER (pango_xft_renderer_get_type())
#define PANGO_RENDER_TYPE_XFT "PangoRenderXft"
+typedef struct _PangoXftRenderer PangoXftRenderer;
typedef void (*PangoXftSubstituteFunc) (FcPattern * pattern,
gpointer data);
typedef struct _PangoXftFontMap PangoXftFontMap;
+typedef struct _PangoXftRendererClass {
+ PangoRendererClass parent_class;
+ void (*composite_trapezoids) (PangoXftRenderer * xftrenderer,
+ PangoRenderPart part,
+ XTrapezoid * trapezoids,
+ int n_trapezoids);
+ void (*composite_glyphs) (PangoXftRenderer * xftrenderer,
+ XftFont * xft_font, XftGlyphSpec * glyphs,
+ int n_glyphs);
+} PangoXftRendererClass;
+typedef struct _PangoFcFontClass PangoFcFontClass;
+typedef struct _PangoFcFont PangoFcFont;
typedef struct _PangoXftFont PangoXftFont;
+typedef struct _PangoXftRendererPrivate PangoXftRendererPrivate;
extern GType pango_xft_font_get_type(void);
extern GType pango_xft_font_map_get_type(void);
extern PangoContext *pango_xft_get_context(Display * display, int screen);
@@ -27,6 +55,28 @@
PangoFont * font,
PangoGlyphString * glyphs, gint x,
gint y);
+extern void pango_xft_render(XftDraw * draw, XftColor * color,
+ PangoFont * font, PangoGlyphString * glyphs,
+ gint x, gint y);
+extern void pango_xft_render_layout(XftDraw * draw, XftColor * color,
+ PangoLayout * layout, int x, int y);
+extern void pango_xft_render_layout_line(XftDraw * draw, XftColor * color,
+ PangoLayoutLine * line, int x,
+ int y);
+extern void pango_xft_render_transformed(XftDraw * draw, XftColor * color,
+ PangoMatrix * matrix,
+ PangoFont * font,
+ PangoGlyphString * glyphs, int x,
+ int y);
+extern GType pango_xft_renderer_get_type(void);
+extern PangoRenderer *pango_xft_renderer_new(Display * display,
+ int screen);
+extern void pango_xft_renderer_set_default_color(PangoXftRenderer *
+ xftrenderer,
+ PangoColor *
+ default_color);
+extern void pango_xft_renderer_set_draw(PangoXftRenderer * xftrenderer,
+ XftDraw * draw);
extern void pango_xft_set_default_substitute(Display * display, int screen,
PangoXftSubstituteFunc func,
gpointer data,
=== modified file 'headers/All/4.0/pango-1.0/pango/pangoxft.h.defs'
--- a/headers/All/4.0/pango-1.0/pango/pangoxft.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/4.0/pango-1.0/pango/pangoxft.h.defs 2012-12-13 18:36:00 +0000
@@ -1,22 +1,50 @@
+#define PANGO_XFT_RENDERER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRendererClass))
+#define PANGO_IS_XFT_RENDERER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_XFT_RENDERER))
#define PANGO_XFT_FONT(object) \
(G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT, \
PangoXftFont))
#define PANGO_XFT_FONT_MAP(object) \
(G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT_MAP, \
PangoXftFontMap))
+#define PANGO_XFT_RENDERER(object) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRenderer))
#define PANGO_XFT_IS_FONT(object) \
(G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT))
#define PANGO_XFT_IS_FONT_MAP(object) \
(G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT_MAP))
+#define PANGO_IS_XFT_RENDERER(object) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_RENDERER))
+#define PANGO_XFT_RENDERER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRendererClass))
#define PANGO_TYPE_XFT_FONT (pango_xft_font_get_type ())
#define PANGO_TYPE_XFT_FONT_MAP (pango_xft_font_map_get_type ())
+#define PANGO_TYPE_XFT_RENDERER (pango_xft_renderer_get_type())
#define PANGO_RENDER_TYPE_XFT "PangoRenderXft"
+typedef struct _PangoXftRenderer PangoXftRenderer;
typedef void (*PangoXftSubstituteFunc) (FcPattern * pattern,
gpointer data);
typedef struct _PangoXftFontMap PangoXftFontMap;
+typedef struct _PangoXftRendererClass {
+ PangoRendererClass parent_class;
+ void (*composite_trapezoids) (PangoXftRenderer * xftrenderer,
+ PangoRenderPart part,
+ XTrapezoid * trapezoids,
+ int n_trapezoids);
+ void (*composite_glyphs) (PangoXftRenderer * xftrenderer,
+ XftFont * xft_font, XftGlyphSpec * glyphs,
+ int n_glyphs);
+} PangoXftRendererClass;
+typedef struct _PangoFcFontClass PangoFcFontClass;
+typedef struct _PangoFcFont PangoFcFont;
typedef struct _PangoXftFont PangoXftFont;
+typedef struct _PangoXftRendererPrivate PangoXftRendererPrivate;
extern GType pango_xft_font_get_type(void);
extern GType pango_xft_font_map_get_type(void);
extern PangoContext *pango_xft_get_context(Display * display, int screen);
@@ -27,6 +55,28 @@
PangoFont * font,
PangoGlyphString * glyphs, gint x,
gint y);
+extern void pango_xft_render(XftDraw * draw, XftColor * color,
+ PangoFont * font, PangoGlyphString * glyphs,
+ gint x, gint y);
+extern void pango_xft_render_layout(XftDraw * draw, XftColor * color,
+ PangoLayout * layout, int x, int y);
+extern void pango_xft_render_layout_line(XftDraw * draw, XftColor * color,
+ PangoLayoutLine * line, int x,
+ int y);
+extern void pango_xft_render_transformed(XftDraw * draw, XftColor * color,
+ PangoMatrix * matrix,
+ PangoFont * font,
+ PangoGlyphString * glyphs, int x,
+ int y);
+extern GType pango_xft_renderer_get_type(void);
+extern PangoRenderer *pango_xft_renderer_new(Display * display,
+ int screen);
+extern void pango_xft_renderer_set_default_color(PangoXftRenderer *
+ xftrenderer,
+ PangoColor *
+ default_color);
+extern void pango_xft_renderer_set_draw(PangoXftRenderer * xftrenderer,
+ XftDraw * draw);
extern void pango_xft_set_default_substitute(Display * display, int screen,
PangoXftSubstituteFunc func,
gpointer data,
=== modified file 'headers/All/4.1/pango-1.0/pango/pangoxft.h.defs'
--- a/headers/All/4.1/pango-1.0/pango/pangoxft.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/4.1/pango-1.0/pango/pangoxft.h.defs 2012-12-13 18:36:00 +0000
@@ -1,22 +1,50 @@
+#define PANGO_XFT_RENDERER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRendererClass))
+#define PANGO_IS_XFT_RENDERER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_XFT_RENDERER))
#define PANGO_XFT_FONT(object) \
(G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT, \
PangoXftFont))
#define PANGO_XFT_FONT_MAP(object) \
(G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT_MAP, \
PangoXftFontMap))
+#define PANGO_XFT_RENDERER(object) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRenderer))
#define PANGO_XFT_IS_FONT(object) \
(G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT))
#define PANGO_XFT_IS_FONT_MAP(object) \
(G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT_MAP))
+#define PANGO_IS_XFT_RENDERER(object) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_RENDERER))
+#define PANGO_XFT_RENDERER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRendererClass))
#define PANGO_TYPE_XFT_FONT (pango_xft_font_get_type ())
#define PANGO_TYPE_XFT_FONT_MAP (pango_xft_font_map_get_type ())
+#define PANGO_TYPE_XFT_RENDERER (pango_xft_renderer_get_type())
#define PANGO_RENDER_TYPE_XFT "PangoRenderXft"
+typedef struct _PangoXftRenderer PangoXftRenderer;
typedef void (*PangoXftSubstituteFunc) (FcPattern * pattern,
gpointer data);
typedef struct _PangoXftFontMap PangoXftFontMap;
+typedef struct _PangoXftRendererClass {
+ PangoRendererClass parent_class;
+ void (*composite_trapezoids) (PangoXftRenderer * xftrenderer,
+ PangoRenderPart part,
+ XTrapezoid * trapezoids,
+ int n_trapezoids);
+ void (*composite_glyphs) (PangoXftRenderer * xftrenderer,
+ XftFont * xft_font, XftGlyphSpec * glyphs,
+ int n_glyphs);
+} PangoXftRendererClass;
+typedef struct _PangoFcFontClass PangoFcFontClass;
+typedef struct _PangoFcFont PangoFcFont;
typedef struct _PangoXftFont PangoXftFont;
+typedef struct _PangoXftRendererPrivate PangoXftRendererPrivate;
extern GType pango_xft_font_get_type(void);
extern GType pango_xft_font_map_get_type(void);
extern PangoContext *pango_xft_get_context(Display * display, int screen);
@@ -27,6 +55,28 @@
PangoFont * font,
PangoGlyphString * glyphs, gint x,
gint y);
+extern void pango_xft_render(XftDraw * draw, XftColor * color,
+ PangoFont * font, PangoGlyphString * glyphs,
+ gint x, gint y);
+extern void pango_xft_render_layout(XftDraw * draw, XftColor * color,
+ PangoLayout * layout, int x, int y);
+extern void pango_xft_render_layout_line(XftDraw * draw, XftColor * color,
+ PangoLayoutLine * line, int x,
+ int y);
+extern void pango_xft_render_transformed(XftDraw * draw, XftColor * color,
+ PangoMatrix * matrix,
+ PangoFont * font,
+ PangoGlyphString * glyphs, int x,
+ int y);
+extern GType pango_xft_renderer_get_type(void);
+extern PangoRenderer *pango_xft_renderer_new(Display * display,
+ int screen);
+extern void pango_xft_renderer_set_default_color(PangoXftRenderer *
+ xftrenderer,
+ PangoColor *
+ default_color);
+extern void pango_xft_renderer_set_draw(PangoXftRenderer * xftrenderer,
+ XftDraw * draw);
extern void pango_xft_set_default_substitute(Display * display, int screen,
PangoXftSubstituteFunc func,
gpointer data,
=== modified file 'headers/All/5.0/pango-1.0/pango/pangoxft.h.defs'
--- a/headers/All/5.0/pango-1.0/pango/pangoxft.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/pango-1.0/pango/pangoxft.h.defs 2012-12-13 18:36:00 +0000
@@ -1,22 +1,56 @@
+#define PANGO_XFT_RENDERER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRendererClass))
+#define PANGO_IS_XFT_RENDERER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_XFT_RENDERER))
#define PANGO_XFT_FONT(object) \
(G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT, \
PangoXftFont))
#define PANGO_XFT_FONT_MAP(object) \
(G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT_MAP, \
PangoXftFontMap))
+#define PANGO_XFT_RENDERER(object) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRenderer))
#define PANGO_XFT_IS_FONT(object) \
(G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT))
#define PANGO_XFT_IS_FONT_MAP(object) \
(G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT_MAP))
+#define PANGO_IS_XFT_RENDERER(object) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_RENDERER))
+#define PANGO_XFT_RENDERER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRendererClass))
#define PANGO_TYPE_XFT_FONT (pango_xft_font_get_type ())
#define PANGO_TYPE_XFT_FONT_MAP (pango_xft_font_map_get_type ())
+#define PANGO_TYPE_XFT_RENDERER (pango_xft_renderer_get_type())
#define PANGO_RENDER_TYPE_XFT "PangoRenderXft"
+typedef struct _PangoXftRenderer {
+ PangoRenderer parent_instance;
+ Display *display;
+ int screen;
+ XftDraw *draw;
+ PangoXftRendererPrivate *priv;
+} PangoXftRenderer;
typedef void (*PangoXftSubstituteFunc) (FcPattern * pattern,
gpointer data);
typedef struct _PangoXftFontMap PangoXftFontMap;
+typedef struct _PangoXftRendererClass {
+ PangoRendererClass parent_class;
+ void (*composite_trapezoids) (PangoXftRenderer * xftrenderer,
+ PangoRenderPart part,
+ XTrapezoid * trapezoids,
+ int n_trapezoids);
+ void (*composite_glyphs) (PangoXftRenderer * xftrenderer,
+ XftFont * xft_font, XftGlyphSpec * glyphs,
+ int n_glyphs);
+} PangoXftRendererClass;
+typedef struct _PangoFcFontClass PangoFcFontClass;
+typedef struct _PangoFcFont PangoFcFont;
typedef struct _PangoXftFont PangoXftFont;
+typedef struct _PangoXftRendererPrivate PangoXftRendererPrivate;
extern GType pango_xft_font_get_type(void);
extern GType pango_xft_font_map_get_type(void);
extern PangoContext *pango_xft_get_context(Display * display, int screen);
@@ -27,6 +61,28 @@
PangoFont * font,
PangoGlyphString * glyphs, gint x,
gint y);
+extern void pango_xft_render(XftDraw * draw, XftColor * color,
+ PangoFont * font, PangoGlyphString * glyphs,
+ gint x, gint y);
+extern void pango_xft_render_layout(XftDraw * draw, XftColor * color,
+ PangoLayout * layout, int x, int y);
+extern void pango_xft_render_layout_line(XftDraw * draw, XftColor * color,
+ PangoLayoutLine * line, int x,
+ int y);
+extern void pango_xft_render_transformed(XftDraw * draw, XftColor * color,
+ PangoMatrix * matrix,
+ PangoFont * font,
+ PangoGlyphString * glyphs, int x,
+ int y);
+extern GType pango_xft_renderer_get_type(void);
+extern PangoRenderer *pango_xft_renderer_new(Display * display,
+ int screen);
+extern void pango_xft_renderer_set_default_color(PangoXftRenderer *
+ xftrenderer,
+ PangoColor *
+ default_color);
+extern void pango_xft_renderer_set_draw(PangoXftRenderer * xftrenderer,
+ XftDraw * draw);
extern void pango_xft_set_default_substitute(Display * display, int screen,
PangoXftSubstituteFunc func,
gpointer data,
=== modified file 'headers/X11/Xft/Xft.h'
--- a/headers/X11/Xft/Xft.h 2012-12-07 15:01:13 +0000
+++ b/headers/X11/Xft/Xft.h 2012-12-13 18:36:00 +0000
@@ -38,7 +38,6 @@
typedef struct _XftDraw XftDraw;
-#include <pango-1.0/pango/pangoxft.h>
typedef struct _XftColor XftColor;
typedef struct _XftFont XftFont;
=== modified file 'headers/pango-1.0/pango/pangocairo.h'
--- a/headers/pango-1.0/pango/pangocairo.h 2012-12-07 15:01:13 +0000
+++ b/headers/pango-1.0/pango/pangocairo.h 2012-12-13 18:36:00 +0000
@@ -18,11 +18,11 @@
#define PANGO_IS_CAIRO_FONT_MAP(object) \
(G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_CAIRO_FONT_MAP))
#define PANGO_TYPE_CAIRO_FONT_MAP (pango_cairo_font_map_get_type ())
-#if __LSB_VERSION__ >= 5,0
+#if __LSB_VERSION__ >= 50
#define PANGO_CAIRO_FONT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CAIRO_FONT, PangoCairoFont))
#define PANGO_IS_CAIRO_FONT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_CAIRO_FONT))
#define PANGO_TYPE_CAIRO_FONT (pango_cairo_font_get_type ())
-#endif /* __LSB_VERSION__ >= 5,0 */
+#endif /* __LSB_VERSION__ >= 5.0 */
@@ -30,13 +30,13 @@
typedef struct _PangoCairoFontMap PangoCairoFontMap;
-#if __LSB_VERSION__ >= 5,0
+#if __LSB_VERSION__ >= 50
typedef void (*PangoCairoShapeRendererFunc) (cairo_t * cr,
PangoAttrShape * attr,
gboolean do_path,
gpointer data);
-#endif /* __LSB_VERSION__ >= 5,0 */
+#endif /* __LSB_VERSION__ >= 5.0 */
/* Function prototypes */
@@ -79,7 +79,7 @@
PangoContext * context);
extern void pango_cairo_update_layout(cairo_t * cr,
PangoLayout * layout);
-#if __LSB_VERSION__ >= 5,0
+#if __LSB_VERSION__ >= 50
extern PangoCairoShapeRendererFunc
pango_cairo_context_get_shape_renderer(PangoContext * context,
gpointer * data);
@@ -89,6 +89,7 @@
func, gpointer data,
GDestroyNotify
dnotify);
+ extern PangoContext *pango_cairo_create_context(cairo_t * cr);
extern void pango_cairo_error_underline_path(cairo_t * cr, double x,
double y, double width,
double height);
@@ -101,15 +102,11 @@
extern PangoFontMap
*pango_cairo_font_map_new_for_font_type(cairo_font_type_t
fonttype);
- extern void pango_cairo_show_error_underline(cairo_t * cr, double x,
- double y, double width,
- double height);
-#endif /* __LSB_VERSION__ >= 5,0 */
-
-#if __LSB_VERSION__ >= 50
- extern PangoContext *pango_cairo_create_context(cairo_t * cr);
extern void pango_cairo_font_map_set_default(PangoCairoFontMap *
fontmap);
+ extern void pango_cairo_show_error_underline(cairo_t * cr, double x,
+ double y, double width,
+ double height);
extern void pango_cairo_show_glyph_item(cairo_t * cr, const char *text,
PangoGlyphItem * glyph_item);
#endif /* __LSB_VERSION__ >= 5.0 */
=== modified file 'headers/pango-1.0/pango/pangofc-decoder.h'
--- a/headers/pango-1.0/pango/pangofc-decoder.h 2012-12-07 15:01:13 +0000
+++ b/headers/pango-1.0/pango/pangofc-decoder.h 2012-12-13 18:36:00 +0000
@@ -6,8 +6,8 @@
#include <glib-2.0/glib.h>
#include <glib-2.0/glib-object.h>
#include <pango-1.0/pango/pango.h>
+#include <pango-1.0/pango/pangoxft.h>
#include <pango-1.0/pango/pangoft2.h>
-#include <pango-1.0/pango/pangofc-font.h>
#ifdef __cplusplus
extern "C" {
=== modified file 'headers/pango-1.0/pango/pangoft2.h'
--- a/headers/pango-1.0/pango/pangoft2.h 2012-12-07 15:01:13 +0000
+++ b/headers/pango-1.0/pango/pangoft2.h 2012-12-13 18:36:00 +0000
@@ -13,7 +13,6 @@
#include <freetype/fttypes.h>
#include <freetype/ftimage.h>
#include <freetype/ftsystem.h>
-#include <pango-1.0/pango/pangofc-font.h>
#ifdef __cplusplus
extern "C" {
=== modified file 'headers/pango-1.0/pango/pangoxft.h'
--- a/headers/pango-1.0/pango/pangoxft.h 2012-12-07 15:01:13 +0000
+++ b/headers/pango-1.0/pango/pangoxft.h 2012-12-13 18:36:00 +0000
@@ -8,6 +8,8 @@
#include <glib-2.0/glib-object.h>
#include <pango-1.0/pango/pango.h>
#include <X11/extensions/render.h>
+#include <X11/extensions/Xrender.h>
+#include <freetype/fttypes.h>
#include <X11/Xft/Xft.h>
#ifdef __cplusplus
@@ -15,28 +17,74 @@
#endif
+#define PANGO_XFT_RENDERER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRendererClass))
+#define PANGO_IS_XFT_RENDERER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_XFT_RENDERER))
#define PANGO_XFT_FONT(object) \
(G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT, \
PangoXftFont))
#define PANGO_XFT_FONT_MAP(object) \
(G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT_MAP, \
PangoXftFontMap))
+#define PANGO_XFT_RENDERER(object) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRenderer))
#define PANGO_XFT_IS_FONT(object) \
(G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT))
#define PANGO_XFT_IS_FONT_MAP(object) \
(G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT_MAP))
+#define PANGO_IS_XFT_RENDERER(object) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_RENDERER))
+#define PANGO_XFT_RENDERER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_XFT_RENDERER, \
+ PangoXftRendererClass))
#define PANGO_TYPE_XFT_FONT (pango_xft_font_get_type ())
#define PANGO_TYPE_XFT_FONT_MAP (pango_xft_font_map_get_type ())
+#define PANGO_TYPE_XFT_RENDERER (pango_xft_renderer_get_type())
#define PANGO_RENDER_TYPE_XFT "PangoRenderXft"
+ typedef struct _PangoXftRenderer PangoXftRenderer;
+
typedef void (*PangoXftSubstituteFunc) (FcPattern * pattern,
gpointer data);
typedef struct _PangoXftFontMap PangoXftFontMap;
+ typedef struct _PangoXftRendererClass PangoXftRendererClass;
+
+ typedef struct _PangoFcFontClass PangoFcFontClass;
+
+ typedef struct _PangoFcFont PangoFcFont;
+
typedef struct _PangoXftFont PangoXftFont;
+ typedef struct _PangoXftRendererPrivate PangoXftRendererPrivate;
+
+#if __LSB_VERSION__ >= 50
+ struct _PangoXftRenderer {
+ PangoRenderer parent_instance;
+ Display *display;
+ int screen;
+ XftDraw *draw;
+ PangoXftRendererPrivate *priv;
+ };
+
+#endif /* __LSB_VERSION__ >= 5.0 */
+
+ struct _PangoXftRendererClass {
+ PangoRendererClass parent_class;
+ void (*composite_trapezoids) (PangoXftRenderer * xftrenderer,
+ PangoRenderPart part,
+ XTrapezoid * trapezoids,
+ int n_trapezoids);
+ void (*composite_glyphs) (PangoXftRenderer * xftrenderer,
+ XftFont * xft_font,
+ XftGlyphSpec * glyphs, int n_glyphs);
+ };
+
/* Function prototypes */
@@ -52,6 +100,32 @@
PangoFont * font,
PangoGlyphString * glyphs, gint x,
gint y);
+ extern void pango_xft_render(XftDraw * draw, XftColor * color,
+ PangoFont * font,
+ PangoGlyphString * glyphs, gint x,
+ gint y);
+ extern void pango_xft_render_layout(XftDraw * draw, XftColor * color,
+ PangoLayout * layout, int x,
+ int y);
+ extern void pango_xft_render_layout_line(XftDraw * draw,
+ XftColor * color,
+ PangoLayoutLine * line, int x,
+ int y);
+ extern void pango_xft_render_transformed(XftDraw * draw,
+ XftColor * color,
+ PangoMatrix * matrix,
+ PangoFont * font,
+ PangoGlyphString * glyphs,
+ int x, int y);
+ extern GType pango_xft_renderer_get_type(void);
+ extern PangoRenderer *pango_xft_renderer_new(Display * display,
+ int screen);
+ extern void pango_xft_renderer_set_default_color(PangoXftRenderer *
+ xftrenderer,
+ PangoColor *
+ default_color);
+ extern void pango_xft_renderer_set_draw(PangoXftRenderer * xftrenderer,
+ XftDraw * draw);
extern void pango_xft_set_default_substitute(Display * display,
int screen,
PangoXftSubstituteFunc
=== modified file 'package/Makefile'
--- a/package/Makefile 2012-12-13 14:08:45 +0000
+++ b/package/Makefile 2012-12-13 18:36:00 +0000
@@ -46,7 +46,7 @@
# We define this here instead of directly in the spec file as
# we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=5
+RPM_PACKAGE_RELEASE=6
# Initialize LIB64 to proper value for 64-bit architectures
export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)
More information about the lsb-messages
mailing list