From e7ccbf5a2bf2913b8a3e50d60ecb509295b4d839 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 30 Sep 2009 05:37:09 +0000
Subject: [PATCH] Now we have fresh GTK/Gnome; try updating WebKit
svn path=/nixpkgs/trunk/; revision=17521
---
pkgs/development/libraries/webkit/default.nix | 11 ++----
.../libraries/webkit/src-for-default.nix | 11 ++++--
.../libraries/webkit/src-info-for-default.nix | 1 +
pkgs/top-level/all-packages.nix | 37 +++++++++++--------
4 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix
index 9b1ab8ee09f..3788aff00b0 100644
--- a/pkgs/development/libraries/webkit/default.nix
+++ b/pkgs/development/libraries/webkit/default.nix
@@ -25,13 +25,8 @@ rec {
"--enable-3D-transforms"
"--enable-filters"
"--enable-web-sockets"
- # Fails the build..
- # "--enable-shared-workers"
- # WML support causes crash on
- # Slashdot.org. It is fixed upstream,
- # but the required update is too big
- # Let us wait for a GTK release..
- #"--enable-wml"
+ # GTK release!
+ "--enable-wml"
];
/* doConfigure should be specified separately */
@@ -59,7 +54,7 @@ rec {
sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h')
'') ["minInit" "doUnpack"];
- name = "webkit-" + version;
+ name = s.name;
meta = {
description = "WebKit - a fast and correct HTML renderer";
maintainers = [stdenv.lib.maintainers.raskin];
diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index 8e9bb08f57d..e1b3fe07d81 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,6 +1,9 @@
rec {
- advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r47011.tar.bz2";
- version = "r47011";
- url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-${version}.tar.bz2";
- hash = "03lzw3hh7nnbwb8vyv98lgqqgpmd4pc536z7xfn47yg4q76069wq";
+ version="r48908";
+ name="webkit-r48908";
+ hash="18hymchzix56yhl830mxfiayxxjhd5kgm3ga4jc9k627ypqsdycg";
+ url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r48908.tar.bz2";
+ advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r48908.tar.bz2";
+
+
}
diff --git a/pkgs/development/libraries/webkit/src-info-for-default.nix b/pkgs/development/libraries/webkit/src-info-for-default.nix
index be2a68b58e2..994cae544cb 100644
--- a/pkgs/development/libraries/webkit/src-info-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-info-for-default.nix
@@ -2,4 +2,5 @@
downloadPage = "http://nightly.webkit.org/";
versionExtractorSedScript = "s/.*-(r[0-9]+)[.].*/\\1/";
versionReferenceCreator = "s/-(r[0-9.]+)[.]/-\${version}./";
+ baseName = "webkit";
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index caf6f96476a..9499598fc2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3342,6 +3342,18 @@ let
libsoup = gnome26.libsoup;
});
+ gst_all_gtk_218 = recurseIntoAttrs (import ../development/libraries/gstreamer {
+ inherit lib selectVersion stdenv fetchurl perl bison pkgconfig libxml2
+ python alsaLib cdparanoia libogg libvorbis libtheora freetype liboil
+ libjpeg zlib speex libpng libdv aalib cairo libcaca flac hal libiec61883
+ dbus libavc1394 ladspaH taglib pulseaudio gdbm bzip2 which;
+ flex = flex2535;
+ inherit (xorg) libX11 libXv libXext;
+ inherit (gtkLibs218) glib pango gtk;
+ inherit (gnome28) gnomevfs /* <- only passed for the no longer used older versions
+ it is deprecated and didn't build on amd64 due to samba dependency */ gtkdoc libsoup;
+ });
+
gnet = import ../development/libraries/gnet {
inherit fetchurl stdenv pkgconfig;
inherit (gtkLibs) glib;
@@ -4330,14 +4342,13 @@ let
};
webkit = builderDefsPackage (import ../development/libraries/webkit) {
- libsoup = gnome26.libsoup;
- inherit (gnome) gtkdoc;
- inherit (gtkLibs) gtk atk pango;
+ inherit (gnome28) gtkdoc libsoup;
+ inherit (gtkLibs218) gtk atk pango;
inherit freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite
icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant;
- inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
+ inherit (gst_all_gtk_218) gstreamer gstPluginsBase gstFfmpeg
gstPluginsGood;
flex = flex2535;
inherit (xlibs) libXt;
@@ -7117,10 +7128,8 @@ let
midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
inherit imagemagick intltool python pkgconfig webkit libxml2
which gettext makeWrapper file libidn sqlite docutils libnotify;
- inherit (gtkLibs) gtk;
- inherit (gnome) gtksourceview;
- libsoup = gnome26.libsoup;
- glib = gtkLibs.glib;
+ inherit (gtkLibs218) gtk glib;
+ inherit (gnome28) gtksourceview libsoup;
};
minicom = builderDefsPackage (selectVersion ../tools/misc/minicom "2.3") {
@@ -7601,17 +7610,15 @@ let
uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) {
inherit pkgconfig webkit makeWrapper;
- inherit (gtkLibs) gtk;
- libsoup = gnome26.libsoup;
- glib = gtkLibs.glib;
+ inherit (gtkLibs218) gtk glib;
+ libsoup = gnome28.libsoup;
};
uzblExperimental = builderDefsPackage
(import ../applications/networking/browsers/uzbl/experimental.nix) {
inherit pkgconfig webkit makeWrapper;
- inherit (gtkLibs) gtk;
- libsoup = gnome26.libsoup;
- glib = gtkLibs.glib;
+ inherit (gtkLibs218) gtk glib;
+ libsoup = gnome28.libsoup;
};
valknut = import ../applications/networking/p2p/valknut {
@@ -8079,7 +8086,7 @@ let
gnome26 = import ../desktops/gnome-2.26 pkgs;
- gnome28 = import ../desktops/gnome-2.28 pkgs;
+ gnome28 = import ../desktops/gnome-2.28 (pkgs// {gtkLibs = gtkLibs218});
kde3 = {