public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Merge the x-updates branch.

Browse Source 
svn path=/nixpkgs/trunk/; revision=26330
This commit is contained in:
Eelco Dolstra
2011-03-15 18:29:27 +00:00
parent 0afc4b949e 0648ceff32
commit f208edd1a5
63 changed files with 1527 additions and 1185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/atk/1.28.x.nix → pkgs/development/libraries/atk/1.32.x.nix
View File

@@ -1,16 +1,18 @@
{ stdenv, fetchurl, pkgconfig, perl, glib }:
stdenv.mkDerivation rec {
name = "atk-1.28.0";
name = "atk-1.32.0";
src = fetchurl {
url = "mirror://gnome/sources/atk/1.28/${name}.tar.bz2";
sha256 = "11zyamivv7fcj9ap3w3bn3gm89mkni9waf51fx75zmfjh3jrznp4";
url = "mirror://gnome/sources/atk/1.32/${name}.tar.bz2";
sha256 = "e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e";
};
buildInputs = [pkgconfig perl];
propagatedBuildInputs = [glib];
buildInputs = [ pkgconfig perl ];
propagatedBuildInputs = [ glib ];
postInstall = "rm -rf $out/share/gtk-doc";
meta = {
description = "ATK, the accessibility toolkit";

60
pkgs/development/libraries/cairo/1.10.nix
View File

@@ -1,60 +0,0 @@
{ postscriptSupport ? true
, pdfSupport ? true
, pngSupport ? true
, xcbSupport ? false
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype
, zlib, libpng, pixman, libxcb ? null, xcbutil ? null
}:
assert postscriptSupport -> zlib != null;
assert pngSupport -> libpng != null;
assert xcbSupport -> libxcb != null && xcbutil != null;
stdenv.mkDerivation rec {
name = "cairo-1.10.0";
src = fetchurl {
url = "http://cairographics.org/releases/${name}.tar.gz";
sha256 = "1cllxp8rx5zxkfpn36ysqg1kqz5d1cvbbf2fsy440n8m8v6f8b0g";
};
buildInputs =
[ pkgconfig x11 fontconfig pixman ] ++
stdenv.lib.optionals xcbSupport [ libxcb xcbutil ];
propagatedBuildInputs =
[ freetype ] ++
stdenv.lib.optional postscriptSupport zlib ++
stdenv.lib.optional pngSupport libpng;
configureFlags =
stdenv.lib.optional xcbSupport "--enable-xcb" ++
stdenv.lib.optional pdfSupport "--enable-pdf";
preConfigure = ''
# Work around broken `Requires.private' that prevents Freetype
# `-I' flags to be propagated.
sed -i "src/cairo.pc.in" \
-es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g'
'';
meta = {
description = "A 2D graphics library with support for multiple output devices";
longDescription = ''
Cairo is a 2D graphics library with support for multiple output
devices. Currently supported output targets include the X
Window System, Quartz, Win32, image buffers, PostScript, PDF,
and SVG file output. Experimental backends include OpenGL
(through glitz), XCB, BeOS, OS/2, and DirectFB.
Cairo is designed to produce consistent output on all output
media while taking advantage of display hardware acceleration
when available (e.g., through the X Render Extension).
'';
homepage = http://cairographics.org/;
licenses = [ "LGPLv2+" "MPLv1" ];
};
}

16
pkgs/development/libraries/cairo/default.nix
View File

@@ -2,7 +2,7 @@
, pdfSupport ? true
, pngSupport ? true
, xcbSupport ? false
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
, zlib, libpng, pixman, libxcb ? null, xcbutil ? null
}:
@@ -11,15 +11,15 @@ assert pngSupport -> libpng != null;
assert xcbSupport -> libxcb != null && xcbutil != null;
stdenv.mkDerivation rec {
name = "cairo-1.8.10";
name = "cairo-1.10.2";
src = fetchurl {
url = "http://cairographics.org/releases/${name}.tar.gz";
sha1 = "fd5e8ca82ff0e8542ea4c51612cad387f2a49df3";
sha1 = "ccce5ae03f99c505db97c286a0c9a90a926d3c6e";
};
buildInputs =
[ pkgconfig x11 fontconfig pixman ] ++
[ pkgconfig x11 fontconfig pixman xlibs.libXrender ] ++
stdenv.lib.optionals xcbSupport [ libxcb xcbutil ];
propagatedBuildInputs =
@@ -28,8 +28,9 @@ stdenv.mkDerivation rec {
stdenv.lib.optional pngSupport libpng;
configureFlags =
stdenv.lib.optional xcbSupport "--enable-xcb" ++
stdenv.lib.optional pdfSupport "--enable-pdf";
[ "--enable-tee" ]
++ stdenv.lib.optional xcbSupport "--enable-xcb"
++ stdenv.lib.optional pdfSupport "--enable-pdf";
preConfigure = ''
# Work around broken `Requires.private' that prevents Freetype
@@ -38,6 +39,9 @@ stdenv.mkDerivation rec {
-es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g'
'';
# The default `--disable-gtk-doc' is ignored.
postInstall = "rm -rf $out/share/gtk-doc";
meta = {
description = "A 2D graphics library with support for multiple output devices";

6
pkgs/development/libraries/clutter-gtk/default.nix
View File

@@ -1,17 +1,19 @@
{ fetchurl, stdenv, pkgconfig, clutter, gtk }:
stdenv.mkDerivation rec {
name = "clutter-gtk-0.10.4";
name = "clutter-gtk-0.10.8";
src = fetchurl {
url = "http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2";
sha256 = "04mrq5ddj24zhh7dvyp9bl8510wq7qpmy3rl3wiqwl9c43gahd01";
sha256 = "0508x1jfnlq0zhgscysvfa7i7ljkzm23d2myikvdjwc8ar8zjrvq";
};
buildInputs = [ pkgconfig clutter gtk ];
preConfigure = "export V=1";
postBuild = "rm -rf $out/share/gtk-doc";
meta = {
description = "Clutter-GTK";

5
pkgs/development/libraries/clutter/default.nix
View File

@@ -2,11 +2,11 @@
, libXcomposite, cairo, glib, pango, gtk, json_glib }:
stdenv.mkDerivation rec {
name = "clutter-1.4.0";
name = "clutter-1.4.2";
src = fetchurl {
url = "http://source.clutter-project.org/sources/clutter/1.4/${name}.tar.bz2";
sha256 = "15icq2gf2fi098lq1wqr7sq2cnb00g1ids050a5z3f43l1ajrnxw";
sha256 = "14l8wgk5jdwsnjf991qgzl115kjs1xywil2awlrwj1airsn6gzcj";
};
buildInputs = [ pkgconfig ];
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
libXi libXfixes libXdamage libXcomposite
];
meta = {
description = "Clutter, a library for creating fast, dynamic graphical user interfaces";

4
pkgs/development/libraries/dbus/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }:
let
version = "1.2.24";
version = "1.4.6";
src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
sha256 = "0j2wb79kndq4b1qqr59n1g6s0lm7yp6r9ny3skimadkh9a7p8b7i";
sha256 = "0rx5p1f0jg4ch4958qb3ld3w3cw57a0rmvmxjgn1ir9dvxj1wgkm";
};
patches = [ ./ignore-missing-includedirs.patch ];

18
pkgs/development/libraries/expat/cve-2009-3560.patch Normal file
View File

@@ -0,0 +1,18 @@
From: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/expat/files/expat-2.0.1-CVE-2009-3560-revised.patch?revision=1.1
http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-3560
http://bugs.gentoo.org/show_bug.cgi?id=303727
http://cvs.fedoraproject.org/viewvc/rpms/expat/devel/
--- a/lib/xmlparse.c
+++ b/lib/xmlparse.c
@@ -3703,6 +3703,9 @@ doProlog(XML_Parser parser,
return XML_ERROR_UNCLOSED_TOKEN;
case XML_TOK_PARTIAL_CHAR:
return XML_ERROR_PARTIAL_CHAR;
+ case -XML_TOK_PROLOG_S:
+ tok = -tok;
+ break;
case XML_TOK_NONE:
#ifdef XML_DTD
/* for internal PE NOT referenced between declarations */

12
pkgs/development/libraries/expat/default.nix
View File

@@ -1,7 +1,17 @@
{stdenv, fetchurl}: stdenv.mkDerivation {
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "expat-2.0.1";
src = fetchurl {
url = mirror://sourceforge/expat/expat-2.0.1.tar.gz;
sha256 = "14sy5qx9hgjyfs743iq8ywldhp5w4n6cscqf2p4hgrw6vys60xl4";
};
patches = [ ./cve-2009-3560.patch ];
meta = {
homepage = http://expat.sourceforge.net/;
description = "A stream-oriented XML parser library written in C";
};
}

4
pkgs/development/libraries/freetype/default.nix
View File

@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
name = "freetype-2.4.1";
name = "freetype-2.4.4";
src = fetchurl {
url = "mirror://sourceforge/freetype/${name}.tar.bz2";
sha256 = "0gmyk6w7rbiiw7zjbyvkvp8wfl7q9n5576ifqq67qwsjdzlm9ja5";
sha256 = "1vqg93473j6jma1bxms7mczk32j8is0g9inkcmmmqdsdvk3q30jb";
};
configureFlags = "--disable-static";

24
pkgs/development/libraries/gdk-pixbuf/2.22.x.nix Normal file
View File

@@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs }:
stdenv.mkDerivation rec {
name = "gdk-pixbuf-2.22.1";
src = fetchurl {
url = "mirror://gnome/sources/gdk-pixbuf/2.22/${name}.tar.bz2";
sha256 = "6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d";
};
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
buildInputs = [ pkgconfig glib libtiff libjpeg libpng xlibs.xlibs ];
postInstall = "rm -rf $out/share/gtk-doc";
meta = {
description = "A library for image loading and manipulation";
homepage = http://library.gnome.org/devel/gdk-pixbuf/;
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.linux;
};
}

13
pkgs/development/libraries/gdk-pixbuf/default.nix
View File

@@ -1,13 +0,0 @@
{stdenv, fetchurl, gtk, libtiff, libjpeg, libpng}:
stdenv.mkDerivation rec {
name = "gdk-pixbuf-0.22.0";
src = fetchurl {
url = "ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/0.22/${name}.tar.bz2";
md5 = "05fcb68ceaa338614ab650c775efc2f2";
};
buildInputs = [libtiff libjpeg libpng];
propagatedBuildInputs = [gtk];
}

36
pkgs/development/libraries/glib/2.22.x.nix
View File

@@ -1,36 +0,0 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv}:
stdenv.mkDerivation rec {
name = "glib-2.22.5";
src = fetchurl {
url = "mirror://gnome/sources/glib/2.22/${name}.tar.bz2";
sha256 = "802be9c9ffeb631725ffd6ed35af0af309776729a7fab4fcb48f2b0b8fe7245b";
};
buildInputs = [pkgconfig gettext perl]
++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
# The nbd package depends on a static version of this library; hence
# the default configure flag --disable-static is switched off.
dontDisableStatic = true;
configureFlags = "--enable-static --enable-shared";
meta = {
description = "GLib, a C library of programming buildings blocks";
longDescription = ''
GLib provides the core application building blocks for libraries
and applications written in C. It provides the core object
system used in GNOME, the main loop implementation, and a large
set of utility functions for strings and common data structures.
'';
homepage = http://www.gtk.org/;
license = "LGPLv2+";
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/development/libraries/glib/2.24.x.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib }:
stdenv.mkDerivation rec {
name = "glib-2.24.1";
name = "glib-2.24.2";
src = fetchurl {
url = "mirror://gnome/sources/glib/2.24/${name}.tar.bz2";
sha256 = "014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04";
sha256 = "030nl16xa2ps9bklm2l81w0yamsrj5a0x7rp4h9dshinpld55srs";
};
buildInputs = [ pkgconfig gettext ]

10
pkgs/development/libraries/glib/2.28.x.nix
View File

@@ -1,19 +1,25 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib }:
stdenv.mkDerivation rec {
name = "glib-2.28.1";
name = "glib-2.28.3";
src = fetchurl {
url = "mirror://gnome/sources/glib/2.28/${name}.tar.bz2";
sha256 = "1b85b998909202c07c2def66613ae6736aac48d7a0a7c98f98967b936fe9de22";
sha256 = "7e1ab62d0f0cdc3f0ce8214b77d104b3abbd51185a9f3fc9b6a504cce26f6fab";
};
# configure script looks for d-bus but it is only needed for tests
buildInputs = [ pkgconfig gettext ]
++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
buildNativeInputs = [ perl ];
propagatedBuildInputs = [ zlib ];
# glib buildsystem fails to find python, thus hardcodes python2.4 in #!
postInstall = ''
rm -rvf $out/share/gtk-doc
sed -e 's@python2\.4@python@' -i $out/bin/gtester-report'';
meta = {
description = "GLib, a C library of programming buildings blocks";

4
pkgs/development/libraries/gmime/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, zlib }:
stdenv.mkDerivation rec {
name = "gmime-2.4.17";
name = "gmime-2.4.22";
src = fetchurl {
url = "mirror://gnome/sources/gmime/2.4/${name}.tar.gz";
sha256 = "1l1pbk0yrr7zwl90aabdhw0f9i4m6ragsfyk5qwg0hzk21abz9wd";
sha256 = "0s93amrj7fh3p8lv770p7mrml07m6dps6srwi1wn76d2rfb944xn";
};
buildInputs = [ pkgconfig glib zlib ];

17
pkgs/development/libraries/gobject-introspection/default.nix
View File

@@ -1,22 +1,27 @@
{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python, cairo }:
{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python }:
let
baseName = "gobject-introspection";
v = "0.6.10";
v = "0.10.2";
in
stdenv.mkDerivation rec {
name = "${baseName}-${v}";
buildInputs = [ flex bison glib pkgconfig python cairo ];
buildInputs = [ flex bison glib pkgconfig python ];
propagatedBuildInputs = [ libffi ];
configureFlags = "--enable-gcov";
# Tests depend on cairo, which is undesirable (it pulls in lots of
# other dependencies).
configureFlags = "--disable-tests";
src = fetchurl {
url = "mirror://gnome/sources/${baseName}/0.6/${name}.tar.bz2";
sha256 = "0jwd7bybgvg6dwhg64da8k9yjrs37y5p153gaaapz5j59ld53g9n";
url = "mirror://gnome/sources/${baseName}/0.10/${name}.tar.bz2";
sha256 = "18di6v39hibb6j39vs0a5icaafihfryh8250kz7x1q1313pvm62v";
};
postInstall = "rm -rf $out/share/gtk-doc";
meta = with stdenv.lib; {
maintainers = [ maintainers.urkud ];
platforms = platforms.linux;

2
pkgs/development/libraries/gtk+/2.20.x.nix
View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig jasper ];
propagatedBuildInputs =
[ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ]
[ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr xlibs.libXrender ]
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ];

24
pkgs/development/libraries/gtk+/2.18.x.nix → pkgs/development/libraries/gtk+/2.24.x.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, atk, pango, libtiff, libjpeg
, libpng, cairo, perl, jasper, xlibs
, libpng, cairo, perl, jasper, xlibs, gdk_pixbuf
, xineramaSupport ? true
, cupsSupport ? true, cups ? null
}:
@@ -8,21 +8,35 @@ assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null;
stdenv.mkDerivation rec {
name = "gtk+-2.18.9";
name = "gtk+-2.24.3";
src = fetchurl {
url = "mirror://gnome/sources/gtk+/2.18/${name}.tar.bz2";
sha256 = "5dcd8c406acbb8779c0b081a089fa87dfd7ab4d7d4c6075db478997ce96aa9b4";
url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.bz2";
sha256 = "336ddf3dd342cc36bee80dd4f86ef036044a2deb10cda67c8eecf5315b279ef7";
};
patches =
[ # Fix broken icons such as the back/forward buttons in Firefox.
# http://bugs.gentoo.org/339319
./old-icons.patch
];
enableParallelBuilding = true;
buildNativeInputs = [ perl ];
buildInputs = [ pkgconfig jasper ];
propagatedBuildInputs =
[ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ]
[ xlibs.xlibs glib atk pango gdk_pixbuf /* libtiff libjpeg libpng */ cairo
xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
]
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ];
configureFlags = "--with-xinput=yes";
postInstall = "rm -rf $out/share/gtk-doc";
passthru = { inherit libtiff libjpeg libpng; };
meta = {

270
pkgs/development/libraries/gtk+/old-icons.patch Normal file
View File

@@ -0,0 +1,270 @@
diff -ru -x '*~' gtk+-2.24.0-orig//gtk/Makefile.in gtk+-2.24.0//gtk/Makefile.in
--- gtk+-2.24.0-orig//gtk/Makefile.in 2011-01-30 05:39:20.000000000 +0100
+++ gtk+-2.24.0//gtk/Makefile.in 2011-02-14 00:06:56.000000000 +0100
@@ -1601,7 +1601,173 @@
stock-icons/24/folder-remote.png \
stock-icons/24/user-home.png \
stock-icons/24/user-desktop.png \
- stock-icons/24/text-x-generic.png
+ stock-icons/24/text-x-generic.png \
+ stock-icons/16/gtk-quit.png \
+ stock-icons/16/gtk-info.png \
+ stock-icons/16/gtk-file.png \
+ stock-icons/16/gtk-open.png \
+ stock-icons/16/gtk-print-preview.png \
+ stock-icons/16/gtk-print.png \
+ stock-icons/16/gtk-properties.png \
+ stock-icons/16/gtk-revert-to-saved-ltr.png \
+ stock-icons/16/gtk-revert-to-saved-rtl.png \
+ stock-icons/16/gtk-save-as.png \
+ stock-icons/16/gtk-new.png \
+ stock-icons/16/gtk-harddisk.png \
+ stock-icons/16/gtk-clear.png \
+ stock-icons/16/gtk-copy.png \
+ stock-icons/16/gtk-cut.png \
+ stock-icons/16/gtk-delete.png \
+ stock-icons/16/gtk-find-and-replace.png \
+ stock-icons/16/gtk-find.png \
+ stock-icons/16/gtk-paste.png \
+ stock-icons/16/gtk-redo-ltr.png \
+ stock-icons/16/gtk-redo-rtl.png \
+ stock-icons/16/gtk-select-all.png \
+ stock-icons/16/gtk-undo-ltr.png \
+ stock-icons/16/gtk-undo-rtl.png \
+ stock-icons/16/gtk-directory.png \
+ stock-icons/16/gtk-unindent-ltr.png \
+ stock-icons/16/gtk-unindent-rtl.png \
+ stock-icons/16/gtk-indent-ltr.png \
+ stock-icons/16/gtk-indent-rtl.png \
+ stock-icons/16/gtk-justify-center.png \
+ stock-icons/16/gtk-justify-fill.png \
+ stock-icons/16/gtk-justify-left.png \
+ stock-icons/16/gtk-justify-right.png \
+ stock-icons/16/gtk-bold.png \
+ stock-icons/16/gtk-italic.png \
+ stock-icons/16/gtk-strikethrough.png \
+ stock-icons/16/gtk-underline.png \
+ stock-icons/16/gtk-goto-bottom.png \
+ stock-icons/16/gtk-go-down.png \
+ stock-icons/16/gtk-goto-first-ltr.png \
+ stock-icons/16/gtk-home.png \
+ stock-icons/16/gtk-jump-to-ltr.png \
+ stock-icons/16/gtk-jump-to-rtl.png \
+ stock-icons/16/gtk-goto-last-ltr.png \
+ stock-icons/16/gtk-go-forward-ltr.png \
+ stock-icons/16/gtk-go-back-ltr.png \
+ stock-icons/16/gtk-goto-top.png \
+ stock-icons/16/gtk-go-up.png \
+ stock-icons/16/gtk-about.png \
+ stock-icons/16/gtk-help.png \
+ stock-icons/16/gtk-missing-image.png \
+ stock-icons/16/gtk-add.png \
+ stock-icons/16/gtk-remove.png \
+ stock-icons/16/gtk-floppy.png \
+ stock-icons/16/gtk-cdrom.png \
+ stock-icons/16/gtk-media-pause.png \
+ stock-icons/16/gtk-media-play-ltr.png \
+ stock-icons/16/gtk-media-play-rtl.png \
+ stock-icons/16/gtk-media-stop.png \
+ stock-icons/16/gtk-media-record.png \
+ stock-icons/16/gtk-media-rewind-ltr.png \
+ stock-icons/16/gtk-media-forward-ltr.png \
+ stock-icons/16/gtk-media-previous-ltr.png \
+ stock-icons/16/gtk-media-next-ltr.png \
+ stock-icons/16/gtk-network.png \
+ stock-icons/16/gtk-print-error.png \
+ stock-icons/16/gtk-print-report.png \
+ stock-icons/16/gtk-print-paused.png \
+ stock-icons/16/gtk-print-warning.png \
+ stock-icons/16/gtk-stop.png \
+ stock-icons/16/gtk-execute.png \
+ stock-icons/16/gtk-spell-check.png \
+ stock-icons/16/gtk-fullscreen.png \
+ stock-icons/16/gtk-refresh.png \
+ stock-icons/16/gtk-leave-fullscreen.png \
+ stock-icons/16/gtk-sort-ascending.png \
+ stock-icons/16/gtk-sort-descending.png \
+ stock-icons/16/gtk-close.png \
+ stock-icons/16/gtk-zoom-fit.png \
+ stock-icons/16/gtk-zoom-in.png \
+ stock-icons/16/gtk-zoom-100.png \
+ stock-icons/16/gtk-zoom-out.png \
+ stock-icons/24/gtk-quit.png \
+ stock-icons/24/gtk-info.png \
+ stock-icons/24/gtk-file.png \
+ stock-icons/24/gtk-open.png \
+ stock-icons/24/gtk-print-preview.png \
+ stock-icons/24/gtk-print.png \
+ stock-icons/24/gtk-properties.png \
+ stock-icons/24/gtk-revert-to-saved-ltr.png \
+ stock-icons/24/gtk-revert-to-saved-rtl.png \
+ stock-icons/24/gtk-save-as.png \
+ stock-icons/24/gtk-new.png \
+ stock-icons/24/gtk-harddisk.png \
+ stock-icons/24/gtk-clear.png \
+ stock-icons/24/gtk-copy.png \
+ stock-icons/24/gtk-cut.png \
+ stock-icons/24/gtk-delete.png \
+ stock-icons/24/gtk-find-and-replace.png \
+ stock-icons/24/gtk-find.png \
+ stock-icons/24/gtk-paste.png \
+ stock-icons/24/gtk-redo-ltr.png \
+ stock-icons/24/gtk-redo-rtl.png \
+ stock-icons/24/gtk-select-all.png \
+ stock-icons/24/gtk-undo-ltr.png \
+ stock-icons/24/gtk-undo-rtl.png \
+ stock-icons/24/gtk-directory.png \
+ stock-icons/24/gtk-unindent-ltr.png \
+ stock-icons/24/gtk-unindent-rtl.png \
+ stock-icons/24/gtk-indent-ltr.png \
+ stock-icons/24/gtk-indent-rtl.png \
+ stock-icons/24/gtk-justify-center.png \
+ stock-icons/24/gtk-justify-fill.png \
+ stock-icons/24/gtk-justify-left.png \
+ stock-icons/24/gtk-justify-right.png \
+ stock-icons/24/gtk-bold.png \
+ stock-icons/24/gtk-italic.png \
+ stock-icons/24/gtk-strikethrough.png \
+ stock-icons/24/gtk-underline.png \
+ stock-icons/24/gtk-goto-bottom.png \
+ stock-icons/24/gtk-go-down.png \
+ stock-icons/24/gtk-goto-first-ltr.png \
+ stock-icons/24/gtk-home.png \
+ stock-icons/24/gtk-jump-to-ltr.png \
+ stock-icons/24/gtk-jump-to-rtl.png \
+ stock-icons/24/gtk-goto-last-ltr.png \
+ stock-icons/24/gtk-go-forward-ltr.png \
+ stock-icons/24/gtk-go-back-ltr.png \
+ stock-icons/24/gtk-goto-top.png \
+ stock-icons/24/gtk-go-up.png \
+ stock-icons/24/gtk-about.png \
+ stock-icons/24/gtk-help.png \
+ stock-icons/24/gtk-missing-image.png \
+ stock-icons/24/gtk-add.png \
+ stock-icons/24/gtk-remove.png \
+ stock-icons/24/gtk-floppy.png \
+ stock-icons/24/gtk-cdrom.png \
+ stock-icons/24/gtk-media-pause.png \
+ stock-icons/24/gtk-media-play-ltr.png \
+ stock-icons/24/gtk-media-play-rtl.png \
+ stock-icons/24/gtk-media-stop.png \
+ stock-icons/24/gtk-media-record.png \
+ stock-icons/24/gtk-media-rewind-ltr.png \
+ stock-icons/24/gtk-media-forward-ltr.png \
+ stock-icons/24/gtk-media-previous-ltr.png \
+ stock-icons/24/gtk-media-next-ltr.png \
+ stock-icons/24/gtk-network.png \
+ stock-icons/24/gtk-print-error.png \
+ stock-icons/24/gtk-print-report.png \
+ stock-icons/24/gtk-print-paused.png \
+ stock-icons/24/gtk-print-warning.png \
+ stock-icons/24/gtk-stop.png \
+ stock-icons/24/gtk-execute.png \
+ stock-icons/24/gtk-spell-check.png \
+ stock-icons/24/gtk-fullscreen.png \
+ stock-icons/24/gtk-refresh.png \
+ stock-icons/24/gtk-leave-fullscreen.png \
+ stock-icons/24/gtk-sort-ascending.png \
+ stock-icons/24/gtk-sort-descending.png \
+ stock-icons/24/gtk-close.png \
+ stock-icons/24/gtk-zoom-fit.png \
+ stock-icons/24/gtk-zoom-in.png \
+ stock-icons/24/gtk-zoom-100.png \
+ stock-icons/24/gtk-zoom-out.png \
+ stock-icons/48/gtk-dialog-error.png
+
@CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
@CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache
@@ -2873,7 +3039,91 @@
&& $(LN_S) folder.png user-desktop.png \
&& $(RM) text-x-generic.png \
&& $(LN_S) document-x-generic.png text-x-generic.png \
+ && $(LN_S) application-exit.png gtk-quit.png \
+ && $(LN_S) dialog-information.png gtk-info.png \
+ && $(LN_S) document-new.png gtk-file.png \
+ && $(LN_S) document-open.png gtk-open.png \
+ && $(LN_S) document-print-preview.png gtk-print-preview.png \
+ && $(LN_S) document-print.png gtk-print.png \
+ && $(LN_S) document-properties.png gtk-properties.png \
+ && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png \
+ && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png \
+ && $(LN_S) document-save-as.png gtk-save-as.png \
+ && $(LN_S) document-x-generic.png gtk-new.png \
+ && $(LN_S) drive-harddisk.png gtk-harddisk.png \
+ && $(LN_S) edit-clear.png gtk-clear.png \
+ && $(LN_S) edit-copy.png gtk-copy.png \
+ && $(LN_S) edit-cut.png gtk-cut.png \
+ && $(LN_S) edit-delete.png gtk-delete.png \
+ && $(LN_S) edit-find-replace.png gtk-find-and-replace.png \
+ && $(LN_S) edit-find.png gtk-find.png \
+ && $(LN_S) edit-paste.png gtk-paste.png \
+ && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png \
+ && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png \
+ && $(LN_S) edit-select-all.png gtk-select-all.png \
+ && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png \
+ && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png \
+ && $(LN_S) folder.png gtk-directory.png \
+ && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png \
+ && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png \
+ && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png \
+ && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png \
+ && $(LN_S) format-justify-center.png gtk-justify-center.png \
+ && $(LN_S) format-justify-fill.png gtk-justify-fill.png \
+ && $(LN_S) format-justify-left.png gtk-justify-left.png \
+ && $(LN_S) format-justify-right.png gtk-justify-right.png \
+ && $(LN_S) format-text-bold.png gtk-bold.png \
+ && $(LN_S) format-text-italic.png gtk-italic.png \
+ && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png \
+ && $(LN_S) format-text-underline.png gtk-underline.png \
+ && $(LN_S) go-bottom.png gtk-goto-bottom.png \
+ && $(LN_S) go-down.png gtk-go-down.png \
+ && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png \
+ && $(LN_S) go-home.png gtk-home.png \
+ && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png \
+ && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png \
+ && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png \
+ && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png \
+ && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png \
+ && $(LN_S) go-top.png gtk-goto-top.png \
+ && $(LN_S) go-up.png gtk-go-up.png \
+ && $(LN_S) help-about.png gtk-about.png \
+ && $(LN_S) help-contents.png gtk-help.png \
+ && $(LN_S) image-missing.png gtk-missing-image.png \
+ && $(LN_S) list-add.png gtk-add.png \
+ && $(LN_S) list-remove.png gtk-remove.png \
+ && $(LN_S) media-floppy.png gtk-floppy.png \
+ && $(LN_S) media-optical.png gtk-cdrom.png \
+ && $(LN_S) media-playback-pause.png gtk-media-pause.png \
+ && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png \
+ && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png \
+ && $(LN_S) media-playback-stop.png gtk-media-stop.png \
+ && $(LN_S) media-record.png gtk-media-record.png \
+ && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png \
+ && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png \
+ && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png \
+ && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png \
+ && $(LN_S) network-idle.png gtk-network.png \
+ && $(LN_S) printer-error.png gtk-print-error.png \
+ && $(LN_S) printer-info.png gtk-print-report.png \
+ && $(LN_S) printer-paused.png gtk-print-paused.png \
+ && $(LN_S) printer-warning.png gtk-print-warning.png \
+ && $(LN_S) process-stop.png gtk-stop.png \
+ && $(LN_S) system-run.png gtk-execute.png \
+ && $(LN_S) tools-check-spelling.png gtk-spell-check.png \
+ && $(LN_S) view-fullscreen.png gtk-fullscreen.png \
+ && $(LN_S) view-refresh.png gtk-refresh.png \
+ && $(LN_S) view-restore.png gtk-leave-fullscreen.png \
+ && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png \
+ && $(LN_S) view-sort-descending.png gtk-sort-descending.png \
+ && $(LN_S) window-close.png gtk-close.png \
+ && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png \
+ && $(LN_S) zoom-in.png gtk-zoom-in.png \
+ && $(LN_S) zoom-original.png gtk-zoom-100.png \
+ && $(LN_S) zoom-out.png gtk-zoom-out.png \
) done \
+ && (cd stock-icons/48 \
+ && $(LN_S) dialog-error.png gtk-dialog-error.png) \
&& touch stamp-icons
gtkbuiltincache.h: @REBUILD@ stamp-icons

4
pkgs/development/libraries/libdrm/default.nix
View File

@@ -1,11 +1,11 @@
{stdenv, fetchurl, pkgconfig, libpthreadstubs}:
stdenv.mkDerivation rec {
name = "libdrm-2.4.22";
name = "libdrm-2.4.24";
src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "0gbb7i282i6gf2wzbzkcz5j662v4ixpfjf0gv0090k89wjafbc0b";
sha256 = "19dnzy7g6jqfjz38dp187b97vb4a8h4k748x56gsyn24ys0j60f7";
};
buildInputs = [ pkgconfig libpthreadstubs ];

2
pkgs/development/libraries/libjpeg/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "libjpeg-8";
name = "libjpeg-8c";
src = fetchurl {
url = http://www.ijg.org/files/jpegsrc.v8c.tar.gz;

36
pkgs/development/libraries/mesa/7.9.nix
View File

@@ -1,36 +0,0 @@
{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null,
talloc, python, libxml2, libxml2Python}:
if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
throw "unsupported platform for Mesa"
else
stdenv.mkDerivation rec {
version = "7.9";
name = "mesa-${version}";
src = fetchurl {
url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
sha256 = "1wr927mdghn7w1cmp0bxswjda5s2x0hwfpf8zcc9x03da7s6gkg0";
};
configureFlags =
"--disable-gallium"
+ (if stdenv.system == "mips64-linux" then
" --with-dri-drivers=swrast --with-driver=dri" else "")
+ (if stdenv.isDarwin then " --disable-egl" else "");
buildInputs =
[ pkgconfig expat x11 libdrm xlibs.glproto
xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
lipo talloc python libxml2 libxml2Python
];
passthru = { inherit libdrm; };
meta = {
description = "An open source implementation of OpenGL";
homepage = http://www.mesa3d.org/;
license = "bsd";
};
}

24
pkgs/development/libraries/mesa/default.nix
View File

@@ -1,29 +1,35 @@
{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null }:
{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null, talloc }:
if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
throw "unsupported platform for Mesa"
else
let version = "7.10.1"; in
stdenv.mkDerivation {
name = "mesa-7.8.2";
name = "mesa-${version}";
src = fetchurl {
url = ftp://ftp.freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2;
md5 = "6be2d343a0089bfd395ce02aaf8adb57";
url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
md5 = "efe8da4d80c2a5d32a800770b8ce5dfa";
};
patches = [ ./swrast-settexbuffer.patch ];
configureFlags =
"--disable-gallium"
+ (if stdenv.system == "mips64-linux" then
" --with-dri-drivers=swrast --with-driver=dri" else "")
+ (if stdenv.isDarwin then " --disable-egl" else "");
+ stdenv.lib.optionalString (stdenv.system == "mips64-linux")
" --with-dri-drivers=swrast --with-driver=dri"
+ stdenv.lib.optionalString stdenv.isDarwin " --disable-egl";
buildInputs =
[ pkgconfig expat x11 libdrm xlibs.glproto
[ pkgconfig expat x11 libdrm xlibs.makedepend xlibs.glproto
xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
lipo
lipo talloc
];
enableParallelBuilding = true;
passthru = { inherit libdrm; };
meta = {

24
pkgs/development/libraries/mesa/swrast-settexbuffer.patch Normal file
View File

@@ -0,0 +1,24 @@
https://build.opensuse.org/package/view_file?file=0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch&package=Mesa&project=openSUSE%3AFactory&srcmd5=be25d34ad69853c2bb21ed376061d573
diff -ru Mesa-7.10.1-orig//src/mesa/drivers/dri/swrast/swrast.c Mesa-7.10.1//src/mesa/drivers/dri/swrast/swrast.c
--- Mesa-7.10.1-orig//src/mesa/drivers/dri/swrast/swrast.c 2010-12-14 22:43:15.000000000 +0100
+++ Mesa-7.10.1//src/mesa/drivers/dri/swrast/swrast.c 2011-03-07 18:08:17.062816112 +0100
@@ -61,6 +61,7 @@
static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
GLint texture_format, __DRIdrawable *dPriv)
{
+ GET_CURRENT_CONTEXT(ctx);
struct dri_context *dri_ctx;
int x, y, w, h;
__DRIscreen *sPriv = dPriv->driScreenPriv;
@@ -90,6 +91,10 @@
_mesa_init_teximage_fields(&dri_ctx->Base, target, texImage,
w, h, 1, 0, internalFormat, texFormat);
+ ctx->Driver.TexImage2D(ctx, target, 0, internalFormat,
+ w, h, 0, texture_format, GL_UNSIGNED_INT_8_8_8_8,
+ NULL, &ctx->Unpack, texObj, texImage);
+
sPriv->swrast_loader->getImage(dPriv, x, y, w, h, (char *)texImage->Data,
dPriv->loaderPrivate);

13
pkgs/development/libraries/openssl/default.nix
View File

@@ -7,11 +7,11 @@ let
in
stdenv.mkDerivation rec {
name = "openssl-1.0.0c";
name = "openssl-1.0.0d";
src = fetchurl {
url = "http://www.openssl.org/source/${name}.tar.gz";
sha256 = "1sq4sswyjxnr08lyjcafwdha6j5jd2b48vxfg48kdapdwdnv6cgp";
sha256 = "1nr0cf6pf8i4qsnx31kqhiqv402xgn76yhjhlbdri8ma1hgislcj";
};
patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
@@ -25,6 +25,15 @@ stdenv.mkDerivation rec {
configureFlags = "shared --libdir=lib";
postInstall =
''
# If we're building dynamic libraries, then don't install static
# libraries.
if [ -n "$(echo $out/lib/*.so)" ]; then
rm $out/lib/*.a
fi
''; # */
crossAttrs = {
preConfigure=''
# It's configure does not like --build or --host

32
pkgs/development/libraries/pango/1.26.x.nix
View File

@@ -1,32 +0,0 @@
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
stdenv.mkDerivation rec {
name = "pango-1.26.2";
src = fetchurl {
url = "mirror://gnome/sources/pango/1.26/${name}.tar.bz2";
sha256 = "021ygk3l9bk00gsvxk02flxsk68w0wl99dx221fmb547bng8g19v";
};
buildInputs = [pkgconfig] ++ stdenv.lib.optional (stdenv.system == "i686-darwin") gettext;
propagatedBuildInputs = [x11 glib cairo libpng];
meta = {
description = "A library for laying out and rendering of text, with an emphasis on internationalization";
longDescription = ''
Pango is a library for laying out and rendering of text, with an
emphasis on internationalization. Pango can be used anywhere
that text layout is needed, though most of the work on Pango so
far has been done in the context of the GTK+ widget toolkit.
Pango forms the core of text and font handling for GTK+-2.x.
'';
homepage = http://www.pango.org/;
license = "LGPLv2+";
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.all;
};
}

2
pkgs/development/libraries/pango/1.28.x.nix
View File

@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ x11 glib cairo libpng ];
postInstall = "rm -rf $out/share/gtk-doc";
meta = {
description = "A library for laying out and rendering of text, with an emphasis on internationalization";

4
pkgs/development/libraries/polkit/default.nix
View File

@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
name = "polkit-0.96";
name = "polkit-0.99";
src = fetchurl {
url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
sha256 = "0jh5v0dhf9msvmfmr9d67563m64gq5l96m9jax9abchhfa8wl9il";
sha256 = "0gsqnc5x6angma7paw0hnl5cagqimsj5f022a5vzc8n8dv1cf4pn";
};
buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext

5
pkgs/development/libraries/talloc/default.nix
View File

@@ -1,4 +1,4 @@
{ fetchurl, stdenv}:
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "talloc-2.0.1";
@@ -9,12 +9,11 @@ stdenv.mkDerivation rec {
};
configureFlags = "--enable-talloc-compat1 --enable-largefile";
meta = {
description = "talloc is a hierarchical pool based memory allocator with destructors";
homepage = http://tdb.samba.org/;
license = "GPLv3";
platforms = stdenv.lib.platforms.all;
};
}