i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update netsurf to 2.6, added libmng as a dependency for netsurf.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38818 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Scott McCreary
2010-09-26 16:26:55 +00:00
parent 413a591c78
commit 842b416b9b
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackageDependencies
+1 -1
View File
@@ -21,7 +21,7 @@ OptionalPackageDependencies Tar : LibIconv ;
OptionalPackageDependencies Python : Bzip ;
OptionalPackageDependencies Mercurial : Python ;
OptionalPackageDependencies NetFS : UserlandFS ;
OptionalPackageDependencies NetSurf : OpenSSL Curl LibXML2 LibIconv ;
OptionalPackageDependencies NetSurf : OpenSSL Curl LibXML2 LibIconv Libmng ;
OptionalPackageDependencies OpenSSH : OpenSSL ;
OptionalPackageDependencies Paladin : CCache Fastdep ;
OptionalPackageDependencies Pe : PCRE ;
build/jam/OptionalPackages
+19 -6
View File
@@ -49,7 +49,8 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
# LibEvent - An event notification library
# LibIconv - text encoding conversion library
# LibLayout - GCC2 package needed by some BeOS apps to compile
# LibXML2 - the XML support libary
# Libmng - mng support library
# LibXML2 - the XML support library
# LibXSLT - xslt library and utility
# Links - the web browser
# Man - standard commands to read man pages
@@ -942,6 +943,21 @@ if [ IsOptionalHaikuImagePackageAdded LibLayout ] {
}
# Libmng library
if [ IsOptionalHaikuImagePackageAdded Libmng ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Libmng available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package Libmng available for gcc4" ;
} else {
InstallOptionalHaikuImagePackage libmng-1.0.10-x86-gcc2-2010-09-26.zip
: $(baseURL)/libmng-1.0.10-x86-gcc2-2010-09-26.zip
:
;
}
}
# LibXML2
if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
if $(TARGET_ARCH) != x86 {
@@ -1099,15 +1115,12 @@ if [ IsOptionalHaikuImagePackageAdded NetSurf ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package NetSurf available for gcc4" ;
} else {
InstallOptionalHaikuImagePackage NetSurf-r9862b.zip
: $(baseURL)/NetSurf-r9862-x86-gcc2-2010-01-27.zip
InstallOptionalHaikuImagePackage netsurf-2.6-x86.gcc2-2010-09-26.zip
: $(baseURL)/netsurf-2.6-x86-gcc2-2010-09-26.zip
:
;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/netsurf/NetSurf ;
InstallSourceArchive netsurf-r9862.7z
: http://haiku-files.org/files/sources/2010/netsurf-r9862.7z
;
}
}