From 7f7a624ee3adbdec045da817cc6d156886c80817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Thu, 3 Sep 2009 10:22:59 +0000 Subject: [PATCH] Patch by scottmc: * Updated Pe package * Updated subversion package (using ~/config/settings/subversion instead of ~/.subversion) * Corrected APR dependencies Test pending. Thanks a lot! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32919 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackageDependencies | 2 +- build/jam/OptionalPackages | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies index b8ece8e339..38a3db0ce2 100644 --- a/build/jam/OptionalPackageDependencies +++ b/build/jam/OptionalPackageDependencies @@ -4,7 +4,7 @@ # dependencies. OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL SQLite ; -OptionalPackageDependencies APR-util : APR ; +OptionalPackageDependencies APR-util : APR Expat ; OptionalPackageDependencies BeHappy : BeBook NetSurf ; OptionalPackageDependencies Development : DevelopmentBase Perl ; OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 6979372ef6..125f8d5241 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -684,8 +684,8 @@ if [ IsOptionalHaikuImagePackageAdded Pe ] { : $(baseURL)/Pe-2.4.2-x86-gcc4-2009-08-04.zip ; } else { - InstallOptionalHaikuImagePackage Pe-2.4.2-x86-gcc2-2009-07-05 - : $(baseURL)/Pe-2.4.2-x86-gcc2-2009-07-05.zip + InstallOptionalHaikuImagePackage Pe-2.4.2-r593-r1a1-x86-gcc2-2009-09-02 + : $(baseURL)/Pe-2.4.2-r593-r1a1-x86-gcc2-2009-09-02.zip ; } @@ -755,8 +755,8 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Subversion available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage subversion-1.6.5-r1a1-x86-gcc2-2009-08-30 - : $(baseURL)/subversion-1.6.5-r1a1-x86-gcc2-2009-08-30.zip + InstallOptionalHaikuImagePackage subversion-1.6.5-r1a1-x86-gcc2-2009-09-02 + : $(baseURL)/subversion-1.6.5-r1a1-x86-gcc2-2009-09-02.zip : ; }