Ticket #4457: bzb-r1a1.patch

OptionalPackageDependencies

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

OptionalPackages

@@ -460 +460 @@
 
 
 # Firefox web browser
-if [ IsObsoleteOptionalHaikuImagePackageAdded Firefox ] {
+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.21pre-haiku-gcc4-x86-09-03-01
-            : $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
-            : apps
-        ;
-        AddSymlinkToHaikuImage home config be Applications
-            : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
+    } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+        Echo "No optional package Firefox available for gcc4" ;
     } else {
         InstallOptionalHaikuImagePackage BeZillaBrowser-gcc2-20090218
-            : http://bezilla.beuser.de/builds/BeZillaBrowser-gcc2-20090218.zip
-            : apps
+            : $(baseURL)/BeZillaBrowser-2.0.0.22pre-r1a1-x86-gcc2-2009-09-08.zip
+            : 
         ;
         AddSymlinkToHaikuImage home config be Applications
             : /boot/apps/BeZillaBrowser/BeZillaBrowser ;