From 78c1eb55dfa2f2e35fe71f0f32a7863d2cb863ca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Sep 2005 15:44:15 +0000
Subject: [PATCH] * Firefox 1.5beta1.

svn path=/nixpkgs/trunk/; revision=3801
---
 .../browsers/firefox-1.5beta/builder.sh       | 53 +++++++++++++++++++
 .../browsers/firefox-1.5beta/default.nix      | 17 ++++++
 .../firefox-1.5beta/writable-copies.patch     | 23 ++++++++
 3 files changed, 93 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/firefox-1.5beta/builder.sh
 create mode 100644 pkgs/applications/networking/browsers/firefox-1.5beta/default.nix
 create mode 100644 pkgs/applications/networking/browsers/firefox-1.5beta/writable-copies.patch

diff --git a/pkgs/applications/networking/browsers/firefox-1.5beta/builder.sh b/pkgs/applications/networking/browsers/firefox-1.5beta/builder.sh
new file mode 100644
index 000000000000..9c43004025c7
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox-1.5beta/builder.sh
@@ -0,0 +1,53 @@
+. $stdenv/setup
+
+preConfigure=preConfigure
+preConfigure() {
+    cat > .mozconfig <<EOF
+. \$topsrcdir/browser/config/mozconfig
+ac_add_options --prefix=$out
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --enable-xft
+ac_add_options --disable-freetype2
+#ac_add_options --enable-swg
+ac_add_options --enable-strip
+ac_add_options --enable-default-toolkit=gtk2
+#ac_add_options --disable-shared
+#ac_add_options --enable-static
+#ac_add_options --with-system-jpeg
+#ac_add_options --with-system-png
+#ac_add_options --with-system-zlib
+EOF
+}
+
+postInstall=postInstall
+postInstall() {
+
+    # Strip some more stuff
+    strip -S $out/lib/*/* || true
+
+    # We don't need this (do we?)
+#    rm -rf $out/include
+
+    # This fixes starting Firefox when there already is a running
+    # instance.  The `firefox' wrapper script actually expects to be
+    # in the same directory as `run-mozilla.sh', apparently.
+    cd $out/bin
+    mv firefox ../lib/firefox-*/
+    ln -s ../lib/firefox-*/firefox .
+
+    # Register extension etc.
+    echo "running firefox -register..."
+    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./firefox-bin -register) || false
+
+    echo "running regxpcom..."
+    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regxpcom) || false
+    
+#    echo "running regchrome..."
+#    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regchrome) || false
+    
+}
+
+makeFlags="-f client.mk build"
+
+genericBuild
diff --git a/pkgs/applications/networking/browsers/firefox-1.5beta/default.nix b/pkgs/applications/networking/browsers/firefox-1.5beta/default.nix
new file mode 100644
index 000000000000..d3ab726f8bc0
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox-1.5beta/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi}:
+
+# !!! assert libIDL.glib == gtk.glib;
+
+(stdenv.mkDerivation {
+  name = "firefox-1.5beta1";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.5b1/source/firefox-1.5b1-source.tar.bz2;
+    md5 = "a1b2549a31c74e7366213bb2ba76876f";
+  };
+
+  buildInputs = [pkgconfig gtk perl zip libIDL libXi];
+
+  patches = [./writable-copies.patch];
+}) // {inherit gtk;}
diff --git a/pkgs/applications/networking/browsers/firefox-1.5beta/writable-copies.patch b/pkgs/applications/networking/browsers/firefox-1.5beta/writable-copies.patch
new file mode 100644
index 000000000000..e3c7752c0310
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox-1.5beta/writable-copies.patch
@@ -0,0 +1,23 @@
+diff -rc mozilla-orig/xpcom/io/nsLocalFileUnix.cpp mozilla/xpcom/io/nsLocalFileUnix.cpp
+*** mozilla-orig/xpcom/io/nsLocalFileUnix.cpp	2004-04-03 01:48:18.000000000 +0200
+--- mozilla/xpcom/io/nsLocalFileUnix.cpp	2004-10-05 19:48:04.000000000 +0200
+***************
+*** 634,639 ****
+--- 634,640 ----
+          // get the dirs old permissions
+          if (NS_FAILED(rv = GetPermissions(&oldPerms)))
+              return rv;
++         oldPerms |= 0200;
+          if (NS_FAILED(rv = newParent->Create(DIRECTORY_TYPE, oldPerms)))
+              return rv;
+      } else {    // dir exists lets try to use leaf
+***************
+*** 758,763 ****
+--- 759,765 ----
+          // get the old permissions
+          PRUint32 myPerms;
+          GetPermissions(&myPerms);
++         myPerms |= 0200;
+  
+          // Create the new file with the old file's permissions, even if write
+          // permission is missing.  We can't create with write permission and