package/netsurf: new package

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
[Thomas:
 - rename BR2_PACKAGE_NETSURF_FRAMEBUFFER to BR2_PACKAGE_NETSURF_SDL,
   and use "sdl" everywhere instead of "framebuffer", since really SDL
   can display on something else than the framebuffer
 - use a "depends on BR2_PACKAGE_LIBGTK2" instead of a "depends on
   BR2_PACKAGE_XORG7 + many other depends on + select
   BR2_PACKAGE_LIBGTK2"
 - use PKG_CONFIG_HOST_BINARY for the pkg-config path]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/DEVELOPERS b/DEVELOPERS
index 9a7045cf7ebae639406eef632fa55094ee063628..5fc611c4e4f6dbd393a82edc6f309b1820479383 100644 (file)
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -828,6 +828,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 512b2c4bf1354bca5f4b301508385d121e12b40c..bdc63f71f1a6924215a2c6789ec692de6017b06c 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -271,6 +271,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 (file)
index 0000000..979ddaf
--- /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@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@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 (file)
index 0000000..21a3a99
--- /dev/null
+++ b/package/netsurf/Config.in
@@ -0,0 +1,36 @@
+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
+       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/
+
+if BR2_PACKAGE_NETSURF
+
+choice
+       prompt "Netsurf frontend"
+       default BR2_PACKAGE_NETSURF_SDL
+
+config BR2_PACKAGE_NETSURF_SDL
+       bool "sdl frontend"
+       select BR2_PACKAGE_SDL
+       help
+         Select SDL 1.2 frontend.
+
+config BR2_PACKAGE_NETSURF_GTK
+       bool "gtk frontend"
+       depends on BR2_PACKAGE_LIBGTK2
+       help
+         Select GTK frontend.
+
+endchoice
+
+endif

diff --git a/package/netsurf/netsurf.hash b/package/netsurf/netsurf.hash
new file mode 100644 (file)
index 0000000..26e8c76
--- /dev/null
+++ b/package/netsurf/netsurf.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 eb4864d4459d6f9958dd10a3301c272ea7f5df72667a7db0aad5bc5ae06c0e10  netsurf-all-3.8.tar.gz
+sha256 55c4a7ae3953d720a462e69d1f128a20004933d12538be5314a33f8821675378  netsurf/COPYING

diff --git a/package/netsurf/netsurf.mk b/package/netsurf/netsurf.mk
new file mode 100644 (file)
index 0000000..162ac5d
--- /dev/null
+++ b/package/netsurf/netsurf.mk
@@ -0,0 +1,67 @@
+################################################################################
+#
+# 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_NETSURF_GTK),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
+endif
+
+ifeq ($(BR2_PACKAGE_NETSURF_SDL),y)
+NETSURF_DEPENDENCIES += sdl
+NETSURF_FRONTEND = framebuffer
+endif
+
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+NETSURF_DEPENDENCIES += libiconv
+define NETSURF_ICONV_CONFIGURE_CMDS
+       echo "CFLAGS += -DWITH_ICONV_FILTER"            >> $(@D)/libparserutils/Makefile.config.override
+       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
+       $(NETSURF_ICONV_CONFIGURE_CMDS)
+       $(NETSURF_SVG_CONFIGURE_CMDS)
+endef
+
+NETSURF_MAKE_OPTS = \
+       TARGET=$(NETSURF_FRONTEND) \
+       BISON="$(HOST_DIR)/bin/bison" \
+       FLEX="$(HOST_DIR)/bin/flex" \
+       PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+       BUILD_CC="$(HOSTCC)" \
+       CC="$(TARGET_CC)" \
+       AR="$(TARGET_AR)" \
+       TMP_PREFIX=$(STAGING_DIR)/usr \
+       PREFIX=/usr
+
+define NETSURF_BUILD_CMDS
+       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(NETSURF_MAKE_OPTS) \
+               build
+endef
+
+define NETSURF_INSTALL_TARGET_CMDS
+       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(NETSURF_MAKE_OPTS) \
+               DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))