head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.10
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.8
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.6
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.4
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.2
	pkgsrc-2009Q4-base:1.2;
locks; strict;
comment	@# @;


1.2
date	2009.12.15.15.09.21;	author drochner;	state dead;
branches;
next	1.1;

1.1
date	2009.11.25.09.58.39;	author tron;	state Exp;
branches;
next	;


desc
@@


1.2
log
@update to 1.26.2
changes: fix non-standard / illegal code which broke build on some
 platforms (was patched in pkgsrc)
@
text
@$NetBSD: patch-af,v 1.1 2009/11/25 09:58:39 tron Exp $

See https://bugzilla.gnome.org/show_bug.cgi?id=602408
and https://bugzilla.gnome.org/show_bug.cgi?id=602660

--- pango/opentype/hb-ot-layout-gdef-private.hh.orig
+++ pango/opentype/hb-ot-layout-gdef-private.hh
@@@@ -177,12 +177,11 @@@@ struct CaretValue
   private:
   union {
   USHORT		format;		/* Format identifier */
-  CaretValueFormat1	format1[];
-  CaretValueFormat2	format2[];
-  CaretValueFormat3	format3[];
+  CaretValueFormat1	format1[VAR];
+  CaretValueFormat2	format2[VAR];
+  CaretValueFormat3	format3[VAR];
   } u;
 };
-ASSERT_SIZE (CaretValue, 2);
 
 struct LigGlyph
 {
@@@@ -286,10 +285,9 @@@@ struct MarkGlyphSets
   private:
   union {
   USHORT		format;		/* Format identifier */
-  MarkGlyphSetsFormat1	format1[];
+  MarkGlyphSetsFormat1	format1[VAR];
   } u;
 };
-ASSERT_SIZE (MarkGlyphSets, 2);
 
 
 /*
@@@@ -364,12 +362,12 @@@@ struct GDEF
 					 * mark attachment type--from beginning
 					 * of GDEF header (may be Null) */
   OffsetTo<MarkGlyphSets>
-		markGlyphSetsDef[0];	/* Offset to the table of mark set
+		markGlyphSetsDef[VAR];	/* Offset to the table of mark set
 					 * definitions--from beginning of GDEF
 					 * header (may be NULL).  Introduced
 					 * in version 00010002. */
 };
-ASSERT_SIZE (GDEF, 12);
+ASSERT_SIZE_VAR (GDEF, 12, OffsetTo<MarkGlyphSets>);
 
 
 #endif /* HB_OT_LAYOUT_GDEF_PRIVATE_HH */
@


1.1
log
@Add patches on behalf of Jens Rehsack:
  Pango was using invalid c++ code and Sun Studio avoids that to compile.
  Applied patches are taken from the bug-fixes committed upstream -HEAD
  taken from harrbuuz-ng repository for pango.

Bump package revision because of these patches.
@
text
@d1 1
a1 1
$NetBSD: patch-ad,v 1.9 2009/11/22 19:14:42 sno Exp $
@