From 5503e2fc33e390cfa6f40d5353ee32ea3758c2d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 21 Jun 2004 15:49:03 +0000
Subject: [PATCH] * Upgraded Glib, GTK, Sylpheed.

* Tried to upgrade Firefox to 0.9, but it's too broken.  It's
  basically impossible to build it automatically.  Firefox must be
  started once as a user with write permission to the Firefox
  directory to generate some files, and this can only be done
  interactively (apparently).  Hopefully 0.10 fixes this.  Firefox
  also barfs with link errors if the flag `--enable-single-profile' is
  not used.

svn path=/nixpkgs/trunk/; revision=1067
---
 .../browsers/firefox-0.9-broken/builder.sh    | 30 +++++++++++++++++++
 .../browsers/firefox-0.9-broken/default.nix   | 19 ++++++++++++
 .../mailreaders/sylpheed/default.nix          |  6 ++--
 .../libraries/gtk-libs-2.4/glib/default.nix   |  6 ++--
 .../libraries/gtk-libs-2.4/gtk+/default.nix   |  6 ++--
 5 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/firefox-0.9-broken/builder.sh
 create mode 100644 pkgs/applications/networking/browsers/firefox-0.9-broken/default.nix

diff --git a/pkgs/applications/networking/browsers/firefox-0.9-broken/builder.sh b/pkgs/applications/networking/browsers/firefox-0.9-broken/builder.sh
new file mode 100644
index 000000000000..d4128211d4bf
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox-0.9-broken/builder.sh
@@ -0,0 +1,30 @@
+. $stdenv/setup
+
+
+preConfigure() {
+    cat > .mozconfig <<EOF
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+ac_add_options --enable-crypto
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+ac_add_options --disable-mailnews
+ac_add_options --disable-composer
+ac_add_options --enable-optimize=-O2
+ac_add_options --disable-ldap
+ac_add_options --disable-mailnews
+ac_add_options --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help
+ac_add_options --enable-xft
+ac_add_options --enable-swg
+ac_add_options --enable-strip
+ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-single-profile
+EOF
+    echo "ac_add_options --prefix=$out" >> .mozconfig
+}
+preConfigure=preConfigure
+
+
+makeFlags="-f client.mk build"
+
+genericBuild
diff --git a/pkgs/applications/networking/browsers/firefox-0.9-broken/default.nix b/pkgs/applications/networking/browsers/firefox-0.9-broken/default.nix
new file mode 100644
index 000000000000..1ba1dca03e10
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox-0.9-broken/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL
+}:
+
+assert pkgconfig != null && gtk != null && perl != null
+  && zip != null && libIDL != null;
+
+# !!! assert libIDL.glib == gtk.glib;
+
+stdenv.mkDerivation {
+  name = "firefox-0.9";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.9/firefox-0.9-source.tar.bz2;
+    md5 = "1dda543d1245db09cea9ad7b9a44146c";
+  };
+
+  buildInputs = [pkgconfig gtk perl zip libIDL];
+}
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index 73ec1e6fb38c..3f0282a3fcd9 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -8,12 +8,12 @@ assert sslSupport -> openssl != null;
 assert imageSupport -> gdkpixbuf != null;
 
 stdenv.mkDerivation {
-  name = "sylpheed-0.9.10";
+  name = "sylpheed-0.9.12";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://sylpheed.good-day.net/sylpheed/sylpheed-0.9.10.tar.bz2;
-    md5 = "4e2242436de3cf3977a1b25b1ddc4930";
+    url = http://sylpheed.good-day.net/sylpheed/sylpheed-0.9.12.tar.bz2;
+    md5 = "5deab7d65f8e19444902be3d82610e6b";
   };
 
   inherit sslSupport imageSupport;
diff --git a/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix
index dcaff4a99d29..1e89dc65cf21 100644
--- a/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/glib/default.nix
@@ -3,10 +3,10 @@
 assert pkgconfig != null && gettext != null && perl != null;
 
 stdenv.mkDerivation {
-  name = "glib-2.4.0";
+  name = "glib-2.4.2";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.0.tar.bz2;
-    md5 = "0f5f4896782ec7ab6ea8c7c1d9958114";
+    url = ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.2.tar.bz2;
+    md5 = "038b7cf535cbe016c6bb6033dbcf9acf";
   };
   buildInputs = [pkgconfig gettext perl];
 }
diff --git a/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix
index 94eab65ffa9c..824ed5e704dd 100644
--- a/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.4/gtk+/default.nix
@@ -10,10 +10,10 @@ assert x11.buildClientLibs;
 #assert x11 == pango.x11;
 
 stdenv.mkDerivation {
-  name = "gtk+-2.4.0";
+  name = "gtk+-2.4.3";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-2.4.0.tar.bz2;
-    md5 = "fd16157de447c7f0a86495ad0dc67a1b";
+    url = ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-2.4.3.tar.bz2;
+    md5 = "debfd0fcef08683c0761f13e1ba2dced";
   };
   buildInputs = [pkgconfig perl libtiff libjpeg libpng];
   propagatedBuildInputs = [x11 glib atk pango];