jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/netsurf: turn libcurl into an optional dependency

Browse Source 
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Francois Perrad 2018-12-12 08:14:55 +01:00 committed by Thomas Petazzoni
parent 436ed9d547
commit b808e65c1c
3 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
package/netsurf/0004-fix-compilation-without-curl.patch Normal file
View File

@ -0,0 +1,27 @@
From 7d7c59dbfc92fcbcd0eac2c84e0fb98662c4bd71 Mon Sep 17 00:00:00 2001
From: Francois Perrad <francois.perrad@gadz.org>
Date: Sat, 8 Dec 2018 09:43:40 +0100
Subject: [PATCH] fix compilation without curl
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
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

3
package/netsurf/Config.in
View File

@ -2,10 +2,9 @@ config BR2_PACKAGE_NETSURF
bool "netsurf" bool "netsurf"
select BR2_PACKAGE_EXPAT select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_JPEG select BR2_PACKAGE_JPEG
select BR2_PACKAGE_LIBCURL
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL if BR2_PACKAGE_LIBCURL
help help
NetSurf is a compact graphical web browser which aims for NetSurf is a compact graphical web browser which aims for
HTML5, CSS and JavaScript support. HTML5, CSS and JavaScript support.

12
package/netsurf/netsurf.mk
View File

@ -9,7 +9,7 @@ NETSURF_SOURCE = netsurf-all-$(NETSURF_VERSION).tar.gz
NETSURF_SITE = http://download.netsurf-browser.org/netsurf/releases/source-full NETSURF_SITE = http://download.netsurf-browser.org/netsurf/releases/source-full
NETSURF_LICENSE = GPL-2.0 NETSURF_LICENSE = GPL-2.0
NETSURF_LICENSE_FILES = netsurf/COPYING 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 host-bison host-flex host-gperf host-pkgconf
ifeq ($(BR2_PACKAGE_NETSURF_GTK),y) ifeq ($(BR2_PACKAGE_NETSURF_GTK),y)
@ -51,10 +51,20 @@ define NETSURF_ICONV_CONFIGURE_CMDS
endef endef
endif 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 define NETSURF_CONFIGURE_CMDS
$(NETSURF_ICONV_CONFIGURE_CMDS) $(NETSURF_ICONV_CONFIGURE_CMDS)
$(NETSURF_SVG_CONFIGURE_CMDS) $(NETSURF_SVG_CONFIGURE_CMDS)
$(NETSURF_FONTLIB_CONFIGURE_CMDS) $(NETSURF_FONTLIB_CONFIGURE_CMDS)
$(NETSURF_CURL_CONFIGURE_CMDS)
endef endef
NETSURF_MAKE_OPTS = \ NETSURF_MAKE_OPTS = \