From d4f1a3ef8652545aaa41a608662db82e78c0ec82 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Sep 2006 09:06:56 +0000
Subject: [PATCH] * Opera 9.02.

svn path=/nixpkgs/trunk/; revision=6622
---
 .../networking/browsers/opera/default.nix       | 17 +++++++++++------
 pkgs/top-level/all-packages.nix                 |  5 +++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index f108a926220..39339dfd8f3 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -1,18 +1,23 @@
-{stdenv, fetchurl, qt, zlib, libX11, motif ? null, libXt ? null, libXext ? null}:
+{ stdenv, fetchurl, qt, zlib, libX11, libXext, libSM, libICE, libstdcpp5
+, motif ? null, libXt ? null}:
 
 assert stdenv.system == "i686-linux";
-assert motif != null -> libXt != null && libXext != null;
+assert motif != null -> libXt != null;
 
 # !!! Add Xinerama and Xrandr dependencies?  Or should those be in Qt?
 
+# Hm, does Opera 9.x still use Motif for anything?
+
 stdenv.mkDerivation {
-  name = "opera-8.51-20051114.6";
+  name = "opera-9.02-20060919.5";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/851/final/en/i386/opera-8.51-20051114.6-shared-qt.i386-en.tar.bz2;
-    md5 = "bf930c45023035ee4258b13b707176c2";
+    url = ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/902/final/en/i386/shared/opera-9.02-20060919.5-shared-qt.i386-en.tar.bz2;
+    md5 = "327d0bf1f3c4eedd47b444b36c9091f6";
   };
 
-  libPath = [qt zlib libX11 motif libXt libXext];
+  libPath =
+    [qt motif zlib libX11 libXext libSM libICE libstdcpp5]
+    ++ (if motif != null then [motif libXt ] else []);
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de7ed5214f1..5d2fe6cba6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2480,9 +2480,10 @@ rec {
 
   opera = import ../applications/networking/browsers/opera {
     inherit fetchurl stdenv zlib;
-    inherit (xlibs) libX11 libXt libXext;
+    inherit (xlibs) libX11 libSM libICE libXt libXext;
     qt = qt3;
-    motif = lesstif;
+    #motif = lesstif;
+    libstdcpp5 = gcc33.gcc;
   };
 
   pan = (import ../applications/networking/newsreaders/pan) {