Merge branch 'master' into x86_64

build/jam/FileRules

@@ -199,7 +199,7 @@ rule ExtractArchive directory : entries : archiveFile : grist
 	# <directory> and <archiveFile> combo.
 	#
 	# <directory> - The directory into which to extract the archive file. The
-	#               directory is created is by this rule and it is the target
+	#               directory is created by this rule and it is the target
 	#               that the extract action is associated with.
 	# <entries>   - The entries of the archive file one is interested in. The
 	#               rule always extracts the complete archive file, from the

build/jam/OptionalBuildFeatures

@@ -419,3 +419,36 @@ if $(HAIKU_BUILD_FEATURE_TAGLIB) {
 	}
 }
 
+
+# WebKit
+local webkitBaseURL = http://haiku-files.org/files/optional-packages ;
+if $(TARGET_ARCH) = x86 {
+	if $(HAIKU_GCC_VERSION[1]) < 4 {
+		Echo "WebKit support not available on gcc $(HAIKU_GCC_VERSION[1])" ;
+	} else {
+	    HAIKU_WEBKIT_FILE = webkit-0.1.1-x86-gcc4-2012-07-03.zip ;
+
+	    local zipFile = [ DownloadFile $(HAIKU_WEBKIT_FILE)
+		    : $(webkitBaseURL)/$(HAIKU_WEBKIT_FILE) ] ;
+
+	    HAIKU_WEBKIT_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
+		    $(HAIKU_WEBKIT_FILE:B) ] ;
+
+	    HAIKU_WEBKIT_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_WEBKIT_DIR)
+		    : include/ : $(zipFile) : extracted-webkit ] ;
+
+	    HAIKU_WEBKIT_LIBS = [ ExtractArchive $(HAIKU_WEBKIT_DIR)
+		    :
+		    lib/libwtf.so
+		    lib/libjavascriptcore.so
+		    lib/libwebcore.so
+		    lib/libwebkit.so
+		    : $(zipFile)
+		    : extracted-webkit
+	    ] ;
+
+	    HAIKU_WEBKIT_HEADERS = [ FDirName $(HAIKU_WEBKIT_DIR) include ] ;
+    }
+} else {
+	Echo "WebKit support not available on $(TARGET_ARCH)" ;
+}

build/jam/OptionalPackages

@@ -359,8 +359,8 @@ if [ IsOptionalHaikuImagePackageAdded Bzip ] {
 
 # CARootCertificates
 if [ IsOptionalHaikuImagePackageAdded CARootCertificates ] {
-	InstallOptionalHaikuImagePackage cert-2012-05-02.zip
-		: $(baseURL)/cert-2012-05-02.zip
+	InstallOptionalHaikuImagePackage cert-2012-07-04.zip
+		: $(baseURL)/cert-2012-07-04.zip
 		: common data ssl ;
 }