[Buildroot] [PATCH] netsurf: new package
Matthew Weber
matthew.weber at rockwellcollins.com
Sun Nov 25 21:33:32 UTC 2018
Francois,
On Sun, Nov 25, 2018 at 11:59 AM Francois Perrad <fperrad at gmail.com> wrote:
>
> Signed-off-by: Francois Perrad <francois.perrad at gadz.org>
> ---
> DEVELOPERS | 1 +
> package/Config.in | 1 +
> .../0001-avoid-system-perl-dependencies.patch | 29 +++++++++
> package/netsurf/Config.in | 15 +++++
> package/netsurf/netsurf.hash | 2 +
> package/netsurf/netsurf.mk | 61 +++++++++++++++++++
> 6 files changed, 109 insertions(+)
> create mode 100644 package/netsurf/0001-avoid-system-perl-dependencies.patch
> create mode 100644 package/netsurf/Config.in
> create mode 100644 package/netsurf/netsurf.hash
> create mode 100644 package/netsurf/netsurf.mk
>
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 2a5c8dc78..4a9151a40 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -784,6 +784,7 @@ F: package/lua*
> F: package/lunit/
> F: package/lzlib/
> F: package/moarvm/
> +F: package/netsurf/
> F: package/perl*
> F: package/pkg-perl.mk
> F: package/pkg-luarocks.mk
> diff --git a/package/Config.in b/package/Config.in
> index f5a17492c..1061d01df 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -269,6 +269,7 @@ comment "Graphic applications"
> source "package/kmscube/Config.in"
> source "package/libva-utils/Config.in"
> source "package/mesa3d-demos/Config.in"
> + source "package/netsurf/Config.in"
> source "package/pngquant/Config.in"
> source "package/qt5cinex/Config.in"
> source "package/rrdtool/Config.in"
> diff --git a/package/netsurf/0001-avoid-system-perl-dependencies.patch b/package/netsurf/0001-avoid-system-perl-dependencies.patch
> new file mode 100644
> index 000000000..979ddafc8
> --- /dev/null
> +++ b/package/netsurf/0001-avoid-system-perl-dependencies.patch
> @@ -0,0 +1,29 @@
> +From b42e4b5bfca030965dcfca993a47a6ddaa941287 Mon Sep 17 00:00:00 2001
> +From: Francois Perrad <francois.perrad at gadz.org>
> +Date: Sun, 25 Nov 2018 18:27:54 +0100
> +Subject: [PATCH] avoid system perl dependencies
> +
> +this subroutine format is used for android target.
> +with eval the load of HTML::Entities is deferred.
> +
> +Signed-off-by: Francois Perrad <francois.perrad at gadz.org>
> +---
> + netsurf/utils/split-messages.pl | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/netsurf/utils/split-messages.pl b/netsurf/utils/split-messages.pl
> +index 4b50dde..e47dded 100644
> +--- a/netsurf/utils/split-messages.pl
> ++++ b/netsurf/utils/split-messages.pl
> +@@ -311,7 +311,7 @@ TXT
> + sub footer { qq|</resources>| }
> + sub format
> + {
> +- use HTML::Entities qw(encode_entities);
> ++ eval q|use HTML::Entities qw(encode_entities);|;
> + my $escaped = encode_entities( $_[1], '<>&"' );
> + qq| <string name="$_[0]">$escaped</string>\n|;
> + }
> +--
> +2.17.1
> +
> diff --git a/package/netsurf/Config.in b/package/netsurf/Config.in
> new file mode 100644
> index 000000000..645036466
> --- /dev/null
> +++ b/package/netsurf/Config.in
> @@ -0,0 +1,15 @@
> +config BR2_PACKAGE_NETSURF
> + bool "netsurf"
> + select BR2_PACKAGE_EXPAT
> + select BR2_PACKAGE_JPEG
> + select BR2_PACKAGE_LIBCURL
> + select BR2_PACKAGE_LIBGTK2 if BR2_PACKAGE_XORG7
> + select BR2_PACKAGE_LIBPNG
> + select BR2_PACKAGE_OPENSSL
> + select BR2_PACKAGE_SDL if !BR2_PACKAGE_XORG7
> + help
> + NetSurf is a compact graphical web browser which aims for
> + HTML5, CSS and JavaScript support.
> + Frontends: GTK+ 2 (X11), SDL 1.2 (framebuffer)
> +
> + http://www.netsurf-browser.org/
> diff --git a/package/netsurf/netsurf.hash b/package/netsurf/netsurf.hash
> new file mode 100644
> index 000000000..aa4602e76
> --- /dev/null
> +++ b/package/netsurf/netsurf.hash
> @@ -0,0 +1,2 @@
> +# Locally computed
> +sha256 eb4864d4459d6f9958dd10a3301c272ea7f5df72667a7db0aad5bc5ae06c0e10 netsurf-all-3.8.tar.gz
Suggest adding the license file hash
(https://buildroot.org/downloads/manual/manual.html#adding-packages-hash)
> diff --git a/package/netsurf/netsurf.mk b/package/netsurf/netsurf.mk
> new file mode 100644
> index 000000000..b165f1fbc
> --- /dev/null
> +++ b/package/netsurf/netsurf.mk
> @@ -0,0 +1,61 @@
> +################################################################################
> +#
> +# netsurf
> +#
> +################################################################################
> +
> +NETSURF_VERSION = 3.8
> +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 \
> + host-bison host-flex host-gperf host-pkgconf
> +
> +ifeq ($(BR2_PACKAGE_XORG7),y)
> +NETSURF_DEPENDENCIES += libgtk2
> +NETSURF_FRONTEND = gtk
> +ifeq ($(BR2_PACKAGE_LIBRSVG),y)
> +NETSURF_DEPENDENCIES += librsvg
> +define NETSURF_SVG_CONFIGURE_CMDS
> + echo "override NETSURF_USE_RSVG := YES" >> $(@D)/netsurf/Makefile.config
> + echo "override NETSURF_USE_NSSVG := NO" >> $(@D)/netsurf/Makefile.config
> +endef
> +endif
> +else
> +NETSURF_DEPENDENCIES += sdl
> +NETSURF_FRONTEND = framebuffer
> +endif
> +
> +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
This creates a dependency warning. Suggest adding
BR2_PACKAGE_LIBICONV as a kconfig select if BR2_TOOLCHAIN_USES_UCLIBC
and then check here for ifeq ($(BR2_PACKAGE_LIBICONV),y)
> +NETSURF_DEPENDENCIES += libiconv
> +define NETSURF_ICONV_CONFIGURE_CMDS
> + echo "override NETSURF_USE_LIBICONV_PLUG := NO" >> $(@D)/netsurf/Makefile.config
> +endef
> +endif
> +
> +define NETSURF_CONFIGURE_CMDS
> + echo "override NETSURF_USE_DUKTAPE := NO" > $(@D)/netsurf/Makefile.config
> + echo "override NETSURF_USE_GRESOURCE := NO" >> $(@D)/netsurf/Makefile.config
> + echo "override NETSURF_USE_INLINE_PIXBUF := NO" >> $(@D)/netsurf/Makefile.config
> + $(NETSURF_ICONV_CONFIGURE_CMDS)
> + $(NETSURF_SVG_CONFIGURE_CMDS)
> +endef
> +
> +NETSURF_MAKE_OPTS = \
> + TARGET=$(NETSURF_FRONTEND) \
> + TMP_PREFIX=$(STAGING_DIR)/usr \
> + V=0 \
Does it default to V=1? If so, maybe set to this instead to follow
the overall Buildroot verbosity.
> + PREFIX=/usr
> +
> +define NETSURF_BUILD_CMDS
> + $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) $(NETSURF_MAKE_OPTS) \
Suggest adding a comment above this line or in the commit description
as to the need for MAKE1.
uclibc build is going now, I'll let you know if I see anything else.
Thanks!
Matt
More information about the buildroot
mailing list