From 35b97d25e10299d7ef932fa460ba53428d5be7e7 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 28 Dec 2016 18:04:17 +0100
Subject: [PATCH] netsurf, webkit: fix dependency on libpng.

---
 dev-libs/libwapcaplet/libwapcaplet-0.4.0.recipe | 11 ++++++++---
 haiku-libs/haikuwebkit/haikuwebkit-1.5.3.recipe |  6 +++---
 www-client/netsurf/netsurf-3.6.recipe           |  4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.0.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.4.0.recipe
index 83b0ab6fe8..02cc15243a 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.0.recipe
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.0.recipe
@@ -5,7 +5,7 @@ functionality."
 HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
 COPYRIGHT="2009-2016 The NetSurf Browser project"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libwapcaplet-${portVersion}-src.tar.gz"
 CHECKSUM_SHA256="7b87a997b2531298af1efd32a622be5faee61349ad4e6c868fcb286ce805d997"
 
@@ -31,8 +31,8 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	netsurf_buildsystem >= 0
-	lib:libcheck
-	devel:libcheck
+	lib:libcheck$secondaryArchSuffix
+	devel:libcheck$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
@@ -44,12 +44,17 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		COMPONENT_TYPE=lib-shared
 }
 
 INSTALL()
 {
 	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
 		INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir
+	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir \
+		COMPONENT_TYPE=lib-shared
 	mkdir -p $prefix/develop/lib
 
 	prepareInstalledDevelLib libwapcaplet
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.5.3.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.5.3.recipe
index 1d7f321593..6c2f8d1bd3 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.5.3.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.5.3.recipe
@@ -12,7 +12,7 @@ LICENSE="
 	GNU LGPL v2.1
 	MIT
 	"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="5f83dea8e7ecdd1a32f49c9844e6c8e2972d5b7ffcefb5b8cd2ae3705a2926bf"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
@@ -31,7 +31,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
-	lib:libpng$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
 	lib:libwebp$secondaryArchSuffix
 	lib:libsqlite3$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
@@ -56,7 +56,7 @@ BUILD_REQUIRES="
 	haiku_devel
 	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
 	devel:libwebp$secondaryArchSuffix
 	devel:libsqlite3$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
diff --git a/www-client/netsurf/netsurf-3.6.recipe b/www-client/netsurf/netsurf-3.6.recipe
index 46d2478f01..876d53d585 100644
--- a/www-client/netsurf/netsurf-3.6.recipe
+++ b/www-client/netsurf/netsurf-3.6.recipe
@@ -9,7 +9,7 @@ developed, NetSurf is continually evolving and improving."
 HOMEPAGE="http://www.netsurf-browser.org/"
 COPYRIGHT="2003-2016 The NetSurf Browser project"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 # Do NOT use the netsurf-all package. It contains a bunch of subprojects which
 # we build as separate packages so they can easily be used by other projects.
 SOURCE_URI="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-$portVersion-src.tar.gz"
@@ -29,7 +29,7 @@ REQUIRES="
 	lib:libiconv$secondaryArchSuffix
 	lib:libnsbmp$secondaryArchSuffix
 	lib:libnsgif$secondaryArchSuffix
-	lib:libpng$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libutf8proc$secondaryArchSuffix