opera-wrapper.patch

   1 --- opera-10.11-4791.gcc4-qt4.i386/opera.orig   2010-06-21 16:11:12.000000000 +0200
   2 +++ opera-10.11-4791.gcc4-qt4.i386/opera        2010-06-23 23:16:37.000000000 +0200
   3 @@ -3,7 +3,7 @@
   4  # but execute it from the extracted package or current location.
   5
   6  # Location of the Opera binaries
   7 -OPERA_BINARYDIR=usr/lib/opera
   8 +OPERA_BINARYDIR=/usr/lib/opera
   9
  10  die () {
  11      for arg
  12 @@ -37,15 +37,14 @@
  13  [ -z "$toset" ] || die "Missing parameter for $arg"
  14
  15
  16 -[ "$PWD" ] || PWD=`/bin/pwd`
  17  if [ "$_PERSONALDIR_FROM_CMDLINE_" = NO ]
  18  then
  19 -  OPERA_PERSONALDIR="$PWD/profile"
  20 +  OPERA_PERSONALDIR="$HOME/.opera"
  21    export OPERA_PERSONALDIR
  22  fi
  23
  24  # Required for Session Management
  25 -case $0 in /*) OPERA_SCRIPT_PATH=$0;; *) OPERA_SCRIPT_PATH=`/bin/pwd`/$0;; esac
  26 +case $0 in /*) OPERA_SCRIPT_PATH=$0;; *) OPERA_SCRIPT_PATH=/usr/bin/$0;; esac
  27  export OPERA_SCRIPT_PATH
  28
  29  OPERA_SYSTEM_UNAME=`uname -s`
  30 @@ -56,10 +55,16 @@
  31  [ -f "$OPERA_BINARYDIR/opera" ] || die "The Opera binary is not located at \"$OPERA_BINARYDIR/opera\"." "Please modify the wrapper script at \"$0\"."
  32  [ -x "$OPERA_BINARYDIR/opera" ] || die "You do not have execute rights on \"$OPERA_BINARYDIR/opera\", please ask the sysadmin to chmod +x it."
  33
  34 +# set JAVA_HOME from jpackage-utils if available
  35 +if [ -f /usr/share/java-utils/java-functions ]; then
  36 +    . /usr/share/java-utils/java-functions
  37 +    set_jvm
  38 +fi
  39 +
  40  # Opera enviroment
  41  if [ -z "$OPERA_DIR" ]
  42  then
  43 -    OPERA_DIR="$PWD/usr/share/opera"
  44 +    OPERA_DIR="/usr/share/opera"
  45  fi
  46  export OPERA_DIR
  47
  48 @@ -357,7 +362,7 @@
  49
  50  # Setting environment relative to current working directory
  51  # Bundled Qt will be found here unless preloaded by the stance above
  52 -LD_LIBRARY_PATH="$PWD/usr/lib/opera${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
  53 +LD_LIBRARY_PATH="$OPERA_BINARYDIR/${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
  54  export LD_LIBRARY_PATH
  55
  56  # Run Opera: