rpms/cairo/devel cairo-1.1.2-embedded-bitmaps.patch, NONE, 1.1 cairo.spec, 1.35, 1.36 cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch, 1.1, NONE cairo-1.0.2-embedded-bitmaps.patch, 1.1, NONE cairo-1.0.2-fix-build.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 25 17:41:26 UTC 2006
Author: cworth
Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv821
Modified Files:
cairo.spec
Added Files:
cairo-1.1.2-embedded-bitmaps.patch
Removed Files:
cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch
cairo-1.0.2-embedded-bitmaps.patch cairo-1.0.2-fix-build.patch
Log Message:
Update for new upstream cairo 1.1.2 snapshot
cairo-1.1.2-embedded-bitmaps.patch:
cairo-ft-font.c | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
--- NEW FILE cairo-1.1.2-embedded-bitmaps.patch ---
commit fe8bf47afc11b12034fd2c92caf424c8911d630b
Author: Zhe Su <james.su at gmail.com>
Date: Tue Apr 25 10:20:42 2006 -0700
Support fontconfig embeddedbitmap option/handle transformation issue as well.
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index a23388a..eb6ccd1 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -1227,7 +1227,9 @@ const cairo_scaled_font_backend_t cairo_
static cairo_ft_options_t
_get_pattern_ft_options (FcPattern *pattern)
{
- FcBool antialias, vertical_layout, hinting, autohint;
+ FcBool antialias, vertical_layout, hinting, autohint, bitmap;
+ FcBool transform;
+ FcMatrix *font_matrix;
cairo_ft_options_t ft_options;
int rgba;
#ifdef FC_HINT_STYLE
@@ -1237,15 +1239,31 @@ #endif
ft_options.load_flags = 0;
ft_options.extra_flags = 0;
+
+#ifndef FC_EMBEDDED_BITMAP
+#define FC_EMBEDDED_BITMAP "embeddedbitmap"
+#endif
+
+ if (FcPatternGetMatrix (pattern,
+ FC_MATRIX, 0, &font_matrix) != FcResultMatch)
+ font_matrix = NULL;
+
+ transform = (font_matrix && (font_matrix->xx != 1 || font_matrix->xy != 0 ||
+ font_matrix->yx != 0 || font_matrix->yy != 1));
+
+ /* Check whether to force use of embedded bitmaps */
+ if (FcPatternGetBool (pattern,
+ FC_EMBEDDED_BITMAP, 0, &bitmap) != FcResultMatch)
+ bitmap = FcFalse;
/* disable antialiasing if requested */
if (FcPatternGetBool (pattern,
FC_ANTIALIAS, 0, &antialias) != FcResultMatch)
antialias = FcTrue;
- if (antialias)
+ if ((!bitmap && antialias) || transform)
ft_options.load_flags |= FT_LOAD_NO_BITMAP;
- else
+ else if (!antialias)
ft_options.load_flags |= FT_LOAD_MONOCHROME;
/* disable hinting if requested */
Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- cairo.spec 15 Mar 2006 19:26:01 -0000 1.35
+++ cairo.spec 25 Apr 2006 17:41:23 -0000 1.36
@@ -3,7 +3,7 @@
Summary: A vector graphics library
Name: cairo
-Version: 1.0.4
+Version: 1.1.2
Release: 1
URL: http://cairographics.org
Source0: %{name}-%{version}.tar.gz
@@ -23,7 +23,7 @@
BuildRequires: freetype-devel >= %{freetype_version}
BuildRequires: fontconfig-devel >= %{fontconfig_version}
-Patch0: cairo-1.0.2-embedded-bitmaps.patch
+Patch0: cairo-1.1.2-embedded-bitmaps.patch
%description
Cairo is a vector graphics library designed to provide high-quality
@@ -85,6 +85,12 @@
%{_datadir}/gtk-doc/*
%changelog
+* Tue Apr 25 2006 Carl Worth <cworth at redhat.com> - 1.1.2-1
+- Update to new upstream 1.1.2
+- Port forward the embedded bitmaps patch (now committed upstream to
+ 1.1.3)
+- Drop build-fix and chunk-glyphs patches which now come from upstream
+
* Wed Mar 15 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.4-1
- Update to 1.0.4
- Drop upstreamed patches
--- cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch DELETED ---
--- cairo-1.0.2-embedded-bitmaps.patch DELETED ---
--- cairo-1.0.2-fix-build.patch DELETED ---
More information about the fedora-cvs-commits
mailing list