summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarren Togami <wtogami@fedoraproject.org>2005-04-28 05:05:25 +0000
committerWarren Togami <wtogami@fedoraproject.org>2005-04-28 05:05:25 +0000
commit6a1f116db74c4a3e85675b586b3dbebd505b8e65 (patch)
tree5a181568ba9d5d86111937264f70ec835469804c
parentMOZILLA_ENABLE_PANGO is no longer used leave comments about (diff)
downloadlibrewolf-fedora-ff-6a1f116db74c4a3e85675b586b3dbebd505b8e65.tar.gz
librewolf-fedora-ff-6a1f116db74c4a3e85675b586b3dbebd505b8e65.tar.bz2
librewolf-fedora-ff-6a1f116db74c4a3e85675b586b3dbebd505b8e65.zip
remove JVM version probing (#116445)
-rw-r--r--firefox.sh.in59
-rw-r--r--firefox.spec3
2 files changed, 3 insertions, 59 deletions
diff --git a/firefox.sh.in b/firefox.sh.in
index 64c6466..4387998 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -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`
diff --git a/firefox.spec b/firefox.spec
index ae5cbbd..f1c5645 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -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
bgstack15