hrev50787 adds 1 changeset to branch 'master'
old head: d2e18d64629393c7db275c3ad18f48ec98744628
new head: 0f83996ab03f83523f926964f9a085ca5f55cab5
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=0f83996ab03f+%5Ed2e18d646293
----------------------------------------------------------------------------
0f83996ab03f: Fix dependencies on libpng16.
The libpng16 package has no "libpng" anymore, only a "libpng16". Adjust
dependencies of Haiku and Haikuwebkit to this.
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev50787
Commit: 0f83996ab03f83523f926964f9a085ca5f55cab5
URL: http://cgit.haiku-os.org/haiku/commit/?id=0f83996ab03f
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Sat Dec 24 17:18:33 2016 UTC
----------------------------------------------------------------------------
3 files changed, 4 insertions(+), 4 deletions(-)
build/jam/repositories/HaikuPorts/x86_gcc2 | 4 ++--
src/data/package_infos/x86_gcc2/haiku | 2 +-
src/data/package_infos/x86_gcc2/haiku_secondary | 2 +-
----------------------------------------------------------------------------
diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2
b/build/jam/repositories/HaikuPorts/x86_gcc2
index 93c5a4c..1c307af 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 e39ce9d..a7e3a8a 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 91e70e6..cd04e39 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
