From 2bc399a932dbb548cea6947b87de1566029a1b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Wed, 8 Jan 2014 20:07:27 +0100 Subject: [PATCH] x86_64: Update haikuwebkit to 1.2.2 and add/update... various dependent packages. --- build/jam/repositories/Haiku | 4 +--- build/jam/repositories/HaikuPorts/x86_64 | 12 ++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/build/jam/repositories/Haiku b/build/jam/repositories/Haiku index 45b716069f..5ace41ecff 100644 --- a/build/jam/repositories/Haiku +++ b/build/jam/repositories/Haiku @@ -20,9 +20,7 @@ local packages = haiku_$(secondaryArchs)_devel ; -# TODO : the following should be used once WebPositive builds on x86_64 -# if $(TARGET_PACKAGING_ARCH) != x86_gcc2 || $(secondaryArchs) { -if x86 in $(HAIKU_PACKAGING_ARCHS) { +if $(TARGET_PACKAGING_ARCH) != x86_gcc2 || $(secondaryArchs) { packages += webpositive ; } diff --git a/build/jam/repositories/HaikuPorts/x86_64 b/build/jam/repositories/HaikuPorts/x86_64 index 58e4b6c44c..5a6bfa43f7 100644 --- a/build/jam/repositories/HaikuPorts/x86_64 +++ b/build/jam/repositories/HaikuPorts/x86_64 @@ -23,7 +23,7 @@ RemotePackageRepository HaikuPorts bzip2-1.0.6-4 bzip2_devel-1.0.6-4 cdrtools-3.01~a07-3 - cmake-2.8.11.2-6 + cmake-2.8.11.2-7 ctags-5.8-3 curl-7.26.0-5 curl_devel-7.26.0-5 @@ -51,8 +51,8 @@ RemotePackageRepository HaikuPorts gperf-3.0.4-1 grep-2.14-5 groff-1.20.1-3 - haikuwebkit-1.2.1-1 - haikuwebkit_devel-1.2.1-1 + haikuwebkit-1.2.2-1 + haikuwebkit_devel-1.2.2-1 htmldoc-1.8.27-3 icu-4.8.1.1-4 icu_devel-4.8.1.1-4 @@ -80,9 +80,9 @@ RemotePackageRepository HaikuPorts libvorbis_devel-1.3.2-2 libvpx-1.0.0-2 libvpx_devel-1.0.0-2 - libxml2-2.8.0-7 - libxml2_devel-2.8.0-7 - libxml2_python-2.8.0-7 + libxml2-2.9.1-1 + libxml2_devel-2.9.1-1 + libxml2_python-2.9.1-1 libxslt-1.1.28-2 libxslt_devel-1.1.28-2 m4-1.4.16-5