* Cairo 1.4.4. This fixes some bad interaction with the latest

xorg-server (namely, BadMatch crashes in programs such as
  gtk-window-decorator in compiz).
* Some GTK updates while we're at it.

svn path=/nixpkgs/trunk/; revision=8617
This commit is contained in:
Eelco Dolstra 2007-04-26 18:37:33 +00:00
parent 50cc2acd23
commit cdad298040
3 changed files with 9 additions and 9 deletions

View File

@ -9,10 +9,10 @@ assert postscriptSupport -> zlib != null;
assert pngSupport -> libpng != null; assert pngSupport -> libpng != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cairo-1.2.6"; name = "cairo-1.4.4";
src = fetchurl { src = fetchurl {
url = http://cairographics.org/releases/cairo-1.2.6.tar.gz; url = http://cairographics.org/releases/cairo-1.4.4.tar.gz;
sha1 = "b86b4017a9abd565ef11c72b7faee9082a04118f"; sha1 = "71a7ce8352500944f7b2b73d4dc25ee947ec56ec";
}; };
buildInputs = [ buildInputs = [
pkgconfig x11 fontconfig freetype pkgconfig x11 fontconfig freetype

View File

@ -3,10 +3,10 @@
assert pkgconfig != null && gettext != null && perl != null; assert pkgconfig != null && gettext != null && perl != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "glib-2.12.9"; # <- sic! gtk 2.10 needs glib 2.12 name = "glib-2.12.11"; # <- sic! gtk 2.10 needs glib 2.12
src = fetchurl { src = fetchurl {
url = ftp://ftp.gtk.org/pub/glib/2.12/glib-2.12.9.tar.bz2; url = ftp://ftp.gtk.org/pub/glib/2.12/glib-2.12.11.tar.bz2;
md5 = "b3f6a2a318610af6398b3445f1a2d6c6"; md5 = "077a9917b673a9a0bc63f351786dde24";
}; };
buildInputs = [pkgconfig gettext perl]; buildInputs = [pkgconfig gettext perl];
} }

View File

@ -8,10 +8,10 @@ assert xineramaSupport -> libXinerama != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gtk+-2.10.9"; name = "gtk+-2.10.11";
src = fetchurl { src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-2.10.9.tar.bz2; url = ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-2.10.11.tar.bz2;
md5 = "20d763198efb38263b22dee347f69da6"; md5 = "3b32eab43bf5195d981867d25ba55d66";
}; };
buildInputs = [ buildInputs = [
pkgconfig perl libtiff libjpeg libpng cairo libXrandr pkgconfig perl libtiff libjpeg libpng cairo libXrandr