wok-stable rev 6628
Up: cairo to 1.10.0.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Sun Oct 10 05:12:28 2010 +0000 (2010-10-10) |
parents | 31b78de2a592 |
children | 720c1ab41e76 |
files | cairo-dev/receipt cairo/receipt cairo/stuff/cairo-1.10.0-buggy_gradients.patch cairo/stuff/cairo-respect-fontconfig.patch |
line diff
1.1 --- a/cairo-dev/receipt Sun Oct 10 04:43:15 2010 +0000 1.2 +++ b/cairo-dev/receipt Sun Oct 10 05:12:28 2010 +0000 1.3 @@ -1,12 +1,12 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="cairo-dev" 1.7 -VERSION="1.8.10" 1.8 +VERSION="1.10.0" 1.9 CATEGORY="development" 1.10 SHORT_DESC="2D graphics library devel files." 1.11 MAINTAINER="pankso@slitaz.org" 1.12 WEB_SITE="http://www.cairographics.org/" 1.13 -DEPENDS="pixman-dev xorg-libXrender-dev glib-dev libxcb-dev xcb-util-dev" 1.14 +DEPENDS="pixman-dev xorg-libXrender-dev glib-dev libxcb-dev xcb-util-dev cairo" 1.15 WANTED="cairo" 1.16 1.17 # Rules to gen a SliTaz package suitable for Tazpkg.
2.1 --- a/cairo/receipt Sun Oct 10 04:43:15 2010 +0000 2.2 +++ b/cairo/receipt Sun Oct 10 05:12:28 2010 +0000 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="cairo" 2.7 -VERSION="1.8.10" 2.8 +VERSION="1.10.0" 2.9 CATEGORY="x-window" 2.10 SHORT_DESC="2D graphics library." 2.11 MAINTAINER="pankso@slitaz.org" 2.12 @@ -17,13 +17,17 @@ 2.13 compile_rules() 2.14 { 2.15 cd $src 2.16 + patch -Np1 -i ../stuff/cairo-1.10.0-buggy_gradients.patch 2.17 + # this patch is used to fix incorrect renders with QT 2.18 + patch -Np1 -i ../stuff/cairo-respect-fontconfig.patch 2.19 ./configure \ 2.20 --prefix=/usr \ 2.21 --mandir=/usr/share/man \ 2.22 --with-html-dir=/usr/share/doc \ 2.23 --enable-xcb \ 2.24 + --disable-static \ 2.25 $CONFIGURE_ARGS && 2.26 - make && 2.27 + make -j 4 && 2.28 make DESTDIR=$PWD/_pkg install 2.29 } 2.30
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/cairo/stuff/cairo-1.10.0-buggy_gradients.patch Sun Oct 10 05:12:28 2010 +0000 3.3 @@ -0,0 +1,13 @@ 3.4 +--- a/src/cairo-xlib-display.c.ubuntu 2010-08-04 11:57:49.000000000 +0200 3.5 ++++ b/src/cairo-xlib-display.c 2010-08-04 11:58:28.000000000 +0200 3.6 +@@ -353,11 +353,7 @@ 3.7 + /* Prior to Render 0.10, there is no protocol support for gradients and 3.8 + * we call function stubs instead, which would silently consume the drawing. 3.9 + */ 3.10 +-#if RENDER_MAJOR == 0 && RENDER_MINOR < 10 3.11 + display->buggy_gradients = TRUE; 3.12 +-#else 3.13 +- display->buggy_gradients = FALSE; 3.14 +-#endif 3.15 + display->buggy_pad_reflect = FALSE; 3.16 + display->buggy_repeat = FALSE;
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/cairo/stuff/cairo-respect-fontconfig.patch Sun Oct 10 05:12:28 2010 +0000 4.3 @@ -0,0 +1,21 @@ 4.4 +diff -Nur cairo-1.8.6.orig/src/cairo-ft-font.c cairo-1.8.6/src/cairo-ft-font.c 4.5 +--- cairo-1.8.6.orig/src/cairo-ft-font.c 2008-12-12 20:48:04.000000000 +0800 4.6 ++++ cairo-1.8.6/src/cairo-ft-font.c 2009-02-20 14:56:57.000000000 +0800 4.7 +@@ -1448,8 +1448,15 @@ 4.8 + if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT) 4.9 + options->base.hint_style = other->base.hint_style; 4.10 + 4.11 +- if (other->base.hint_style == CAIRO_HINT_STYLE_NONE) 4.12 +- options->base.hint_style = CAIRO_HINT_STYLE_NONE; 4.13 ++ //if (other->base.hint_style == CAIRO_HINT_STYLE_NONE) 4.14 ++ //options->base.hint_style = CAIRO_HINT_STYLE_NONE; 4.15 ++ 4.16 ++ if (other->base.hint_style == CAIRO_HINT_STYLE_NONE || 4.17 ++ other->base.hint_style == CAIRO_HINT_STYLE_SLIGHT || 4.18 ++ other->base.hint_style == CAIRO_HINT_STYLE_MEDIUM || 4.19 ++ other->base.hint_style == CAIRO_HINT_STYLE_FULL) { 4.20 ++ options->base.hint_style = other->base.hint_style; 4.21 ++ } 4.22 + 4.23 + if (options->base.antialias == CAIRO_ANTIALIAS_NONE) { 4.24 + if (options->base.hint_style == CAIRO_HINT_STYLE_NONE)