From patchwork Wed Dec 12 07:14:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 1011620 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.136; helo=silver.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="dnmuK/NG"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43F7QF3hNkz9s8J for ; Wed, 12 Dec 2018 18:16:05 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6698E22B20; Wed, 12 Dec 2018 07:16:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pF2Q1u5HL+so; Wed, 12 Dec 2018 07:16:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id F3ED521554; Wed, 12 Dec 2018 07:16:00 +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 A60A61BF282 for ; Wed, 12 Dec 2018 07:15:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0E7EE86156 for ; Wed, 12 Dec 2018 07:15:59 +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 LwANwx3C4u9b for ; Wed, 12 Dec 2018 07:15:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id D4D368613C for ; Wed, 12 Dec 2018 07:15:57 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id v13so16538372wrw.5 for ; Tue, 11 Dec 2018 23:15:57 -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; bh=Ie7REaEGjPfRANWLesSZo4Xu5iEYMxtRtGrwaAgN56Q=; b=dnmuK/NGJIoFYu1BsJm95269TPwIc/kr10F58Y6ylJ6+k1RSkB2eA4z3wj7hbieksP dwbvTGPoyk1GoySNIL1l2XPG6TYSDhNL2+SNXNPVeT5eZLeXaIyTg//PrbwTlYfjBgaS i9a/Mgx44TpNPFE9IkAWmFuat2AbDPn3yUGONJiiRs5UX6Q8MFJPgNnYuFEmQeo1ePMd MaNVZHSaIebetVuXX6m7TjEL4qjVBxKjttIM8ld9/vziJm58WIFFe3xxi7eC60UMyVtf Yxg/hmx4hdGOYwqVKBrAwA79k5L5bjAFGr7fyd2YTz2i+0/ri+YkYIVNRst8gNwZOWSP LQuA== 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; bh=Ie7REaEGjPfRANWLesSZo4Xu5iEYMxtRtGrwaAgN56Q=; b=Ali7NHkV0dxoKjQJFucS1Iq9q9J7LGilctx5knt4BLlWXxvwWGh1fgasNPHB2rpOtj wrfje85oGc7HljX3FOwWw39QODi9LyWcpAJZ5poMxHI8uzarIZMDEmcnJCru7cbkdo1i r30Y8X7geQ+MHaMP/LaGSdkxpEGjaxUDDRLFJ3Ij39osCftNDO+DK+zz0V1xl5XW0im+ 0vR1Y1hLATOW9Z00WJaa6LM1KTuFIPVC3d71xEaW+6qtwVVUGuPFDiXeOcb2vlcDDVZc A66owie4crBHrwt3nbyYkso8ntHRrVgG+rC30/rtUPnt4IJwZ1bR7HYh/+0cUo5iI2b5 +/lA== X-Gm-Message-State: AA+aEWY8BYh0fI+hL8F1QD0aK3kJxPxqDEdksOYEH28qTyfshY7wI9h8 AIit+QcogXTXJaYOAVIpy27Aa1P/ X-Google-Smtp-Source: AFSGD/V/Dj8NHqMSbTMj4tK6XqjJzdo2unM9CRuSulaIP8GWV+fMyj0yRcrvtmnOD2PgtmDqPzkgbg== X-Received: by 2002:adf:dfd1:: with SMTP id q17mr17110791wrn.27.1544598955806; Tue, 11 Dec 2018 23:15:55 -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.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 23:15:55 -0800 (PST) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Wed, 12 Dec 2018 08:14:52 +0100 Message-Id: <20181212071455.29215-1-francois.perrad@gadz.org> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH 1/4] netsurf: add optional dependency freetype 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 --- .../netsurf/0002-fix-freetype-detection.patch | 28 +++++++++++++++++++ package/netsurf/netsurf.mk | 7 +++++ 2 files changed, 35 insertions(+) create mode 100644 package/netsurf/0002-fix-freetype-detection.patch diff --git a/package/netsurf/0002-fix-freetype-detection.patch b/package/netsurf/0002-fix-freetype-detection.patch new file mode 100644 index 000000000..27c0440e1 --- /dev/null +++ b/package/netsurf/0002-fix-freetype-detection.patch @@ -0,0 +1,28 @@ +From 85336f2404b9583267019650ea0112ebf1bb571a Mon Sep 17 00:00:00 2001 +From: Francois Perrad +Date: Wed, 28 Nov 2018 17:59:44 +0100 +Subject: [PATCH 2/2] fix freetype detection + +Signed-off-by: Francois Perrad +--- + netsurf/frontends/framebuffer/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/netsurf/frontends/framebuffer/Makefile b/netsurf/frontends/framebuffer/Makefile +index bdedd90..249c7c4 100644 +--- a/netsurf/frontends/framebuffer/Makefile ++++ b/netsurf/frontends/framebuffer/Makefile +@@ -35,8 +35,8 @@ LDFLAGS += -Wl,--no-whole-archive + + # freetype is optional but does not use pkg-config + ifeq ($(NETSURF_FB_FONTLIB),freetype) +- CFLAGS += -DFB_USE_FREETYPE $(shell freetype-config --cflags) +- LDFLAGS += $(shell freetype-config --libs) ++ CFLAGS += -DFB_USE_FREETYPE $(shell $(PKG_CONFIG) --cflags freetype2) ++ LDFLAGS += $(shell $(PKG_CONFIG) --libs freetype2) + endif + + +-- +2.17.1 + diff --git a/package/netsurf/netsurf.mk b/package/netsurf/netsurf.mk index 3339b35c9..23e4de637 100644 --- a/package/netsurf/netsurf.mk +++ b/package/netsurf/netsurf.mk @@ -27,6 +27,12 @@ endif ifeq ($(BR2_PACKAGE_NETSURF_SDL),y) NETSURF_DEPENDENCIES += sdl host-libpng NETSURF_FRONTEND = framebuffer +ifeq ($(BR2_PACKAGE_FREETYPE),y) +NETSURF_DEPENDENCIES += freetype +define NETSURF_FONTLIB_CONFIGURE_CMDS + echo "override NETSURF_FB_FONTLIB := freetype" >> $(@D)/netsurf/Makefile.config +endef +endif endif ifeq ($(BR2_PACKAGE_LIBICONV),y) @@ -41,6 +47,7 @@ define NETSURF_CONFIGURE_CMDS echo "override NETSURF_USE_DUKTAPE := NO" > $(@D)/netsurf/Makefile.config $(NETSURF_ICONV_CONFIGURE_CMDS) $(NETSURF_SVG_CONFIGURE_CMDS) + $(NETSURF_FONTLIB_CONFIGURE_CMDS) endef NETSURF_MAKE_OPTS = \ From patchwork Wed Dec 12 07:14:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 1011621 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="H8d3marJ"; 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 43F7QH0nB4z9s8J for ; Wed, 12 Dec 2018 18:16:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 12E3985FEE; Wed, 12 Dec 2018 07:16:04 +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 mMqdiuTnhaSt; Wed, 12 Dec 2018 07:16:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A4C8F8616F; Wed, 12 Dec 2018 07:16:02 +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 90E681BF282 for ; Wed, 12 Dec 2018 07:16:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A278C85FEE for ; Wed, 12 Dec 2018 07:15:59 +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 hXVWOvUwg+Jz for ; Wed, 12 Dec 2018 07:15:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id D9E8C86193 for ; Wed, 12 Dec 2018 07:15:58 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id l9so16475002wrt.13 for ; Tue, 11 Dec 2018 23:15:58 -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=kIhy76/fNqM5PteWKu2xHifztZOQHmI5V0eKaMlTtrE=; b=H8d3marJp/qaGWKInYONgoGqcvKNtzVHBW0AAXVwEPEp/MDcr/dM365XPw4SBWBAgi 9zmAXZRmjjje1cMlZH8O5MXKq/zJmV2tq+YNfYK7w1Vu2TDYj2HHux4rJIyRSzKQpF62 WS4tF+eQn07XT4/kUhn9uCTV7l3gRELs9LARXPariAal930K5HgIMo1d2NjaVOQBRkmZ 5MEM+Vr2e/m0Q63Iame2adt2bWB5X5pWJS+1FsE7xPL4PIAOat9ktYaeytpHTfEVr0di rGL3Wkwth5dfvbTDRSTwi/DXfsLT0dVSmRmqIJ2DSj3zMGmHckNjsuf/1XfemkDXPDyb Ig9g== 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=kIhy76/fNqM5PteWKu2xHifztZOQHmI5V0eKaMlTtrE=; b=klScytAXH57cSaXcDmt+uLADqYtWQTam3thT3rHK/eAGLtTmEyqFV8CVK/EDPBgjlS +zJQKbc5MtMZWZv0eWE3iXy+mmzXyjugUnjMZV41RunVUOYcLskVfy8UhrFQNA6QoD6B u/gkYVRZmIQiABwcTJjWdJZgB6AXXuVN6Xk6e2JxOwRw8CCYFY7VPcRAcVdeC0Or9bEi dn2XAfGRcT9gZr/rhJUdPZZMmVrILxQLEbmg8BinjyKyf+WnlOb70f/9pIIF81MyIEl8 EieMzUPPMsFbWqxGgou2VtFZJObCj+pr/WC7qyIRTKqydGKGYTJQQxiU1vM2MqLLh52K yH9g== X-Gm-Message-State: AA+aEWaUYJwU7VHy3/ubDzFBjeOVR+iY/2leRnRGzxLYw9V0IWYMRVCJ hU3hPViKzLxDt/Si6fGnIB2nw9VH X-Google-Smtp-Source: AFSGD/V+BUwoF0RzmZD6KP4/fZ2FbvT6Y047Vl5S0GdaxQWOg+UoUAXAc8SVL3QDPqpgJkm8O0YjIw== X-Received: by 2002:adf:a357:: with SMTP id d23mr16885697wrb.195.1544598957073; Tue, 11 Dec 2018 23:15:57 -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.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 23:15:56 -0800 (PST) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Wed, 12 Dec 2018 08:14:53 +0100 Message-Id: <20181212071455.29215-2-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 2/4] netsurf: allow javascript (with duktape) 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 --- .../0003-do-not-cross-compile-nsgenbind.patch | 26 +++++++++++++++++++ package/netsurf/netsurf.mk | 1 - 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 package/netsurf/0003-do-not-cross-compile-nsgenbind.patch diff --git a/package/netsurf/0003-do-not-cross-compile-nsgenbind.patch b/package/netsurf/0003-do-not-cross-compile-nsgenbind.patch new file mode 100644 index 000000000..f0e5f4105 --- /dev/null +++ b/package/netsurf/0003-do-not-cross-compile-nsgenbind.patch @@ -0,0 +1,26 @@ +From 2419ad79b25fcc1746178aba609fddbb0aa8c9e0 Mon Sep 17 00:00:00 2001 +From: Francois Perrad +Date: Sat, 1 Dec 2018 16:10:13 +0100 +Subject: [PATCH 3/3] do not cross compile nsgenbind + +Signed-off-by: Francois Perrad +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index f279f01..5698c87 100644 +--- a/Makefile ++++ b/Makefile +@@ -109,7 +109,7 @@ endef + + # prefixed install macro for each host sub target + define do_build_prefix_install +- $(MAKE) install --directory=$1 HOST=$(BUILD) PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR= ++ $(MAKE) install --directory=$1 HOST=$(BUILD) CC=$(BUILD_CC) PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR= + + endef + +-- +2.17.1 + diff --git a/package/netsurf/netsurf.mk b/package/netsurf/netsurf.mk index 23e4de637..004d58256 100644 --- a/package/netsurf/netsurf.mk +++ b/package/netsurf/netsurf.mk @@ -44,7 +44,6 @@ endef endif define NETSURF_CONFIGURE_CMDS - echo "override NETSURF_USE_DUKTAPE := NO" > $(@D)/netsurf/Makefile.config $(NETSURF_ICONV_CONFIGURE_CMDS) $(NETSURF_SVG_CONFIGURE_CMDS) $(NETSURF_FONTLIB_CONFIGURE_CMDS) From patchwork Wed Dec 12 07:14:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 1011622 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.133; helo=hemlock.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="sLqNm61v"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43F7QN2SJqz9s8J for ; Wed, 12 Dec 2018 18:16:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 15F0087B18; Wed, 12 Dec 2018 07:16:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EniAIF3qx-Y1; Wed, 12 Dec 2018 07:16:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 85A4E87AAF; Wed, 12 Dec 2018 07:16:05 +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 38ABC1BF282 for ; Wed, 12 Dec 2018 07:16:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8D55C86156 for ; Wed, 12 Dec 2018 07:16:01 +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 WrZnAhUD-QbV for ; Wed, 12 Dec 2018 07:16:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 815BD8613C for ; Wed, 12 Dec 2018 07:16:00 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id 96so16549412wrb.2 for ; Tue, 11 Dec 2018 23:16:00 -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=wcr2nL74CTxETufp7BNnNqrdVvNcLAJ4ihjqPSf5QoU=; b=sLqNm61vFMelpmdCVpsJQXqHVycku2CpXDRKt6I1cqDNMSucoXy/auZNjcKFCKMSzh vJ2gI3AH5s7lgRHPIls9kOQIR3BKFg9ZTetnoYQS/PvlnXjwzENiWjf3lHA5pwkNaK+R 1s++nkAP9sYv+sPTqlDrHw1anYbeytwLsl28rN0Gk0wj1xrtBK21JXCRWi2ERQpXYJeC D6OciTbcQscewuOUHwzcE0jbQM3G3lgq5UL9tffNzbIxwWQAafQRh/WO8gHIs0sM9XfY LREQyYo7nO5BGrXbX6vvz7yOesBV5E7cArxAkhOHF1HctxsXwd4eN3Glo2NMJcF5rOdj KLiA== 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=wcr2nL74CTxETufp7BNnNqrdVvNcLAJ4ihjqPSf5QoU=; b=Af8XfCtWlAHDHubBLVPIrvA6N+Qw1KsuPOy6HaoFNYiMiN7NHWmy7vy4YGuXoOYFgD X5igBCK257fM2octlAO3useSFd4oLf5ToCwkNMCOhKvvIag1EM2KDJDzotomjk1zsdli hVTmCE9PhJDeUxw5XVE5NnuPWFbbitJv+3zXgnOlhAtLunsA80k3w4N5EVvuahdiAm8d dcw1I383dgjUXBTjFQdWOjXH2jwbuS9J2srCJYnG4C52UfEvseoy4UrSM2p9GMzDVHm1 3AUcp+C5ZZfXO/bQaR4zqwH8Jpbkg0VBYdzuME/MXiQ4CcNRV+HCyZWNwWRIzlwJUftI 1P2A== X-Gm-Message-State: AA+aEWbyYEKlVYOUNdnF4epUbyTZCS2y1ivO6g+Apbs8NA6PtWKLf3Zv 1yJB3i8ecaNKYY4Qnp4CIbi2Sv+L X-Google-Smtp-Source: AFSGD/VEsiDDzLy6KseidfqIjEISHe5ISTVPk64lERi4yG6vE/YtMdR8AM151w+SDJAyEMNTn1hcvA== X-Received: by 2002:adf:f5d1:: with SMTP id k17mr17572435wrp.59.1544598958741; Tue, 11 Dec 2018 23:15:58 -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.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 23:15:58 -0800 (PST) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Wed, 12 Dec 2018 08:14:54 +0100 Message-Id: <20181212071455.29215-3-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 3/4] netsurf: add GTK+ 3 frontend 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 --- package/netsurf/Config.in | 10 ++++++++-- package/netsurf/netsurf.mk | 8 ++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/package/netsurf/Config.in b/package/netsurf/Config.in index 21a3a992a..99360a99d 100644 --- a/package/netsurf/Config.in +++ b/package/netsurf/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_NETSURF help NetSurf is a compact graphical web browser which aims for HTML5, CSS and JavaScript support. - Frontends: GTK+ 2 (X11), SDL 1.2 (framebuffer) + Frontends: GTK (X11), SDL 1.2 (framebuffer) http://www.netsurf-browser.org/ @@ -29,7 +29,13 @@ config BR2_PACKAGE_NETSURF_GTK bool "gtk frontend" depends on BR2_PACKAGE_LIBGTK2 help - Select GTK frontend. + Select GTK+ 2 frontend. + +config BR2_PACKAGE_NETSURF_GTK3 + bool "gtk3 frontend" + depends on BR2_PACKAGE_LIBGTK3 + help + Select GTK+ 3 frontend. endchoice diff --git a/package/netsurf/netsurf.mk b/package/netsurf/netsurf.mk index 004d58256..8d29c5acc 100644 --- a/package/netsurf/netsurf.mk +++ b/package/netsurf/netsurf.mk @@ -15,6 +15,14 @@ NETSURF_DEPENDENCIES = expat jpeg libcurl libpng openssl \ ifeq ($(BR2_PACKAGE_NETSURF_GTK),y) NETSURF_DEPENDENCIES += libgtk2 NETSURF_FRONTEND = gtk +endif + +ifeq ($(BR2_PACKAGE_NETSURF_GTK3),y) +NETSURF_DEPENDENCIES += libgtk3 +NETSURF_FRONTEND = gtk3 +endif + +ifeq ($(BR2_PACKAGE_NETSURF_GTK)$(BR2_PACKAGE_NETSURF_GTK3),y) ifeq ($(BR2_PACKAGE_LIBRSVG),y) NETSURF_DEPENDENCIES += librsvg define NETSURF_SVG_CONFIGURE_CMDS 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 = \