From fdf205a0d9e84275bc74cdd2ba8dd65dfb7bb343 Mon Sep 17 00:00:00 2001 From: René Neumann Date: Mon, 7 May 2012 11:03:50 +0200 Subject: Cairo from portage tree --- x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch (limited to 'x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch') diff --git a/x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch b/x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch new file mode 100644 index 0000000..cf0b57a --- /dev/null +++ b/x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch @@ -0,0 +1,55 @@ +diff -ruN cairo-1.10.2-0-vanilla/src/cairo-qt-surface.cpp cairo-1.10.2/src/cairo-qt-surface.cpp +--- cairo-1.10.2-0-vanilla/src/cairo-qt-surface.cpp 2010-12-25 15:21:34.000000000 +0100 ++++ cairo-1.10.2/src/cairo-qt-surface.cpp 2011-12-20 22:59:30.000000000 +0100 +@@ -61,7 +61,9 @@ + #include + #include + +-#if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || defined(QT_GLYPHS_API_BACKPORT) ++#if (QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)) ++#include ++#elif (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || defined(QT_GLYPHS_API_BACKPORT) + extern void qt_draw_glyphs(QPainter *, const quint32 *glyphs, const QPointF *positions, int count); + #endif + +@@ -1370,7 +1372,39 @@ + cairo_clip_t *clip, + int *remaining_glyphs) + { +-#if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || defined(QT_GLYPHS_API_BACKPORT) ++#if (QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)) && !defined(QT_NO_RAWFONT) ++ cairo_qt_surface_t *qs = (cairo_qt_surface_t *) abstract_surface; ++ ++ // pick out the colour to use from the cairo source ++ cairo_solid_pattern_t *solid = (cairo_solid_pattern_t*) source; ++ // documentation says you have to freeze the cache, but I don't believe it ++ _cairo_scaled_font_freeze_cache(scaled_font); ++ ++ QColor tempColour(solid->color.red * 255, solid->color.green * 255, solid->color.blue * 255); ++ QVector positions(num_glyphs); ++ QVector glyphss(num_glyphs); ++ FT_Face face = cairo_ft_scaled_font_lock_face (scaled_font); ++ const FT_Size_Metrics& ftMetrics = face->size->metrics; ++ QFont font(face->family_name); ++ font.setStyleStrategy(QFont::NoFontMerging); ++ font.setBold(face->style_flags & FT_STYLE_FLAG_BOLD); ++ font.setItalic(face->style_flags & FT_STYLE_FLAG_ITALIC); ++ font.setKerning(face->face_flags & FT_FACE_FLAG_KERNING); ++ font.setPixelSize(ftMetrics.y_ppem); ++ cairo_ft_scaled_font_unlock_face(scaled_font); ++ qs->p->setFont(font); ++ qs->p->setPen(tempColour); ++ for (int currentGlyph = 0; currentGlyph < num_glyphs; currentGlyph++) { ++ positions.append(QPointF(glyphs[currentGlyph].x, glyphs[currentGlyph].y)); ++ glyphss.append(glyphs[currentGlyph].index); ++ } ++ QGlyphRun qglyphs; ++ qglyphs.setGlyphIndexes(glyphss); ++ qglyphs.setPositions(positions); ++ qs->p->drawGlyphRun(QPointF(), qglyphs); ++ _cairo_scaled_font_thaw_cache(scaled_font); ++ return CAIRO_INT_STATUS_SUCCESS; ++#elif (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || defined(QT_GLYPHS_API_BACKPORT) + cairo_qt_surface_t *qs = (cairo_qt_surface_t *) abstract_surface; + + // pick out the colour to use from the cairo source -- cgit v1.2.3-70-g09d2