Ticket #3529: PhaseOutFirefoxOptionalPackage.patch

build/jam/OptionalPackageDependencies

@@ -9 +9 @@
 OptionalPackageDependencies BeHappy : BeBook NetSurf ;
 OptionalPackageDependencies Development : DevelopmentBase Perl ;
 OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
+OptionalPackageDependencies Firefox : BeZillaBrowser ;
 OptionalPackageDependencies LibLayout : DevelopmentBase ;
 OptionalPackageDependencies NetSurf : OpenSSL Curl LibXML2 LibIconv ;
 OptionalPackageDependencies OpenSSH : OpenSSL ;

build/jam/OptionalPackages

@@ -21 +21 @@
 #   BeHappy                 - special documentation (i.e. BeBook) browser
 #   BeOSCompatibility       - creates links within the system to support old apps
 #   BePDF                   - native PDF reader
+#   BeZillaBrowser          - fork of Mozilla's 1.8 branch.
 #   Bluetooth               - experimental Haiku components for Bluetooth
 #   CDRecord                - the command line CD writing tools
 #   Clockwerk               - native audio/video compositing
@@ -32 +33 @@
 #   DevelopmentBase         - basic development environment (gcc, headers, libs,...)
 #   DevelopmentMin          - development headers, libs, tools, from sources only
 #   Expat                   - XML parsing libraries
-#   Firefox                 - the webbrowser
+#   Firefox                 - the webbrowser NOTE: will be removed soon.
 #   Git                     - the distributed version control system
 #   ICU-devel               - the headers for ICU (for development)
 #   KeymapSwitcher          - Desktop utility
@@ -208 +209 @@
 }
 
 
+# BeZillaBrowser
+if [ IsOptionalHaikuImagePackageAdded BeZillaBrowser ] {
+    
+    if $(TARGET_ARCH) != x86 {
+        Echo "No optional package BeZillaBrowser available for $(TARGET_ARCH)" ;
+    } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+        InstallOptionalHaikuImagePackage
+            BeZillaBrowser-2.0.0.22pre-x86-gcc4-2010-01-27
+            : $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc4-2010-01-27.zip
+            :
+        ;
+        AddSymlinkToHaikuImage home config be Applications
+            : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
+    } else {
+        InstallOptionalHaikuImagePackage
+            BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-01-27
+            : $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-01-27.zip
+            :
+        ;
+        AddSymlinkToHaikuImage home config be Applications
+            : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
+    }
+}
+
+
 # Bluetooth stack
 if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
     local bluetoothDrivers = h2generic ;
@@ -519 +545 @@
 
 # Firefox web browser
 if [ IsOptionalHaikuImagePackageAdded Firefox ] {
-    if $(TARGET_ARCH) != x86 {
-        Echo "No optional package Firefox available for $(TARGET_ARCH)" ;
-    } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-        InstallOptionalHaikuImagePackage
-            BeZillaBrowser-2.0.0.22pre-x86-gcc4-2010-01-27
-            : $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc4-2010-01-27.zip
-            :
-        ;
-        AddSymlinkToHaikuImage home config be Applications
-            : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
-    } else {
-        InstallOptionalHaikuImagePackage
-            BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-01-27
-            : $(baseURL)/BeZillaBrowser-2.0.0.22pre-x86-gcc2-2010-01-27.zip
-            :
-        ;
-        AddSymlinkToHaikuImage home config be Applications
-            : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
-    }
+    Echo "Warning: The optional package Firefox is being replaced with"
+    "BeZillaBrowser" ;
 }
 
 

build/jam/ReleaseBuildProfiles

@@ -14 +14 @@
         HAIKU_IMAGE_HOST_NAME = shredder ;
         HAIKU_IMAGE_SIZE = 650 ;
 
-        AddOptionalHaikuImagePackages BePDF Clockwerk Firefox Pe Vision VLC
-            WonderBrush ;
+        AddOptionalHaikuImagePackages BePDF BeZillaBrowser Clockwerk Pe Vision
+            VLC WonderBrush ;
         AddOptionalHaikuImagePackages CVS Development Git Mercurial
             Python Subversion OpenSSH ;
         AddOptionalHaikuImagePackages Nano P7zip Welcome BeBook ;