Ticket #8713: 0002-Changes-relating-to-building-WebPositive-from-source.patch

File 0002-Changes-relating-to-building-WebPositive-from-source.patch, 3.1 KB (added by mmadia, 12 years ago)

  • build/jam/OptionalPackageDependencies 

    From 5cad04efab9723ba64186a920ec6db500853d93e Mon Sep 17 00:00:00 2001
From: Matt Madia <mattmadia@gmail.com>
Date: Tue, 10 Jul 2012 19:18:50 +0000
Subject: [PATCH 2/2] Changes relating to building WebPositive from source.

 * Add WebKit optional package.
 * Make WebKit a dependency of WebPositive
 * Enable building of WebPositive from source.

Note: WebKit currently expands to lib/.  Alternative gcc-subdirectories
are not taken into consideration. Though it is trivial to change.
---
 build/jam/OptionalPackageDependencies |    2 +-
 build/jam/OptionalPackages            |   32 ++++++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies
index 92d475d..650783d 100644
    a b OptionalPackageDependencies SDLLibs : XiphLibs libmad libmikmod Libmng libmodplu  
    3535OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL SQLite ;
    3636OptionalPackageDependencies Transmission : LibEvent Curl OpenSSL LibIconv ;
    3737OptionalPackageDependencies Vim : GetText LibIconv ;
    38 OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite WebPositiveBookmarks ;
     38OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite WebKit WebPositiveBookmarks ;
    3939OptionalPackageDependencies wpa_supplicant : OpenSSL ;
    4040OptionalPackageDependencies XZ-Utils : Tar ;
    4141

  • build/jam/OptionalPackages 

    diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 926469f..ad77d54 100644
    a b if [ IsOptionalHaikuImagePackageAdded Vision ] {  
    18431843}
    18441844
    18451845
     1846# WebKit
     1847if [ IsOptionalHaikuImagePackageAdded WebKit ] {
     1848    if $(TARGET_ARCH) != x86 {
     1849        Echo "No optional package WebKit available for $(TARGET_ARCH)" ;
     1850    } else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) {
     1851        Echo "No optional package WebKit available for gcc2" ;
     1852    } else {
     1853        InstallOptionalHaikuImagePackage $(HAIKU_WEBKIT_FILE)
     1854            : $(baseURL)/$(HAIKU_WEBKIT_FILE)
     1855            : common ;
     1856    }
     1857}
     1858
     1859
    18461860# WebPositive
    18471861if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
    18481862    if $(TARGET_ARCH) != x86 {
    18491863        Echo "No optional package WebPositive available for $(TARGET_ARCH)" ;
    1850     } else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) {
    1851         Echo "No optional package WebPositive available for gcc2" ;
    1852     } else {
    1853         InstallOptionalHaikuImagePackage
    1854             WebPositive-gcc4-x86-r586-2012-03-31.zip
    1855             : $(baseURL)/WebPositive-gcc4-x86-r586-2012-03-31.zip ;
    1856         AddSymlinkToHaikuImage home config settings deskbar Applications
    1857             : /boot/apps/WebPositive/WebPositive ;
     1864    } else if $(HAIKU_GCC_VERSION[1]) < 4 {
     1865        if ! $(isHybridBuild) {
     1866            Echo "No optional package WebPositive available for gcc2" ;
     1867        } else {
     1868            Echo "WebPositive will be compiled by gcc4 inside $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR)" ;
     1869        }
     1870    } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
     1871        AddFilesToHaikuHybridImage apps : WebPositive ;
     1872        AddSymlinkToHaikuHybridImage home config settings deskbar Applications
     1873            : /boot/apps/WebPositive ;
    18581874    }
    18591875}
    18601876