From ff221f2369f548ce3987a9f2e40f3156b47087cf Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sun, 11 May 2014 15:01:13 +0800 Subject: [PATCH] Externals/netsurf - Minor fixes, now compiles up to core (requires curl includes) --- Externals/core.mk | 9 ++++++++- Externals/netsurf/Makefile | 9 +++++++-- Externals/netsurf/patches/UNIFIED.patch | 12 ++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/Externals/core.mk b/Externals/core.mk index bc7a5b80..6c23a33b 100644 --- a/Externals/core.mk +++ b/Externals/core.mk @@ -73,7 +73,14 @@ $(DIR)/%: patches/% PATCHED_FILES := $(addprefix $(DIR)/,$(PATCHES)) -_patch: $(DIR) $(PATCHED_FILES) $(wildcard patches/UNIFIED.patch) ifneq ($(wildcard patches/UNIFIED.patch),) +$(DIR)/_unified_applied: $(wildcard patches/UNIFIED.patch) cd $(DIR) && patch -p1 < ../patches/UNIFIED.patch + touch $@ +UNIFIED_TARGET=$(DIR)/_unified_applied +else +UNIFIED_TARGET= endif + +_patch: $(DIR) $(PATCHED_FILES) $(UNIFIED_TARGET) + diff --git a/Externals/netsurf/Makefile b/Externals/netsurf/Makefile index d4140c3f..5b69f5d8 100644 --- a/Externals/netsurf/Makefile +++ b/Externals/netsurf/Makefile @@ -12,7 +12,12 @@ NOBDIR = yes include ../core.mk -_build: - cd $(BDIR) && CC=$(HOST)-gcc TARGET=sdl make +.PHONY: _check_local_deps + +_build: _check_local_deps + cd $(BDIR) && CC=$(HOST)-gcc TARGET=framebuffer make + +_check_local_deps: + @gperf --help >/dev/null || (echo "ERROR: netsurf's build system requires gperf"; false) diff --git a/Externals/netsurf/patches/UNIFIED.patch b/Externals/netsurf/patches/UNIFIED.patch index e9456313..f59d7c17 100644 --- a/Externals/netsurf/patches/UNIFIED.patch +++ b/Externals/netsurf/patches/UNIFIED.patch @@ -108,3 +108,15 @@ diff -ru .orig/netsurf-full-3.0//src/libparserutils-0.1.2/src/utils/vector.c net { if (vector == NULL || vector->current_item < 0) return NULL; +diff -ru .orig/netsurf-full-3.0//src/libnsfb-0.1.2/Makefile netsurf-full-3.0//src/libnsfb-0.1.0/Makefile +--- .orig/netsurf-full-3.0//src/libnsfb-0.1.0/Makefile 2013-04-20 02:06:57.000000000 +0800 ++++ netsurf-full-3.0//src/libnsfb-0.1.0/Makefile 2013-07-01 22:22:45.246689992 +0800 +@@ -31,5 +31,5 @@ + # surfaces not detectable via pkg-config + NSFB_ABLE_AVAILABLE := no +-NSFB_LINUX_AVAILABLE := yes ++NSFB_LINUX_AVAILABLE := no + + # Flags and setup for each support library + NSFB_ABLE_AVAILABLE := no + -- 2.20.1