rpms
/
firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

remove JVM version probing (#116445)

This commit is contained in:
Warren Togami 2005-04-28 05:05:25 +00:00
parent 1e4426e40e
commit 6a1f116db7
2 changed files with 3 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
firefox.sh.in
View File

@ -84,62 +84,6 @@ export FONTCONFIG_PATH
#MOZ_DISABLE_PANGO=1
#export MOZ_DISABLE_PANGO
# Figure out if we need to set LD_ASSUME_KERNEL for older versions of the JVM.
function set_jvm_vars() {
# see if the jvm exists in either of the locations
if [ -L $MOZ_DIST_BIN/plugins/libjavaplugin_oji.so ]; then
JVM_ORIG_LINK=$MOZ_DIST_BIN/plugins/libjavaplugin_oji.so
fi
if [ -L LIBDIR/mozilla/plugins/libjavaplugin_oji.so ]; then
JVM_ORIG_LINK=LIBDIR/mozilla/plugins/libjavaplugin_oji.so
fi
if [ -z "$JVM_ORIG_LINK" ]; then
return;
fi
JVM_LINK=`perl -e "print readlink('$JVM_ORIG_LINK')"`
# is it relative? if so append the full path
echo "${JVM_LINK}" | grep -e "^/" 2>&1 > /dev/null
if [ "$?" -ne "0" ]; then
JVM_LINK=$MOZ_DIST_BIN/plugins/${JVM_LINK}
fi
JVM_BASE=`basename $JVM_LINK`
JVM_DIR=`echo $JVM_LINK | sed -e s/$JVM_BASE//g`
JVM_COMMAND=$JVM_DIR/java
if [ ! -r $JVM_COMMAND ]; then
JVM_DIR=${JVM_DIR}../../../bin/
JVM_COMMAND=$JVM_DIR/java
# does the command exist?
if [ ! -r "$JVM_COMMAND" ]; then
return
fi
fi
# export this temporarily - it seems to work with old and new
# versions of the JVM.
export LD_ASSUME_KERNEL=2.2.5
# get the version
JVM_VERSION=`$JVM_COMMAND -version 2>&1 | grep version | cut -f 3 -d " " | sed -e 's/\"//g'`
unset LD_ASSUME_KERNEL
case "$JVM_VERSION" in
(1.3.0*)
# bad JVM
export LD_ASSUME_KERNEL=2.2.5
;;
esac
}
function check_running() {
$MOZ_CLIENT_PROGRAM $MOZ_CLIENT_PROGRAM_PARAM 'ping()' 2>/dev/null >/dev/null
RETURN_VAL=$?
@ -172,9 +116,6 @@ function open_compose() {
# OK, here's where all the real work gets done
# set our JVM vars
set_jvm_vars
# check to see if there's an already running instance or not
ALREADY_RUNNING=`check_running`

3
firefox.spec
View File

@ -330,6 +330,9 @@ fi
#---------------------------------------------------------------------
%changelog
* Wed Apr 27 2005 Warren Togami <wtogami@redhat.com>
- remove JVM version probing (#116445)
* Fri Apr 15 2005 Christopher Aillon <caillon@redhat.com> 0:1.0.3-2
- Add patch to properly link against libgfxshared_s.a