From 0f83996ab03f83523f926964f9a085ca5f55cab5 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 24 Dec 2016 18:18:33 +0100 Subject: [PATCH] Fix dependencies on libpng16. The libpng16 package has no "libpng" anymore, only a "libpng16". Adjust dependencies of Haiku and Haikuwebkit to this. --- build/jam/repositories/HaikuPorts/x86_gcc2 | 4 ++-- src/data/package_infos/x86_gcc2/haiku | 2 +- src/data/package_infos/x86_gcc2/haiku_secondary | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2 b/build/jam/repositories/HaikuPorts/x86_gcc2 index 93c5a4c34a..1c307afd0e 100644 --- a/build/jam/repositories/HaikuPorts/x86_gcc2 +++ b/build/jam/repositories/HaikuPorts/x86_gcc2 @@ -702,8 +702,8 @@ RemotePackageRepository HaikuPorts graphite2_x86_devel-1.2.4-1 guilib_x86-1.2.1-1 guilib_x86_devel-1.2.1-1 - haikuwebkit_x86-1.5.3-1 - haikuwebkit_x86_devel-1.5.3-1 + haikuwebkit_x86-1.5.3-2 + haikuwebkit_x86_devel-1.5.3-2 harfbuzz_x86-1.3.0-1 harfbuzz_x86_devel-1.3.0-1 hubbub_x86-0.3.3-2 diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku index e39ce9df84..a7e3a8a76a 100644 --- a/src/data/package_infos/x86_gcc2/haiku +++ b/src/data/package_infos/x86_gcc2/haiku @@ -90,7 +90,7 @@ requires { lib:libjpeg #endif #ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBPNG_ENABLED - lib:libpng >= 16.0 + lib:libpng16 >= 16.0 #endif lib:libqrencode #ifdef HAIKU_BUILD_FEATURE_X86_GCC2_TIFF_ENABLED diff --git a/src/data/package_infos/x86_gcc2/haiku_secondary b/src/data/package_infos/x86_gcc2/haiku_secondary index 91e70e6ec6..cd04e39c29 100644 --- a/src/data/package_infos/x86_gcc2/haiku_secondary +++ b/src/data/package_infos/x86_gcc2/haiku_secondary @@ -36,7 +36,7 @@ requires { lib:libicns_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH% - lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0 + lib:libpng16_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0 lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.2 lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH% #endif