- rel 2; build/install from DEVEL

[packages/opera.git] / opera-wrapper.patch

diff --git a/opera-wrapper.patch b/opera-wrapper.patch
index df60e7d7799950621dbd14d2783e822fd4e478eb..7e29da10952d5cac173ec862d659e57f86ecb2d4 100644 (file)
--- a/opera-wrapper.patch
+++ b/opera-wrapper.patch
@@ -1,25 +1,15 @@
---- opera.org  2009-12-31 11:45:05.000000000 +0100
-+++ opera      2010-01-01 20:58:33.485442895 +0100
-@@ -45,7 +45,7 @@
- fi
- 
- # Required for Session Management
--case $0 in /*) OPERA_SCRIPT_PATH=$0;; *) OPERA_SCRIPT_PATH=`/bin/pwd`/$0;; esac
-+case $0 in /*) OPERA_SCRIPT_PATH=$0;; *) OPERA_SCRIPT_PATH=/usr/bin/$0;; esac
- export OPERA_SCRIPT_PATH
- 
- OPERA_SYSTEM_UNAME=`uname -s`
-@@ -56,6 +56,13 @@
- [ -f "$OPERA_BINARYDIR/opera" ] || die "The Opera binary is not located at \"$OPERA_BINARYDIR/opera\"." "Please modify the wrapper script at \"$0\"."
- [ -x "$OPERA_BINARYDIR/opera" ] || die "You do not have execute rights on \"$OPERA_BINARYDIR/opera\", please ask the sysadmin to chmod +x it."
- 
+--- opera-10.51-6252.i386.linux/opera~ 2010-03-20 02:45:01.000000000 +0200
++++ opera-10.51-6252.i386.linux/opera  2010-03-20 13:32:03.132427427 +0200
+@@ -1,4 +1,9 @@
+ #!/bin/sh
+-export OPERA_DIR=${OPERA_DIR:-"${0%/*}"/share/opera}
+-export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${0%/*}"/profile}
+-exec "${0%/*}"/lib/opera/opera "$@"
 +# set JAVA_HOME from jpackage-utils if available
 +if [ -f /usr/share/java-utils/java-functions ]; then
-+    . /usr/share/java-utils/java-functions
-+    set_jvm
++      . /usr/share/java-utils/java-functions
++      set_jvm
 +fi
-+
-+
- # Opera enviroment
- if [ -z "$OPERA_DIR" ]
- then
++export OPERA_DIR=/usr/share/opera
++export OPERA_PERSONALDIR=$HOME/.opera
++exec /usr/lib/opera/opera "$@"