[Lsb-messages] /var/www/bzr/lsb/devel/devchk r2326: some pango fixes (bug 3548)

Mats Wichmann mats at linuxfoundation.org
Thu Dec 13 18:55:50 UTC 2012


------------------------------------------------------------
revno: 2326
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: devchk
timestamp: Thu 2012-12-13 11:55:50 -0700
message:
  some pango fixes (bug 3548)
modified:
  ts/devchk/pango_1_0_pango_pangocairo_h.c
  ts/devchk/pango_1_0_pango_pangoxft_h.c
  ts/devchk/pango_1_0_pango_pangoxft_h.inc
-------------- next part --------------
=== modified file 'ts/devchk/pango_1_0_pango_pangocairo_h.c'
--- a/ts/devchk/pango_1_0_pango_pangocairo_h.c	2012-12-07 16:12:38 +0000
+++ b/ts/devchk/pango_1_0_pango_pangocairo_h.c	2012-12-13 18:55:50 +0000
@@ -53,7 +53,7 @@
 #endif
 
 #if 1
-CheckTypeSize(PangoCairoShapeRendererFunc,0, 32504, 1, 5,0, NULL, 32507, NULL)
+CheckTypeSize(PangoCairoShapeRendererFunc,0, 32504, 1, 5.0, NULL, 32507, NULL)
 #endif
 
 #if 1

=== modified file 'ts/devchk/pango_1_0_pango_pangoxft_h.c'
--- a/ts/devchk/pango_1_0_pango_pangoxft_h.c	2012-12-07 16:12:38 +0000
+++ b/ts/devchk/pango_1_0_pango_pangoxft_h.c	2012-12-13 18:55:50 +0000
@@ -13,8 +13,7 @@
 #undef GETTEXT_PACKAGE
 /* #define PANGO_DISABLE_DEPRECATED */
 
-struct _PangoXftRendererPrivate {
-};
+struct _PangoXftRendererPrivate { };
 
 struct _PangoXftFontMap { };
 struct _PangoFcFont { };
@@ -22,7 +21,6 @@
 struct _PangoFcFontClass { };
 
 #ifdef LSBCC_MODE
-struct _PangoXftRenderer { };
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -53,6 +51,30 @@
 
 Msg("Checking data structures in pango-1.0/pango/pangoxft.h\n");
 #if _LSB_DEFAULT_ARCH
+/* No test for PANGO_TYPE_XFT_RENDERER */
+#endif
+
+#if _LSB_DEFAULT_ARCH
+/* No test for PANGO_XFT_RENDERER(object) */
+#endif
+
+#if _LSB_DEFAULT_ARCH
+/* No test for PANGO_IS_XFT_RENDERER(object) */
+#endif
+
+#if _LSB_DEFAULT_ARCH
+/* No test for PANGO_XFT_RENDERER_CLASS(klass) */
+#endif
+
+#if _LSB_DEFAULT_ARCH
+/* No test for PANGO_IS_XFT_RENDERER_CLASS(klass) */
+#endif
+
+#if _LSB_DEFAULT_ARCH
+/* No test for PANGO_XFT_RENDERER_GET_CLASS(obj) */
+#endif
+
+#if _LSB_DEFAULT_ARCH
 #ifdef PANGO_RENDER_TYPE_XFT
 	CompareStringConstant(PANGO_RENDER_TYPE_XFT,"PangoRenderXft",6591,architecture,3.1,NULL)
 #else
@@ -86,6 +108,56 @@
 /* No test for PANGO_XFT_IS_FONT(object) */
 #endif
 
+#if defined __i386__
+CheckTypeSize(struct _PangoXftRenderer,48, 12559, 2, 5.0, NULL, 0, NULL)
+Msg("Missing member data for _PangoXftRenderer on IA32\n");
+CheckOffset(struct _PangoXftRenderer,parent_instance,0,2,232144)
+CheckOffset(struct _PangoXftRenderer,display,0,2,232145)
+CheckOffset(struct _PangoXftRenderer,screen,0,2,232146)
+CheckOffset(struct _PangoXftRenderer,draw,0,2,232147)
+CheckOffset(struct _PangoXftRenderer,priv,0,2,232148)
+#elif defined __ia64__
+Msg("Find size of _PangoXftRenderer (12559)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,0,NULL);\n",architecture,12559,0);
+#elif defined __powerpc__ && !defined __powerpc64__
+Msg("Find size of _PangoXftRenderer (12559)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,0,NULL);\n",architecture,12559,0);
+#elif defined __powerpc64__
+Msg("Find size of _PangoXftRenderer (12559)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,0,NULL);\n",architecture,12559,0);
+#elif defined __s390__ && !defined __s390x__
+Msg("Find size of _PangoXftRenderer (12559)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,0,NULL);\n",architecture,12559,0);
+#elif defined __x86_64__
+Msg("Find size of _PangoXftRenderer (12559)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,0,NULL);\n",architecture,12559,0);
+#elif defined __s390x__
+Msg("Find size of _PangoXftRenderer (12559)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,0,NULL);\n",architecture,12559,0);
+#else
+Msg("Find size of _PangoXftRenderer (12559)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,0,NULL);\n",architecture,12559,0);
+#endif
+
+#if defined __s390x__
+CheckTypeSize(PangoXftRenderer,88, 12560, 12, 3.1, NULL, 12559, NULL)
+#elif defined __x86_64__
+CheckTypeSize(PangoXftRenderer,88, 12560, 11, 3.1, NULL, 12559, NULL)
+#elif defined __s390__ && !defined __s390x__
+CheckTypeSize(PangoXftRenderer,48, 12560, 10, 3.1, NULL, 12559, NULL)
+#elif defined __powerpc64__
+CheckTypeSize(PangoXftRenderer,88, 12560, 9, 3.1, NULL, 12559, NULL)
+#elif defined __powerpc__ && !defined __powerpc64__
+CheckTypeSize(PangoXftRenderer,48, 12560, 6, 3.1, NULL, 12559, NULL)
+#elif defined __ia64__
+CheckTypeSize(PangoXftRenderer,88, 12560, 3, 3.1, NULL, 12559, NULL)
+#elif defined __i386__
+CheckTypeSize(PangoXftRenderer,48, 12560, 2, 3.1, NULL, 12559, NULL)
+#else
+Msg("Find size of PangoXftRenderer (12560)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""3.1""',NULL,12559,NULL);\n",architecture,12560,0);
+#endif
+
 #if defined __s390x__
 CheckTypeSize(PangoXftSubstituteFunc,8, 12564, 12, 3.1, NULL, 12563, NULL)
 #elif defined __x86_64__
@@ -106,6 +178,73 @@
 #endif
 
 #if defined __s390x__
+CheckTypeSize(struct _PangoXftRendererClass,264, 12567, 12, , NULL, 0, NULL)
+CheckMemberSize(struct _PangoXftRendererClass,composite_trapezoids,8,12,43295)
+CheckOffset(struct _PangoXftRendererClass,composite_trapezoids,248,12,43295)
+CheckMemberSize(struct _PangoXftRendererClass,composite_glyphs,8,12,43300)
+CheckOffset(struct _PangoXftRendererClass,composite_glyphs,256,12,43300)
+#elif defined __x86_64__
+CheckTypeSize(struct _PangoXftRendererClass,264, 12567, 11, , NULL, 0, NULL)
+CheckMemberSize(struct _PangoXftRendererClass,composite_trapezoids,8,11,43295)
+CheckOffset(struct _PangoXftRendererClass,composite_trapezoids,248,11,43295)
+CheckMemberSize(struct _PangoXftRendererClass,composite_glyphs,8,11,43300)
+CheckOffset(struct _PangoXftRendererClass,composite_glyphs,256,11,43300)
+#elif defined __s390__ && !defined __s390x__
+CheckTypeSize(struct _PangoXftRendererClass,132, 12567, 10, , NULL, 0, NULL)
+CheckMemberSize(struct _PangoXftRendererClass,composite_trapezoids,4,10,43295)
+CheckOffset(struct _PangoXftRendererClass,composite_trapezoids,124,10,43295)
+CheckMemberSize(struct _PangoXftRendererClass,composite_glyphs,4,10,43300)
+CheckOffset(struct _PangoXftRendererClass,composite_glyphs,128,10,43300)
+#elif defined __powerpc64__
+CheckTypeSize(struct _PangoXftRendererClass,264, 12567, 9, , NULL, 0, NULL)
+CheckMemberSize(struct _PangoXftRendererClass,composite_trapezoids,8,9,43295)
+CheckOffset(struct _PangoXftRendererClass,composite_trapezoids,248,9,43295)
+CheckMemberSize(struct _PangoXftRendererClass,composite_glyphs,8,9,43300)
+CheckOffset(struct _PangoXftRendererClass,composite_glyphs,256,9,43300)
+#elif defined __powerpc__ && !defined __powerpc64__
+CheckTypeSize(struct _PangoXftRendererClass,132, 12567, 6, , NULL, 0, NULL)
+CheckMemberSize(struct _PangoXftRendererClass,composite_trapezoids,4,6,43295)
+CheckOffset(struct _PangoXftRendererClass,composite_trapezoids,124,6,43295)
+CheckMemberSize(struct _PangoXftRendererClass,composite_glyphs,4,6,43300)
+CheckOffset(struct _PangoXftRendererClass,composite_glyphs,128,6,43300)
+#elif defined __ia64__
+CheckTypeSize(struct _PangoXftRendererClass,264, 12567, 3, , NULL, 0, NULL)
+CheckMemberSize(struct _PangoXftRendererClass,composite_trapezoids,8,3,43295)
+CheckOffset(struct _PangoXftRendererClass,composite_trapezoids,248,3,43295)
+CheckMemberSize(struct _PangoXftRendererClass,composite_glyphs,8,3,43300)
+CheckOffset(struct _PangoXftRendererClass,composite_glyphs,256,3,43300)
+#elif defined __i386__
+CheckTypeSize(struct _PangoXftRendererClass,132, 12567, 2, , NULL, 0, NULL)
+CheckMemberSize(struct _PangoXftRendererClass,composite_trapezoids,4,2,43295)
+CheckOffset(struct _PangoXftRendererClass,composite_trapezoids,124,2,43295)
+CheckMemberSize(struct _PangoXftRendererClass,composite_glyphs,4,2,43300)
+CheckOffset(struct _PangoXftRendererClass,composite_glyphs,128,2,43300)
+#elif 1
+CheckTypeSize(struct _PangoXftRendererClass,0, 12567, 1, , NULL, 0, NULL)
+Msg("Missing member data for _PangoXftRendererClass on All\n");
+CheckOffset(struct _PangoXftRendererClass,parent_class,0,1,43290)
+#endif
+
+#if defined __s390x__
+CheckTypeSize(PangoXftRendererClass,264, 12579, 12, 3.1, NULL, 12567, NULL)
+#elif defined __x86_64__
+CheckTypeSize(PangoXftRendererClass,264, 12579, 11, 3.1, NULL, 12567, NULL)
+#elif defined __s390__ && !defined __s390x__
+CheckTypeSize(PangoXftRendererClass,132, 12579, 10, 3.1, NULL, 12567, NULL)
+#elif defined __powerpc64__
+CheckTypeSize(PangoXftRendererClass,264, 12579, 9, 3.1, NULL, 12567, NULL)
+#elif defined __powerpc__ && !defined __powerpc64__
+CheckTypeSize(PangoXftRendererClass,132, 12579, 6, 3.1, NULL, 12567, NULL)
+#elif defined __ia64__
+CheckTypeSize(PangoXftRendererClass,264, 12579, 3, 3.1, NULL, 12567, NULL)
+#elif defined __i386__
+CheckTypeSize(PangoXftRendererClass,132, 12579, 2, 3.1, NULL, 12567, NULL)
+#else
+Msg("Find size of PangoXftRendererClass (12579)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""3.1""',NULL,12567,NULL);\n",architecture,12579,0);
+#endif
+
+#if defined __s390x__
 /* S390X */
 typedef void (*PangoXftSubstituteFunc_db)(FcPattern *, gpointer);
 CheckFunctionTypedef(PangoXftSubstituteFunc,PangoXftSubstituteFunc_db);
@@ -137,10 +276,26 @@
 
 extern void pango_xft_substitute_changed_db(Display *, int);
 CheckInterfacedef(pango_xft_substitute_changed,pango_xft_substitute_changed_db);
+extern void pango_xft_render_db(XftDraw *, XftColor *, PangoFont *, PangoGlyphString *, gint, gint);
+CheckInterfacedef(pango_xft_render,pango_xft_render_db);
+extern PangoRenderer * pango_xft_renderer_new_db(Display *, int);
+CheckInterfacedef(pango_xft_renderer_new,pango_xft_renderer_new_db);
+extern GType pango_xft_renderer_get_type_db(void);
+CheckInterfacedef(pango_xft_renderer_get_type,pango_xft_renderer_get_type_db);
+extern void pango_xft_renderer_set_default_color_db(PangoXftRenderer *, PangoColor *);
+CheckInterfacedef(pango_xft_renderer_set_default_color,pango_xft_renderer_set_default_color_db);
 extern GType pango_xft_font_get_type_db(void);
 CheckInterfacedef(pango_xft_font_get_type,pango_xft_font_get_type_db);
 extern void pango_xft_picture_render_db(Display *, Picture, Picture, PangoFont *, PangoGlyphString *, gint, gint);
 CheckInterfacedef(pango_xft_picture_render,pango_xft_picture_render_db);
+extern void pango_xft_render_layout_db(XftDraw *, XftColor *, PangoLayout *, int, int);
+CheckInterfacedef(pango_xft_render_layout,pango_xft_render_layout_db);
+extern void pango_xft_render_transformed_db(XftDraw *, XftColor *, PangoMatrix *, PangoFont *, PangoGlyphString *, int, int);
+CheckInterfacedef(pango_xft_render_transformed,pango_xft_render_transformed_db);
+extern void pango_xft_renderer_set_draw_db(PangoXftRenderer *, XftDraw *);
+CheckInterfacedef(pango_xft_renderer_set_draw,pango_xft_renderer_set_draw_db);
+extern void pango_xft_render_layout_line_db(XftDraw *, XftColor *, PangoLayoutLine *, int, int);
+CheckInterfacedef(pango_xft_render_layout_line,pango_xft_render_layout_line_db);
 extern void pango_xft_shutdown_display_db(Display *, int);
 CheckInterfacedef(pango_xft_shutdown_display,pango_xft_shutdown_display_db);
 extern PangoFontMap * pango_xft_get_font_map_db(Display *, int);

=== modified file 'ts/devchk/pango_1_0_pango_pangoxft_h.inc'
--- a/ts/devchk/pango_1_0_pango_pangoxft_h.inc	2007-10-18 18:14:37 +0000
+++ b/ts/devchk/pango_1_0_pango_pangoxft_h.inc	2012-12-13 18:55:50 +0000
@@ -4,8 +4,7 @@
 #undef GETTEXT_PACKAGE
 /* #define PANGO_DISABLE_DEPRECATED */
 
-struct _PangoXftRendererPrivate {
-};
+struct _PangoXftRendererPrivate { };
 
 struct _PangoXftFontMap { };
 struct _PangoFcFont { };
@@ -13,7 +12,6 @@
 struct _PangoFcFontClass { };
 
 #ifdef LSBCC_MODE
-struct _PangoXftRenderer { };
 
 #include <ft2build.h>
 #include FT_FREETYPE_H



More information about the lsb-messages mailing list