From patchwork Wed Dec 12 07:14:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 1011623 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="a3pRLP3M"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43F7QN3H8Lz9sB7 for ; Wed, 12 Dec 2018 18:16:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0215C86230; Wed, 12 Dec 2018 07:16:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WuKF20ggrkKS; Wed, 12 Dec 2018 07:16:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 425D8862C7; Wed, 12 Dec 2018 07:16:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 22ACB1BF282 for ; Wed, 12 Dec 2018 07:16:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 34CCE86196 for ; Wed, 12 Dec 2018 07:16:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dHuI2ykPQ48Y for ; Wed, 12 Dec 2018 07:16:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0D59385FEE for ; Wed, 12 Dec 2018 07:16:02 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id r10so16511184wrs.10 for ; Tue, 11 Dec 2018 23:16:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iqiMLtmRh/lnKdQdByfQc0DdCX6D2PKZKPdYi3xFqhs=; b=a3pRLP3McrEvtM0IZmi++5T06FyrpgUEZhtGIPM0tNWpU5wSRcUfXYjMCqwdkZSfTV 75TGVRvbZb0h4vDBFTuX11Eh5m48Kwdsc+1M4hw5DzBqqPkHOyHXfnhtDNhyrM3kT1iB 1gmpejz8H1Z6CBg8Glc1RHQd2jdp67/jxqtjK+B4VZNUYbOr6wq0nxAcQ15Zb0oezMTq 4aI8bbtogaxgRFeWCXLsnOeeaWDvoPL5zEYragguDd6CZOh+VUz+4GCShhT9DE3X97Ps vR0abTIZkcWa1gPbI6p2166JJYC9o24k72Y/r49iEssBkRebQA7inuPYMJQPqo+/fw+w Jlrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iqiMLtmRh/lnKdQdByfQc0DdCX6D2PKZKPdYi3xFqhs=; b=FCJrt+1i2WH/d4Cgujzy1DkOEf1ZFNLymP/Ts1lseaE2nTklVssEbs1ETB8gvviHFW vgOl+jzO0O5z625Q+j8YhvzeNYdjkl2GDMQPF/pjB3rSHzIrPvpDqU030gPGqfhb8KOK sVuLaNTUDwDO7AoFyCzM9xVLyTr2HHEL4UVp25t+NUteBmWQNi1ld0Brb8wKDaduH8cN YBIc5640eMmBRaYyO+Ik1xTI9oM3bvvSMtdmwV2JATzNvUz3mF353d3aqsQD5eM+2RRR HDhUU7AyvcpOzN5OXkFW1a3QxLeyB8hU65c+iiiL3Uv1VvWOwTtTY5HadsO4fPDVt+YD bGPw== X-Gm-Message-State: AA+aEWYomOOHzRV1mK8sUN03KdJElcD2YWGlr5Qt0EJvYBe+cTHnQn7H nTLvSrPxYka1igRd5BX5AGLCqBWg X-Google-Smtp-Source: AFSGD/X7vCUQvhWlzE0I3uXKUtWEvIBomZzm/wHQton/kNDrNrsaWyh8lNVSdbtOY+t43rFWNQA5rA== X-Received: by 2002:adf:eec9:: with SMTP id a9mr15740393wrp.242.1544598960078; Tue, 11 Dec 2018 23:16:00 -0800 (PST) Received: from vb-18.04 (254.7.19.109.rev.sfr.net. [109.19.7.254]) by smtp.gmail.com with ESMTPSA id 129sm2540955wmd.18.2018.12.11.23.15.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 23:15:59 -0800 (PST) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Wed, 12 Dec 2018 08:14:55 +0100 Message-Id: <20181212071455.29215-4-francois.perrad@gadz.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181212071455.29215-1-francois.perrad@gadz.org> References: <20181212071455.29215-1-francois.perrad@gadz.org> Subject: [Buildroot] [PATCH 4/4] netsurf: libcurl become optional X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Francois Perrad --- .../0004-fix-compilation-without-curl.patch | 27 +++++++++++++++++++ package/netsurf/Config.in | 3 +-- package/netsurf/netsurf.mk | 12 ++++++++- 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 package/netsurf/0004-fix-compilation-without-curl.patch diff --git a/package/netsurf/0004-fix-compilation-without-curl.patch b/package/netsurf/0004-fix-compilation-without-curl.patch new file mode 100644 index 000000000..74ecd3a7b --- /dev/null +++ b/package/netsurf/0004-fix-compilation-without-curl.patch @@ -0,0 +1,27 @@ +From 7d7c59dbfc92fcbcd0eac2c84e0fb98662c4bd71 Mon Sep 17 00:00:00 2001 +From: Francois Perrad +Date: Sat, 8 Dec 2018 09:43:40 +0100 +Subject: [PATCH 4/4] fix compilation without curl + +Signed-off-by: Francois Perrad +--- + netsurf/content/fetch.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/netsurf/content/fetch.c b/netsurf/content/fetch.c +index 7665029..0f41c49 100644 +--- a/netsurf/content/fetch.c ++++ b/netsurf/content/fetch.c +@@ -54,7 +54,9 @@ + #include "content/fetchers.h" + #include "content/fetchers/resource.h" + #include "content/fetchers/about.h" ++#ifdef WITH_CURL + #include "content/fetchers/curl.h" ++#endif + #include "content/fetchers/data.h" + #include "content/fetchers/file.h" + #include "javascript/fetcher.h" +-- +2.17.1 + diff --git a/package/netsurf/Config.in b/package/netsurf/Config.in index 99360a99d..a99d94508 100644 --- a/package/netsurf/Config.in +++ b/package/netsurf/Config.in @@ -2,10 +2,9 @@ config BR2_PACKAGE_NETSURF bool "netsurf" select BR2_PACKAGE_EXPAT select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL if BR2_PACKAGE_LIBCURL help NetSurf is a compact graphical web browser which aims for HTML5, CSS and JavaScript support. diff --git a/package/netsurf/netsurf.mk b/package/netsurf/netsurf.mk index 8d29c5acc..692d2b770 100644 --- a/package/netsurf/netsurf.mk +++ b/package/netsurf/netsurf.mk @@ -9,7 +9,7 @@ NETSURF_SOURCE = netsurf-all-$(NETSURF_VERSION).tar.gz NETSURF_SITE = http://download.netsurf-browser.org/netsurf/releases/source-full NETSURF_LICENSE = GPL-2.0 NETSURF_LICENSE_FILES = netsurf/COPYING -NETSURF_DEPENDENCIES = expat jpeg libcurl libpng openssl \ +NETSURF_DEPENDENCIES = expat jpeg libpng \ host-bison host-flex host-gperf host-pkgconf ifeq ($(BR2_PACKAGE_NETSURF_GTK),y) @@ -51,10 +51,20 @@ define NETSURF_ICONV_CONFIGURE_CMDS endef endif +ifeq ($(BR2_PACKAGE_LIBCURL),y) +NETSURF_DEPENDENCIES += libcurl openssl +else +define NETSURF_CURL_CONFIGURE_CMDS + echo "override NETSURF_USE_CURL := NO" >> $(@D)/netsurf/Makefile.config + echo "override NETSURF_USE_OPENSSL := NO" >> $(@D)/netsurf/Makefile.config +endef +endif + define NETSURF_CONFIGURE_CMDS $(NETSURF_ICONV_CONFIGURE_CMDS) $(NETSURF_SVG_CONFIGURE_CMDS) $(NETSURF_FONTLIB_CONFIGURE_CMDS) + $(NETSURF_CURL_CONFIGURE_CMDS) endef NETSURF_MAKE_OPTS = \