Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/opera/files: opera-10.50-paths.patch
Date: Fri, 19 Feb 2010 17:32:54
Message-Id: E1NiWii-00030N-Iw@stork.gentoo.org
1 jer 10/02/19 17:32:52
2
3 Added: opera-10.50-paths.patch
4 Log:
5 Version bump <http://my.opera.com/desktopteam/blog/2010/02/19/gstreamer-video-on-mac>. Fix more paths thanks to shade (bug #305303).
6 (Portage version: 2.2_rc62/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 www-client/opera/files/opera-10.50-paths.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/files/opera-10.50-paths.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/files/opera-10.50-paths.patch?rev=1.1&content-type=text/plain
13
14 Index: opera-10.50-paths.patch
15 ===================================================================
16 diff --git a/opera b/opera
17 index 6c08e2d..f4cf0e6 100755
18 --- a/opera
19 +++ b/opera
20 @@ -41,7 +41,7 @@ done
21 [ "$PWD" ] || PWD=`/bin/pwd`
22 if [ "$_PERSONALDIR_FROM_CMDLINE_" = NO ]
23 then
24 - OPERA_PERSONALDIR="$PWD/profile"
25 + OPERA_PERSONALDIR="$HOME/.opera-10.50"
26 export OPERA_PERSONALDIR
27 fi
28
29 @@ -60,52 +60,23 @@ export OPERA_BINARYDIR
30 # Opera enviroment
31 if [ -z "$OPERA_DIR" ]
32 then
33 - OPERA_DIR="$PWD/usr/share/opera"
34 + OPERA_DIR="/usr/share/opera"
35 fi
36 export OPERA_DIR
37
38 # Acrobat Reader
39 for ACROBATBINDIR in \
40 - /usr/local/Adobe/Reader8/bin \
41 - /usr/lib64/Adobe/Reader8/bin \
42 - /usr/lib/Adobe/Reader8/bin \
43 - /usr/X11R6/lib/Adobe/Reader8/bin \
44 - /opt/Adobe/Reader8/bin \
45 - /usr/Adobe/Reader8/bin \
46 - /usr/local/Adobe/Acrobat7.0/bin \
47 - /usr/lib64/Acrobat7.0/bin \
48 - /usr/lib/Acrobat7.0/bin \
49 - /usr/X11R6/lib/Acrobat7.0/bin \
50 - /opt/Acrobat7.0/bin \
51 - /usr/Acrobat7.0/bin \
52 - /usr/local/Acrobat7/bin \
53 - /usr/lib64/Acrobat7/bin \
54 - /usr/lib/Acrobat7/bin \
55 - /usr/X11R6/lib/Acrobat7/bin \
56 - /opt/Acrobat7/bin \
57 - /usr/Acrobat7/bin \
58 - /usr/local/Acrobat5/bin \
59 - /usr/lib64/Acrobat5/bin \
60 - /usr/lib/Acrobat5/bin \
61 - /usr/X11R6/lib/Acrobat5/bin \
62 - /opt/Acrobat5/bin \
63 - /usr/Acrobat5/bin \
64 - /opt/acroread-5.07/bin \
65 - /usr/local/Acrobat4/bin \
66 - /usr/lib64/Acrobat4/bin \
67 - /usr/lib/Acrobat4/bin \
68 - /usr/X11R6/lib/Acrobat4/bin \
69 - /opt/Acrobat4/bin \
70 - /usr/Acrobat4/bin \
71 + /opt/Adobe/Reader9/bin \
72 ; do
73 if [ -d "$ACROBATBINDIR" ]
74 then PATH="$PATH:$ACROBATBINDIR"
75 fi
76 done
77
78 -# Setting environment relative to current working directory
79 +
80 +# Setting environment relative to current working directory <-- no! we will not use current
81 # Bundled Qt will be found here unless preloaded by the stance above
82 -LD_LIBRARY_PATH="$PWD/usr/lib/opera${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
83 +LD_LIBRARY_PATH="/usr/lib/opera${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
84 export LD_LIBRARY_PATH
85
86 # Run Opera: