From 554fe146cb72b440f13241f798d7de80e986f5ab Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 11 Sep 2012 00:09:53 -0700 Subject: [PATCH] Updated several more OptionalPackages --- build/jam/OptionalLibPackages | 20 ++++++++++---------- build/jam/OptionalPackages | 32 ++++++++++++++++++-------------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/build/jam/OptionalLibPackages b/build/jam/OptionalLibPackages index b02eadab6a..0b329920e9 100644 --- a/build/jam/OptionalLibPackages +++ b/build/jam/OptionalLibPackages @@ -38,14 +38,14 @@ if [ IsOptionalHaikuImagePackageAdded AllegroLibs ] { Echo "No optional package AllegroLibs available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - allegro-4.4.1.1-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/allegro-4.4.1.1-r1a3-x86-gcc4-2011-05-26.zip ; + allegro-4.4.1.1-r1a4-x86-gcc4-2012-09-09.zip + : $(baseURL)/lib/allegro-4.4.1.1-r1a4-x86-gcc4-2012-09-09.zip ; InstallOptionalHaikuImagePackage - dumb-0.9.3-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/dumb-0.9.3-r1a3-x86-gcc4-2011-05-26.zip ; + dumb-0.9.3-r1a4-x86-gcc4-2012-09-09.zip + : $(baseURL)/lib/dumb-0.9.3-r1a4-x86-gcc4-2012-09-09.zip ; InstallOptionalHaikuImagePackage - jgmod-0.99-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/jgmod-0.99-r1a3-x86-gcc4-2011-05-26.zip ; + jgmod-0.99-r1a4-x86-gcc4-2012-09-09.zip + : $(baseURL)/lib/jgmod-0.99-r1a4-x86-gcc4-2012-09-09.zip ; } else { InstallOptionalHaikuImagePackage allegro-4.4.1.1-r1a3-x86-gcc2-2011-05-19.zip @@ -67,8 +67,8 @@ if [ IsOptionalHaikuImagePackageAdded box2d ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) { InstallOptionalHaikuImagePackage - box2d-2.1.2-r1a3-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/box2d-2.1.2-r1a3-x86-gcc4-2011-05-26.zip + box2d-2.1.2-r1a4-x86-gcc4-2012-09-09.zip + : $(baseURL)/lib/box2d-2.1.2-r1a4-x86-gcc4-2012-09-09.zip : : true ; } else { Echo "No optional package box2d available for $(TARGET_ARCH)-gcc2" ; @@ -209,8 +209,8 @@ if [ IsOptionalHaikuImagePackageAdded physfs ] { Echo "No optional package physfs available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - physfs-2.0.1-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/physfs-2.0.1-r1a3-x86-gcc4-2011-05-26.zip + physfs-2.0.1-r1a4-x86-gcc4-2012-09-09.zip + : $(baseURL)/lib/physfs-2.0.1-r1a4-x86-gcc4-2012-09-09.zip : : true ; } else { InstallOptionalHaikuImagePackage diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 5af5efae8b..f8b3bb8778 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -715,8 +715,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] m4-1.4.16-r1a4-x86-gcc2-2012-08-26.zip : $(baseURL)/m4-1.4.16-r1a4-x86-gcc2-2012-08-26.zip ; InstallOptionalHaikuImagePackage - flex-2.5.35-r1a4-x86-gcc2-2012-08-26.zip - : $(baseURL)/flex-2.5.35-r1a4-x86-gcc2-2012-08-26.zip ; + flex-2.5.35-r1a4-x86-gcc2-2012-09-10.zip + : $(baseURL)/flex-2.5.35-r1a4-x86-gcc2-2012-09-10.zip ; InstallOptionalHaikuImagePackage jam-2.5-r1a4-x86-gcc2-2012-08-27.zip : $(baseURL)/jam-2.5-r1a4-x86-gcc2-2012-08-27.zip ; @@ -1141,12 +1141,12 @@ if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - KeymapSwitcher-1.2.7-x86-gcc4-2012-05-19.zip - : $(baseURL)/KeymapSwitcher-1.2.7-x86-gcc4-2012-05-19.zip ; + KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-09-09.zip + : $(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-09-09.zip ; } else { InstallOptionalHaikuImagePackage - KeymapSwitcher-1.2.7-x86-gcc2-2012-05-19.zip - : $(baseURL)/KeymapSwitcher-1.2.7-x86-gcc2-2012-05-19.zip ; + KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-08-31.zip + : $(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-08-31.zip ; } AddSymlinkToHaikuImage home config settings deskbar Preferences : /boot/common/bin/KeymapSwitcher ; @@ -1273,8 +1273,12 @@ if [ IsOptionalHaikuImagePackageAdded LibXSLT ] { if [ IsOptionalHaikuImagePackageAdded Links ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Links available for $(TARGET_ARCH)" ; - } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { - Echo "No optional package Links available for gcc4" ; + } else if $(HAIKU_GCC_VERSION[1]) >= 4 { + InstallOptionalHaikuImagePackage + links-2.3pre2-r1a4-x86-gcc4-2012-09-09.zip + : $(baseURL)/links-2.3pre2-r1a4-x86-gcc4-2012-09-09.zip ; + AddSymlinkToHaikuImage home config settings deskbar Applications + : /boot/home/config/bin/links ; } else { InstallOptionalHaikuImagePackage links-2.3pre2-r1a4-x86-gcc2-2012-08-30.zip @@ -1648,8 +1652,8 @@ if [ IsOptionalHaikuImagePackageAdded Rsync ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - rsync-3.0.7-r1a4-x86-gcc4-2012-08-31.zip - : $(baseURL)/rsync-3.0.7-r1a4-x86-gcc4-2012-08-31.zip + rsync-3.0.7-r1a4-x86-gcc4-2012-09-09.zip + : $(baseURL)/rsync-3.0.7-r1a4-x86-gcc4-2012-09-09.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -1667,12 +1671,12 @@ if [ IsOptionalHaikuImagePackageAdded Ruby ] { Echo "No optional package Ruby available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - ruby-1.9.1-r1a4-x86-gcc4-2012-08-31.zip - : $(baseURL)/ruby-1.9.1-r1a4-x86-gcc4-2012-08-31.zip ; + ruby-1.9.1-r1a4-x86-gcc4-2012-09-10.zip + : $(baseURL)/ruby-1.9.1-r1a4-x86-gcc4-2012-09-10.zip ; } else { InstallOptionalHaikuImagePackage - ruby-1.9.1-r1a4-x86-gcc2-2012-08-29.zip - : $(baseURL)/ruby-1.9.1-r1a4-x86-gcc2-2012-08-29.zip ; + ruby-1.9.1-r1a4-x86-gcc2-2012-09-10.zip + : $(baseURL)/ruby-1.9.1-r1a4-x86-gcc2-2012-09-10.zip ; } }