diff options
| author | Ladislav Hagara | 2010-10-20 16:29:46 +0200 |
|---|---|---|
| committer | Ladislav Hagara | 2010-10-20 16:29:46 +0200 |
| commit | 4800b110822cf3161fe3e07119ae6304a340931f (patch) | |
| tree | e1f5ef6cc6d161ab4497e812375f59a1500063b0 /x11-libs/cairo | |
| parent | 33ff71c73e13a4a1bf6c2f50d3ce46a5509bcbe3 (diff) | |
| parent | 1c56539d102b99ac38916e20c31c9df0fed1481d (diff) | |
Merge branch 'master' into libpng
My second big merge. :-)
Conflicts:
http/xulrunner/HISTORY
x11-libs/cairo/HISTORY
Diffstat (limited to 'x11-libs/cairo')
| -rwxr-xr-x | x11-libs/cairo/DETAILS | 12 | ||||
| -rw-r--r-- | x11-libs/cairo/HISTORY | 10 | ||||
| -rwxr-xr-x | x11-libs/cairo/PRE_BUILD | 7 | ||||
| -rw-r--r-- | x11-libs/cairo/cairo-1.10.0-buggy_gradients.patch | 14 | ||||
| -rw-r--r-- | x11-libs/cairo/libpng14.patch | 12 |
5 files changed, 34 insertions, 21 deletions
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS index 1c338a4f4f..f35970f548 100755 --- a/x11-libs/cairo/DETAILS +++ b/x11-libs/cairo/DETAILS @@ -1,13 +1,15 @@ SPELL=cairo if [[ $CAIRO_DEVEL == y ]]; then - VERSION=1.9.14 - SOURCE_HASH=sha512:c38556c9ad0e2db9e627a40a02050ad6d459b5d53ea8b827304a3898623215d0c65bcfab94b5eef13d8acc20d041e4d708a04c13a9936111577954b0ce626d73 + VERSION=1.10.0 + PATCHLEVEL=1 + SOURCE_HASH=sha512:5595e15dcfbf67f0c148bb9587472d2125be3eb524491f9780098b1303e9a08d3431a07cbccffb9601be0852d05c4a6f7cfc71c4fa13f7972b457e2f8a5b10f6 SOURCE=$SPELL-$VERSION.tar.gz - SOURCE_URL[0]=http://cairographics.org/snapshots/$SOURCE + SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE # SOURCE_GPG=gurus.gpg:$SOURCE.sig else - VERSION=1.8.8 - SOURCE_HASH=sha512:74d94e7239b1b4e3f4db9cc59fa44145838b13ad56e32b7bc165d62c8841f7e4c9b86e52e182b5b2811e6e034cf794fc7478a24828ed0d16f1fa4a9180c50d25 + VERSION=1.10.0 + PATCHLEVEL=1 + SOURCE_HASH=sha512:5595e15dcfbf67f0c148bb9587472d2125be3eb524491f9780098b1303e9a08d3431a07cbccffb9601be0852d05c4a6f7cfc71c4fa13f7972b457e2f8a5b10f6 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE fi diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY index 1fac66826c..f4ea246e85 100644 --- a/x11-libs/cairo/HISTORY +++ b/x11-libs/cairo/HISTORY @@ -1,3 +1,13 @@ +2010-09-15 Bor Kraljič <pyrobor@ver.si> + * cairo-1.10.0-buggy_gradients.patch: patch for gentoo bug #336696 + * PRE_BUILD: apply the patch + * DETAILS: PATCHLEVEL++ + +2010-09-10 George Sherwood <gsherwood@sourcemage.org> + * DETAILS: Updated devel and stable to 1.10.0 + * libpng14.patch: removed, no longer needed + * PRE_BUILD: removed, no longer needed + 2010-08-21 Remko van der Vossen <wich@sourcemage.org> * DETAILS: reverted stable to 1.8.8, compiles now with patch diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD index a3184fd536..682b8e2b76 100755 --- a/x11-libs/cairo/PRE_BUILD +++ b/x11-libs/cairo/PRE_BUILD @@ -1,5 +1,4 @@ mk_source_dir $SOURCE_DIRECTORY && -unpack_file && -if [[ $VERSION == "1.8.8" ]]; then - patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/libpng14.patch -fi + unpack_file && +# http://bugs.gentoo.org/show_bug.cgi?id=336696 +patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch diff --git a/x11-libs/cairo/cairo-1.10.0-buggy_gradients.patch b/x11-libs/cairo/cairo-1.10.0-buggy_gradients.patch new file mode 100644 index 0000000000..a3a4a96120 --- /dev/null +++ b/x11-libs/cairo/cairo-1.10.0-buggy_gradients.patch @@ -0,0 +1,14 @@ +--- a/src/cairo-xlib-display.c.ubuntu 2010-08-04 11:57:49.000000000 +0200 ++++ b/src/cairo-xlib-display.c 2010-08-04 11:58:28.000000000 +0200 +@@ -353,11 +353,7 @@ + /* Prior to Render 0.10, there is no protocol support for gradients and + * we call function stubs instead, which would silently consume the drawing. + */ +-#if RENDER_MAJOR == 0 && RENDER_MINOR < 10 + display->buggy_gradients = TRUE; +-#else +- display->buggy_gradients = FALSE; +-#endif + display->buggy_pad_reflect = FALSE; + display->buggy_repeat = FALSE; + diff --git a/x11-libs/cairo/libpng14.patch b/x11-libs/cairo/libpng14.patch deleted file mode 100644 index 1cd4a3c636..0000000000 --- a/x11-libs/cairo/libpng14.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure b/configure ---- a/configure -+++ b/configure -@@ -161,7 +161,7 @@ CAIRO_ENABLE_FUNCTIONS(png, PNG, yes, [ - AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config]) - if test "x$png_REQUIRES" = x; then - # libpng13 is GnuWin32's libpng-1.2.8 :-( -- for l in libpng12 libpng13 libpng10 ; do -+ for l in libpng12 libpng13 libpng10 libpng ; do - if $PKG_CONFIG --exists $l ; then - png_REQUIRES=$l - use_png=yes |