Browse Source

Firefox finally builds, so bring this package into a usable shape

Ralf S. Engelschall 20 years ago
parent
commit
0c9ca1dfe9
2 changed files with 18 additions and 16 deletions
  1. 13 13
      firefox/firefox.sh
  2. 5 3
      firefox/firefox.spec

+ 13 - 13
firefox/firefox.sh

@@ -24,8 +24,8 @@
 ##
 
 #   configuration
-mozilla_dir="@l_prefix@/lib/firefox"
-mozilla_bin="@l_prefix@/lib/firefox/mozilla"
+firefox_dir="@l_prefix@/lib/firefox"
+firefox_bin="@l_prefix@/lib/firefox/firefox"
 xsel_bin="@l_prefix@/bin/xsel"
 
 #   option parsing
@@ -54,19 +54,19 @@ verbose () {
 }
 
 #   establish Mozilla environment
-MOZILLA_FIVE_HOME="$mozilla_dir"
+MOZILLA_FIVE_HOME="$firefox_dir"
 export MOZILLA_FIVE_HOME
 LANG=en_US.ISO8859-1
 export LANG
 
 #   special case of direct remote option
 if [ ".$opt_r" != . ]; then
-    verbose "exec: $mozilla_bin -remote \"$opt_r\""
-    exec $mozilla_bin -remote "$opt_r"
+    verbose "exec: $firefox_bin -remote \"$opt_r\""
+    exec $firefox_bin -remote "$opt_r"
 fi
 
 #   determine Mozilla run-time status
-$mozilla_bin -remote "ping()" >/dev/null 2>&1
+$firefox_bin -remote "ping()" >/dev/null 2>&1
 if [ $? -eq 0 ]; then
     verbose "process already running (available remotely)"
     restart=no
@@ -152,11 +152,11 @@ for url in "$@"; do
         #   handling of first URL if restarting is necessary
         verbose "running new process"
         if [ ".$url" = ".about:blank" ]; then
-            verbose "exec: $mozilla_bin >/dev/null 2>&1 &"
-            $mozilla_bin >/dev/null 2>&1 &
+            verbose "exec: $firefox_bin >/dev/null 2>&1 &"
+            $firefox_bin >/dev/null 2>&1 &
         else
-            verbose "exec: $mozilla_bin \"$url\" >/dev/null 2>&1 &"
-            $mozilla_bin "$url" >/dev/null 2>&1 &
+            verbose "exec: $firefox_bin \"$url\" >/dev/null 2>&1 &"
+            $firefox_bin "$url" >/dev/null 2>&1 &
         fi
     else
         #   delayed waiting for process to be finally remotely available
@@ -168,7 +168,7 @@ for url in "$@"; do
             sleep 4 # give it a little bit of time to fully startup
             i=0
             while [ $i -lt 10 ]; do
-                $mozilla_bin -remote "ping()" >/dev/null 2>&1
+                $firefox_bin -remote "ping()" >/dev/null 2>&1
                 if [ $? -eq 0 ]; then
                     break
                 fi
@@ -192,8 +192,8 @@ for url in "$@"; do
 
         #   perform remote command
         verbose "sending remote command to running process"
-        verbose "exec: $mozilla_bin -remote \"$cmd\" >/dev/null 2>&1"
-        $mozilla_bin -remote "$cmd" >/dev/null 2>&1
+        verbose "exec: $firefox_bin -remote \"$cmd\" >/dev/null 2>&1"
+        $firefox_bin -remote "$cmd" >/dev/null 2>&1
     fi
     first=no
 done

+ 5 - 3
firefox/firefox.spec

@@ -29,7 +29,7 @@ URL:          http://www.mozilla.org/products/firefox/
 Vendor:       The Mozilla Project
 Packager:     OpenPKG
 Distribution: OpenPKG
-Class:        JUNK
+Class:        EVAL
 Group:        Web
 License:      MPL
 Version:      1.0.2
@@ -130,9 +130,8 @@ AutoReqProv:  no
         --with-system-png=%{l_prefix} \
         --with-system-zlib=%{l_prefix} \
         --with-ft-prefix=%{l_prefix} \
-        --enable-application=browser \
         --with-user-appdir=.firefox \
-        --enable-extensions=all,-typeaheadfind \
+        --enable-extensions=default \
         --enable-jsd \
         --enable-crypto \
         --enable-chrome-format=jar \
@@ -145,6 +144,8 @@ AutoReqProv:  no
 %else
         --disable-optimize \
 %endif
+        --disable-mailnews \
+        --disable-composer \
         --disable-xft \
         --disable-freetype2 \
         --disable-xinerama \
@@ -161,6 +162,7 @@ AutoReqProv:  no
         --disable-cpp-rtti \
         --disable-xterm-updates \
         --disable-elf-dynstr-gc \
+        --disable-installer \
         --disable-profilesharing \
         --enable-single-profile \
         --with-pthreads