[haiku-commits] r38818 - haiku/trunk/build/jam

  • From: scott mc <scottmc2@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 26 Sep 2010 18:26:55 +0200 (CEST)

Author: scottmc
Date: 2010-09-26 18:26:55 +0200 (Sun, 26 Sep 2010)
New Revision: 38818
Changeset: http://dev.haiku-os.org/changeset/38818

Modified:
   haiku/trunk/build/jam/OptionalPackageDependencies
   haiku/trunk/build/jam/OptionalPackages
Log:
Update netsurf to 2.6, added libmng as a dependency for netsurf.


Modified: haiku/trunk/build/jam/OptionalPackageDependencies
===================================================================
--- haiku/trunk/build/jam/OptionalPackageDependencies   2010-09-26 16:21:14 UTC 
(rev 38817)
+++ haiku/trunk/build/jam/OptionalPackageDependencies   2010-09-26 16:26:55 UTC 
(rev 38818)
@@ -21,7 +21,7 @@
 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 ;

Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages      2010-09-26 16:21:14 UTC (rev 
38817)
+++ haiku/trunk/build/jam/OptionalPackages      2010-09-26 16:26:55 UTC (rev 
38818)
@@ -49,7 +49,8 @@
 #      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 @@
 }
 
 
+# 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 @@
        } 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
-               ;
        }
 }
 


Other related posts:

  • » [haiku-commits] r38818 - haiku/trunk/build/jam - scott mc