netsurf: Update recipes, fix_makefile.patch for netsurf.

Updated do_stage in netsurf libraries for distributing missing
.pc files into staging. These are required for building newer
versions of netsurf.

Updated fix_makefile.patch to replace the definition of HOST_CC
with BUILD_CC. This fixes some compilation issues.

Bumped PR accordingly in all recipes.

Signed-off-by: Alex Ferguson <thoughtmonster@gmail.com>
Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>

11 files changed, 49 insertions, 14 deletions

diff --git a/recipes/netsurf/hubbub_0.0.2.bb b/recipes/netsurf/hubbub_0.0.2.bb
index e488f8d6cb..0d6b8281ca 100644
--- a/recipes/netsurf/hubbub_0.0.2.bb
+++ b/recipes/netsurf/hubbub_0.0.2.bb
@@ -5,9 +5,9 @@ PRIORITY = "optional"
 LICENSE = "MIT"
 DEPENDS = "libparserutils"
 
-SRC_URI = "http://www.netsurf-browser.org/projects/releases/hubbub-${PV}-src.tar.gz"
+PR = "r1"
 
-PR = "r0"
+SRC_URI = "http://www.netsurf-browser.org/projects/releases/hubbub-${PV}-src.tar.gz"
 
 inherit pkgconfig
 
@@ -19,7 +19,7 @@ EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE"
 
 do_stage() {
         oe_libinstall -a -C build-OE/ libhubbub ${STAGING_LIBDIR}
-
+        install -m 0644 build-OE/libhubbub.pc ${STAGING_LIBDIR}/pkgconfig
         install -d ${STAGING_INCDIR}/hubbub
         install -m 0644 include/hubbub/*.h ${STAGING_INCDIR}/hubbub
 }
diff --git a/recipes/netsurf/libcss_0.0.2.bb b/recipes/netsurf/libcss_0.0.2.bb
index 038c257268..42424c45e1 100644
--- a/recipes/netsurf/libcss_0.0.2.bb
+++ b/recipes/netsurf/libcss_0.0.2.bb
@@ -5,6 +5,8 @@ PRIORITY = "optional"
 LICENSE = "MIT"
 DEPENDS = "libwapcaplet"
 
+PR = "r1"
+
 SRC_URI = "http://www.netsurf-browser.org/projects/releases/libcss-${PV}-src.tar.gz \
 	   file://no-werror.patch"
 
@@ -18,6 +20,7 @@ EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE"
 
 do_stage() {
 	oe_libinstall -a -C build-OE/ libcss ${STAGING_LIBDIR}
+	install -m 0644 build-OE/libcss.pc ${STAGING_LIBDIR}/pkgconfig
 	install -d ${STAGING_INCDIR}/libcss
 	install -m 0644 include/libcss/*.h ${STAGING_INCDIR}/libcss
 }
diff --git a/recipes/netsurf/libnsbmp_0.0.2.bb b/recipes/netsurf/libnsbmp_0.0.2.bb
index 15802b504c..db02c1e055 100644
--- a/recipes/netsurf/libnsbmp_0.0.2.bb
+++ b/recipes/netsurf/libnsbmp_0.0.2.bb
@@ -4,6 +4,8 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "MIT"
 
+PR = "r1"
+
 SRC_URI = "http://www.netsurf-browser.org/projects/releases/libnsbmp-${PV}-src.tar.gz"
 
 inherit pkgconfig
@@ -16,6 +18,7 @@ EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE"
 
 do_stage() {
 	oe_libinstall -a -C build-OE/ libnsbmp ${STAGING_LIBDIR}
+	install -m 0644 build-OE/libnsbmp.pc ${STAGING_LIBDIR}/pkgconfig
 	install -m 0644 include/*.h ${STAGING_INCDIR}/
 }
 
diff --git a/recipes/netsurf/libnsfb_svn.bb b/recipes/netsurf/libnsfb_svn.bb
index 41d8d1b302..0bfe82b91e 100644
--- a/recipes/netsurf/libnsfb_svn.bb
+++ b/recipes/netsurf/libnsfb_svn.bb
@@ -7,7 +7,7 @@ DEPENDS = "xcb-util"
 
 SRCREV = "10944"
 PV = "0.0.1+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "svn://svn.netsurf-browser.org/trunk;module=libnsfb \
 	   file://no-werror.patch"
@@ -24,6 +24,7 @@ EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE"
 
 do_stage() {
 	oe_libinstall -a -C build-OE/ libnsfb ${STAGING_LIBDIR}
+	install -m 0644 build-OE/libnsfb.pc ${STAGING_LIBDIR}/pkgconfig
 	install -m 0644 include/*.h ${STAGING_INCDIR}/
 }
 
diff --git a/recipes/netsurf/libnsgif_0.0.2.bb b/recipes/netsurf/libnsgif_0.0.2.bb
index f9184b64ac..5291169c0d 100644
--- a/recipes/netsurf/libnsgif_0.0.2.bb
+++ b/recipes/netsurf/libnsgif_0.0.2.bb
@@ -4,8 +4,9 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "MIT"
 
+PR = "r1"
+
 SRC_URI = "http://www.netsurf-browser.org/projects/releases/libnsgif-${PV}-src.tar.gz"
-PR = "r0"
 
 inherit pkgconfig
 
@@ -17,6 +18,7 @@ EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE"
 
 do_stage() {
 	oe_libinstall -a -C build-OE/ libnsgif ${STAGING_LIBDIR}
+	install -m 0644 build-OE/libnsgif.pc ${STAGING_LIBDIR}/pkgconfig
 	install -m 0644 include/*.h ${STAGING_INCDIR}/
 }
 
diff --git a/recipes/netsurf/libparserutils_0.0.2.bb b/recipes/netsurf/libparserutils_0.0.2.bb
index 3e2623b399..ea592726f5 100644
--- a/recipes/netsurf/libparserutils_0.0.2.bb
+++ b/recipes/netsurf/libparserutils_0.0.2.bb
@@ -4,6 +4,8 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "MIT"
 
+PR = "r1"
+
 SRC_URI = "http://www.netsurf-browser.org/projects/releases/libparserutils-${PV}-src.tar.gz"
 
 inherit pkgconfig
@@ -16,7 +18,7 @@ EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE"
 
 do_stage () {
         oe_libinstall -a -C build-OE/ libparserutils ${STAGING_LIBDIR}
-
+	install -m 0644 build-OE/libparserutils.pc ${STAGING_LIBDIR}/pkgconfig
 	install -d ${STAGING_INCDIR}/parserutils
 	install -d ${STAGING_INCDIR}/parserutils/charset
 	install -d ${STAGING_INCDIR}/parserutils/input
diff --git a/recipes/netsurf/libwapcaplet_0.0.2.bb b/recipes/netsurf/libwapcaplet_0.0.2.bb
index 4954933a62..3ef4b3c904 100644
--- a/recipes/netsurf/libwapcaplet_0.0.2.bb
+++ b/recipes/netsurf/libwapcaplet_0.0.2.bb
@@ -4,6 +4,8 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "MIT"
 
+PR = "r1"
+
 SRC_URI = "http://www.netsurf-browser.org/projects/releases/libwapcaplet-${PV}-src.tar.gz"
 
 inherit pkgconfig
@@ -16,6 +18,7 @@ EXTRA_OEMAKE = "CURDIR=${S} DESTDIR=${D} PREFIX=${prefix} BUILDDIR=build-OE"
 
 do_stage() {
 	oe_libinstall -a -C build-OE/ libwapcaplet ${STAGING_LIBDIR}
+	install -m 0644 build-OE/libwapcaplet.pc ${STAGING_LIBDIR}/pkgconfig
 	install -d ${STAGING_INCDIR}/libwapcaplet
 	install -m 0644 include/libwapcaplet/*.h ${STAGING_INCDIR}/libwapcaplet
 }
diff --git a/recipes/netsurf/netsurf-2.6/fix_makefile.patch b/recipes/netsurf/netsurf-2.6/fix_makefile.patch
index a8cea0f34f..a6d714cfd1 100644
--- a/recipes/netsurf/netsurf-2.6/fix_makefile.patch
+++ b/recipes/netsurf/netsurf-2.6/fix_makefile.patch
@@ -1,6 +1,15 @@
-diff -ru netsurf-old/Makefile netsurf/Makefile
---- netsurf-old/Makefile	2010-09-21 22:35:54.000000000 +0300
-+++ netsurf/Makefile	2010-11-18 18:13:37.793334209 +0200
+diff -ru netsurf.orig/Makefile netsurf/Makefile
+--- netsurf.orig/Makefile	2010-09-21 22:35:54.000000000 +0300
++++ netsurf/Makefile	2010-12-03 19:49:46.930000534 +0200
+@@ -118,7 +118,7 @@
+ STRIP=strip
+ 
+ # Override this only if the host compiler is called something different
+-HOST_CC := gcc
++HOST_CC := $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_LDFLAGS)
+ ifeq ($(TARGET),amiga)
+   ifneq ($(HOST),amiga)
+     CC := ppc-amigaos-gcc
 @@ -842,7 +842,7 @@
  	@cp -RL gtk/res/toolbarIndices $(DESTDIR)$(NETSURF_GTK_RESOURCES)
  	@cp -RL gtk/res/Aliases $(DESTDIR)$(NETSURF_GTK_RESOURCES)
diff --git a/recipes/netsurf/netsurf-fb/fix_makefile.patch b/recipes/netsurf/netsurf-fb/fix_makefile.patch
index a8cea0f34f..a6d714cfd1 100644
--- a/recipes/netsurf/netsurf-fb/fix_makefile.patch
+++ b/recipes/netsurf/netsurf-fb/fix_makefile.patch
@@ -1,6 +1,15 @@
-diff -ru netsurf-old/Makefile netsurf/Makefile
---- netsurf-old/Makefile	2010-09-21 22:35:54.000000000 +0300
-+++ netsurf/Makefile	2010-11-18 18:13:37.793334209 +0200
+diff -ru netsurf.orig/Makefile netsurf/Makefile
+--- netsurf.orig/Makefile	2010-09-21 22:35:54.000000000 +0300
++++ netsurf/Makefile	2010-12-03 19:49:46.930000534 +0200
+@@ -118,7 +118,7 @@
+ STRIP=strip
+ 
+ # Override this only if the host compiler is called something different
+-HOST_CC := gcc
++HOST_CC := $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_LDFLAGS)
+ ifeq ($(TARGET),amiga)
+   ifneq ($(HOST),amiga)
+     CC := ppc-amigaos-gcc
 @@ -842,7 +842,7 @@
  	@cp -RL gtk/res/toolbarIndices $(DESTDIR)$(NETSURF_GTK_RESOURCES)
  	@cp -RL gtk/res/Aliases $(DESTDIR)$(NETSURF_GTK_RESOURCES)
diff --git a/recipes/netsurf/netsurf-fb_svn.bb b/recipes/netsurf/netsurf-fb_svn.bb
index 692da98043..0288af2d91 100644
--- a/recipes/netsurf/netsurf-fb_svn.bb
+++ b/recipes/netsurf/netsurf-fb_svn.bb
@@ -4,7 +4,7 @@ SECTION = "x11/network"
 LICENSE = "GPLv2"
 SRCREV = "10950"
 PV = "2.6+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "virtual/libsdl lemon-native re2c-native jpeg openssl curl \
 	   libxml2 hubbub libcss libnsfb libnsgif libnsbmp lcms"
@@ -26,6 +26,9 @@ do_configure() {
 	cp ${WORKDIR}/Makefile.config ${S}/
 }
 
+do_compile() {
+}
+
 do_install() {
 	oe_runmake TARGET=framebuffer install
 }
diff --git a/recipes/netsurf/netsurf_2.6.bb b/recipes/netsurf/netsurf_2.6.bb
index d4b992326e..607a18a0d5 100644
--- a/recipes/netsurf/netsurf_2.6.bb
+++ b/recipes/netsurf/netsurf_2.6.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://www.netsurf-browser.org/downloads/releases/netsurf-${PV}-src.t
 	   file://netsurf.desktop \
 	   file://Makefile.config"
 
-PR = "r0"
+PR = "r1"
 
 # Workaround for 2.6 tarball (unpacks into netsurf/, not netsurf-2.6/ )
 S = "${WORKDIR}/netsurf"