- rel 2; build/install from DEVEL

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

diff --git a/opera-wrapper.patch b/opera-wrapper.patch
index 882186d6875c8c9d611cb49915b55f7997e4a373..7e29da10952d5cac173ec862d659e57f86ecb2d4 100644 (file)
--- a/opera-wrapper.patch
+++ b/opera-wrapper.patch
@@ -1,56 +1,15 @@
---- opera-10.11-4791.gcc4-qt4.i386/opera.orig  2010-06-21 16:11:12.000000000 +0200
-+++ opera-10.11-4791.gcc4-qt4.i386/opera       2010-06-23 23:16:37.000000000 +0200
-@@ -3,7 +3,7 @@
- # but execute it from the extracted package or current location.
-
- # Location of the Opera binaries
--OPERA_BINARYDIR=usr/lib/opera
-+OPERA_BINARYDIR=/usr/lib/opera
-
- die () {
-     for arg
-@@ -37,15 +37,14 @@
- [ -z "$toset" ] || die "Missing parameter for $arg"
-
-
--[ "$PWD" ] || PWD=`/bin/pwd`
- if [ "$_PERSONALDIR_FROM_CMDLINE_" = NO ]
- then
--  OPERA_PERSONALDIR="$PWD/profile"
-+  OPERA_PERSONALDIR="$HOME/.opera"
-   export OPERA_PERSONALDIR
- 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,10 +55,16 @@
- [ -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
--    OPERA_DIR="$PWD/usr/share/opera"
-+    OPERA_DIR="/usr/share/opera"
- fi
- export OPERA_DIR
-
-@@ -357,7 +362,7 @@
-
- # Setting environment relative to current working directory
- # Bundled Qt will be found here unless preloaded by the stance above
--LD_LIBRARY_PATH="$PWD/usr/lib/opera${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
-+LD_LIBRARY_PATH="$OPERA_BINARYDIR/${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
- export LD_LIBRARY_PATH
-
- # Run Opera:
++export OPERA_DIR=/usr/share/opera
++export OPERA_PERSONALDIR=$HOME/.opera
++exec /usr/lib/opera/opera "$@"