cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove ~/.opera/lock on startup if it exists. It helps recovering from

Browse Source 
a crash/hang and isn't really useful for us as opera will open a new
tab if we try to open a new instance.

ok dcoppa@ robert@
This commit is contained in:
ajacoutot 2010-06-10 06:12:57 +00:00
parent 60200ed048
commit d46bac3c89
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/opera/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.64 2010/03/20 16:51:42 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.65 2010/06/10 06:12:57 ajacoutot Exp $
ONLY_FOR_ARCHS= i386
SHARED_ONLY= Yes
@ -8,7 +8,7 @@ COMMENT= fast and customizable WWW browser
V= 10.10
OPERA_BUILD= 4742
DISTNAME= opera-${V}.gcc4-shared-qt3.i386
PKGNAME= opera-${V}p1
PKGNAME= opera-${V}p2
CATEGORIES= www
HOMEPAGE= http://www.opera.com/

19
www/opera/patches/patch-install_sh
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-install_sh,v 1.23 2009/11/03 05:50:21 sturm Exp $
--- install.sh.orig Mon Oct 19 17:55:07 2009
+++ install.sh Mon Nov 2 14:11:30 2009
$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
@@ -870,7 +870,7 @@ generate_wrapper()
wrapper_contain="#!/bin/sh
@ -30,3 +30,16 @@ $OpenBSD: patch-install_sh,v 1.23 2009/11/03 05:50:21 sturm 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
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\" \"\$@\"