From 4aff7429a37f04032fafa85fc0d0f45553cc8027 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Tue, 23 Nov 2010 13:56:18 +0000
Subject: [PATCH] Add -notrayicon to args by default. This prevent a (hard to
 reproduce) crash under some circumstances where the linux qt libs fail to
 load if one is running a panel which then ends up in a hard crash of opera
 (which in turn can hangs the entire display)...

ok jasper@
---
 www/opera/Makefile                 |  4 ++--
 www/opera/patches/patch-install_sh | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/www/opera/Makefile b/www/opera/Makefile
index 0e9013d708e..7c7ae19a64d 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.70 2010/11/22 08:36:49 espie Exp $
+# $OpenBSD: Makefile,v 1.71 2010/11/23 13:56:18 ajacoutot Exp $
 
 ONLY_FOR_ARCHS=	i386
 SHARED_ONLY=	Yes
@@ -9,7 +9,7 @@ V=		10.11
 OPERA_BUILD=	4791
 DISTNAME=	opera-${V}.gcc4-shared-qt3.i386
 PKGNAME=	opera-${V}
-REVISION=	1
+REVISION=	2
 CATEGORIES=	www
 
 MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
diff --git a/www/opera/patches/patch-install_sh b/www/opera/patches/patch-install_sh
index b4639d4d260..c888b81dd5e 100644
--- a/www/opera/patches/patch-install_sh
+++ b/www/opera/patches/patch-install_sh
@@ -1,6 +1,6 @@
-$OpenBSD: patch-install_sh,v 1.24 2010/06/10 06:12:57 ajacoutot Exp $
---- install.sh.orig	Fri Nov 20 20:11:15 2009
-+++ install.sh	Wed Jun  9 19:33:20 2010
+$OpenBSD: patch-install_sh,v 1.25 2010/11/23 13:56:18 ajacoutot Exp $
+--- install.sh.orig	Mon Jun 21 14:16:08 2010
++++ install.sh	Tue Nov 23 14:28:30 2010
 @@ -870,7 +870,7 @@ generate_wrapper()
      wrapper_contain="#!/bin/sh
  
@@ -30,16 +30,19 @@ $OpenBSD: patch-install_sh,v 1.24 2010/06/10 06:12:57 ajacoutot Exp $
  # To disable the first workaround, comment the next line.
  JAVA_WORKAROUND=\`\${OPERA_BINARYDIR}/works 2>/dev/null\`
  
-@@ -1125,6 +1119,12 @@ test -d /usr/sfw/lib/ && LD_LIBRARY_PATH=\"\${LD_LIBRA
- esac
+@@ -1126,8 +1120,14 @@ esac
  
  wrapper_contain="${wrapper_contain}
-+
+ 
 +# lock file is not needed as Opera will open a new tab if already
 +# running ; this helps recovering from a crash/hang with compat_linux(8)
 +if [ -f \${HOME}/.opera/lock ]; then
 +	rm -f \${HOME}/.opera/lock
 +fi
- 
++
  # Running Opera
- exec \"\${OPERA_BINARYDIR}opera\" \"\$@\"
+-exec \"\${OPERA_BINARYDIR}opera\" \"\$@\"
++exec \"\${OPERA_BINARYDIR}opera\" \"-notrayicon\" \"\$@\"
+ "
+ 
+ echo "${wrapper_contain}" > ${wrapper_file}