[cairo-commit] 2 commits - ROADMAP test/Makefile.am

[Carl Worth]

 ROADMAP          |    8 ++++++--
 test/Makefile.am |    2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
diff-tree 328024cc25cba67c939cf51da6ab6409635fa227 (from 3cf3d4343b6f403b55014f2d259483e1fb688741)
Author: Carl Worth <cworth at cworth.org>
Date:   Fri Aug 18 14:23:14 2006 -0700

    ROADMAP: Punt the AIX -lpthread bug off of the 1.2.4 roadmap.

diff --git a/ROADMAP b/ROADMAP
index 227c8fb..1650616 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -30,8 +30,8 @@ from mozilla, (clip querying), and much-
 Themes and Schedules
 ====================
 cairo-1.2.4 (August 21, 2006): Fix build bugs with 1.2.2
+<<<<<<< .merge_file_3a6nj4
 ✓- xlib detection requires libXt
- - 7744: Compile troubles on AIX
 ✓- SVG backend requires PNG
 ✓- 7888: assertion failure with rotated bitmap glyphs
 ✓- 7889: cairo_text_path assertion failure on bitmap fonts
@@ -42,9 +42,9 @@ cairo-1.2.4 (August 21, 2006): Fix build
 
  Things that we are letting slip from 1.2.4
  ------------------------------------------
+ - 7744: Compile troubles on AIX
  - PS/PDF Type1/Type3 problem with rotated font_matrices
 
-
 cairo-1.4 (October 2006): Better performance
  - New tessellator
  - New rasterization
diff-tree 3cf3d4343b6f403b55014f2d259483e1fb688741 (from ccdaaf7b950ea68c1149e2649e8379e564b636d8)
Author: Carl Worth <cworth at cworth.org>
Date:   Fri Aug 18 14:22:08 2006 -0700

    Mark ft-text-vertical-layout tests as XFAIL since we'repunting these from the 1.2.4 release.

diff --git a/ROADMAP b/ROADMAP
index 85dd808..227c8fb 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -37,10 +37,14 @@ cairo-1.2.4 (August 21, 2006): Fix build
 ✓- 7889: cairo_text_path assertion failure on bitmap fonts
 ✓- Type1 on Windows (Adrian has a patch)
 ✓- source-clip-scale
- - PS/PDF Type1/Type3 problem with rotated font_matrices
 ✓- close_path behavior (T Rowley's mail)
 ✓- degenerate-path dashing fixes
 
+ Things that we are letting slip from 1.2.4
+ ------------------------------------------
+ - PS/PDF Type1/Type3 problem with rotated font_matrices
+
+
 cairo-1.4 (October 2006): Better performance
  - New tessellator
  - New rasterization
diff --git a/test/Makefile.am b/test/Makefile.am
index cfe008f..1ab058c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -347,6 +347,8 @@ XFAIL_TESTS =			\
 a8-mask				\
 extend-reflect			\
 filter-nearest-offset		\
+ft-text-vertical-layout-type1	\
+ft-text-vertical-layout-type3	\
 leaky-dash			\
 long-lines			\
 self-intersecting		\