www-client/netsurf: Version bump (bug 602526, thanks Philipp Ammann), add support for GTK3, fix librosprite RDEPEND (bug 604128, thanks Another Mortal).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

6 files changed, 336 insertions, 0 deletions

diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index b5fe30561be9..a2c77caced61 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,4 +1,5 @@
 DIST netsurf-3.4-src.tar.gz 4133201 SHA256 1648f437994fc18090237430f30d645ff06bab0768ae973575f9391d07613bf6 SHA512 d9f95ff88d572a36e906bdb25dddbb51aa683a2105ca9eff53ea61c154a34a888420811f8a2b58a1b5a10f77d8aa914e3201b937934243527edb8a897f7bd60e WHIRLPOOL 1c8e3d6ac8a1ecd7bfa2554d56bd6e6cbd6c025112110f596a1db551d3b18029ee2761ddb288cdbc0cd517a90a54081d9d8aca3399339160addb2aedce14a55b
 DIST netsurf-3.5-src.tar.gz 4094532 SHA256 98f3a66d3ae24ab34becdab2ea690f8f20c0f49f86723f133ede6df57e451dcc SHA512 0bbb64d7dfbe105a0c9ace6f17655feef1b63ed8ae1ceaca647d0fce828cef27f4871949351694b5836f0bbc0b2614a3671235a1682b0810b9194cd89a68659a WHIRLPOOL 2c0d7cc6096607105da5049e46ea9c08ba3b20fdf1992853a2a85c78e0937bfb8d5b9a5f55751ea18f46d68e64bd13d24f7a13d7d7d52a63796df62e217a7c3c
+DIST netsurf-3.6-src.tar.gz 4129091 SHA256 59ae4b50eff9e2a00a0a9742ef546c7de17223139c485af9644f195340979a9c SHA512 6141cd94b2b6c8e56f682599e4929690f6ca668d1f6ff20bad93e30cf3a3b27475146f2b3c9dbc9f1b2e44b729d74c346254959b7def1f8d194e1c6efac3078d WHIRLPOOL 20776d928a60a8da5d1871d2ce1e15af7853a07e3ec995135019bbf579f1b0dde0918f960fe2c51546c6a08b218f9e4143fae5777f52203f831f877382b94740
 DIST netsurf-buildsystem-1.5.tar.gz 38196 SHA256 dbc6afc639f6987b704e6ff4427668787ee7efba77e1bbf76b614699b5daaf71 SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4 WHIRLPOOL 7b7d595a2e399b361e71769e509a129af42da5ce823f1b55183efb53898ac2ae731593eb13e1ecc2271ea26ee0948ac35bf99fea280eb72a2bb00164b4b29f09
 DIST netsurf-fb.modes-example.gz 4586 SHA256 df1514790be120f27bd23dfdca71c24112679d45d3cbd3916f9231ec5e2596bb SHA512 753a707dc428212803dd64250bb723a498fdc1c328fdac4df38be533eab3af45f727cdc6b7ced3faaa0e82db182c4eab140b8e81b0d3cfe2152252b89e6d2981 WHIRLPOOL 5a91c32a712b746c993d2fa1d47625f16241e845d556b8113ab957eda7385ac5bdde5f78b0de2dad4df544c7d7c13d8145ebb9d81272af9a3759ad4e307c3767
diff --git a/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch
new file mode 100644
index 000000000000..8004aa4c6206
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch
@@ -0,0 +1,67 @@
+--- netsurf-3.6/Makefile.defaults
++++ netsurf-3.6/Makefile.defaults
+@@ -96,12 +96,6 @@
+ # Valid options: YES, NO
+ NETSURF_FS_BACKING_STORE := NO
+ 
+-# Initial CFLAGS. Optimisation level etc. tend to be target specific.
+-CFLAGS :=
+-
+-# Initial CXXFLAGS. Optimisation level etc. tend to be target specific.
+-CXXFLAGS :=
+-
+ # Default installation/execution prefix
+ PREFIX ?= /usr/local
+ 
+--- netsurf-3.6/frontends/framebuffer/Makefile
++++ netsurf-3.6/frontends/framebuffer/Makefile
+@@ -20,7 +20,7 @@
+ CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"'
+ CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"'
+ 
+-CFLAGS += -std=c99 -g -Dsmall \
++CFLAGS += -std=c99 -Dsmall \
+ 	  -D_BSD_SOURCE \
+ 	  -D_DEFAULT_SOURCE \
+ 	  -D_XOPEN_SOURCE=600 \
+--- netsurf-3.6/frontends/framebuffer/Makefile.defaults
++++ netsurf-3.6/frontends/framebuffer/Makefile.defaults
+@@ -3,7 +3,7 @@
+ # ----------------------------------------------------------------------------
+ 
+ # Optimisation levels
+-CFLAGS += -O2
++CFLAGS += 
+ 
+ # Framebuffer default surface provider.
+ # Valid values are: x, sdl, linux, vnc, able,
+--- netsurf-3.6/frontends/gtk/Makefile
++++ netsurf-3.6/frontends/gtk/Makefile
+@@ -33,7 +33,7 @@
+ endif
+ 
+ 
+-GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
++GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
+ 		$(GTKDEPFLAGS) \
+ 		-D_BSD_SOURCE \
+ 		-D_DEFAULT_SOURCE \
+--- netsurf-3.6/frontends/gtk/Makefile.defaults
++++ netsurf-3.6/frontends/gtk/Makefile.defaults
+@@ -39,4 +39,4 @@
+ NETSURF_GTK_MAJOR ?= 2
+ 
+ # Optimisation levels
+-CFLAGS += -O2
++CFLAGS += 
+--- netsurf-3.6/test/Makefile
++++ netsurf-3.6/test/Makefile
+@@ -105,7 +105,7 @@
+   COMMON_WARNFLAGS += -Wno-unused-parameter
+ endif
+ 
+-TESTCFLAGS := -std=c99 -g \
++TESTCFLAGS := -std=c99 \
+ 		$(COMMON_WARNFLAGS) \
+ 		-D_BSD_SOURCE \
+ 		-D_POSIX_C_SOURCE=200809L \
diff --git a/www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch b/www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch
new file mode 100644
index 000000000000..06754464cb6c
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch
@@ -0,0 +1,31 @@
+--- netsurf-3.6/content/handlers/image/image.c
++++ netsurf-3.6/content/handlers/image/image.c
+@@ -27,14 +27,28 @@
+ #include "netsurf/content.h"
+ #include "desktop/gui_internal.h"
+ 
++#ifdef WITH_BMP
+ #include "image/bmp.h"
++#endif
++#ifdef WITH_GIF
+ #include "image/gif.h"
++#endif
+ #include "image/ico.h"
++#ifdef WITH_JPEG
+ #include "image/jpeg.h"
++#endif
++#ifdef WITH_NSSPRITE
+ #include "image/nssprite.h"
++#endif
++#ifdef WITH_PNG
+ #include "image/png.h"
++#endif
++#ifdef WITH_RSVG
+ #include "image/rsvg.h"
++#endif
++#ifdef WITH_NS_SVG
+ #include "image/svg.h"
++#endif
+ #include "image/image.h"
+ 
+ /**
diff --git a/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch
new file mode 100644
index 000000000000..5824adc1ecbf
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch
@@ -0,0 +1,80 @@
+--- netsurf-3.6/desktop/font_haru.c
++++ netsurf-3.6/desktop/font_haru.c
+@@ -37,7 +37,7 @@
+ #include <hpdf.h>
+ 
+ #include "utils/nsoption.h"
+-#include "desktop/save_pdf/font_haru.h"
++#include "desktop/font_haru.h"
+ #include "desktop/font.h"
+ #include "utils/log.h"
+ 
+--- netsurf-3.6/desktop/save_pdf.c
++++ netsurf-3.6/desktop/save_pdf.c
+@@ -60,6 +60,8 @@
+ #include "utils/useragent.h"
+ #include "content/hlcache.h"
+ #include "utils/nsoption.h"
++#include "desktop/gui_misc.h"
++#include "desktop/gui_internal.h"
+ #include "netsurf/bitmap.h"
+ 
+ #include "netsurf/plotters.h"
+@@ -450,11 +452,6 @@
+ 
+ 		switch(content_get_type(content)){
+ 		/*Handle "embeddable" types of images*/
+-		case CONTENT_JPEG:
+- 			image = HPDF_LoadJpegImageFromMem(pdf_doc,
+- 					(const HPDF_BYTE *) source_data,
+- 					source_size);
+- 			break;
+ 
+ 		/*Disabled until HARU PNG support will be more stable.
+ 
+@@ -700,7 +697,7 @@
+ 
+ 
+ #ifndef PDF_DEBUG
+-	if (option_enable_PDF_compression)
++	if (nsoption_bool(enable_PDF_compression))
+ 		HPDF_SetCompressionMode(pdf_doc, HPDF_COMP_ALL); /*Compression on*/
+ #endif
+ 	HPDF_SetInfoAttr(pdf_doc, HPDF_INFO_CREATOR, user_agent_string());
+@@ -774,7 +771,7 @@
+ 	assert(settings->output != NULL);
+ 
+ 	/*Encryption on*/
+-	if (option_enable_PDF_password)
++	if (nsoption_bool(enable_PDF_password))
+ 		guit->misc->pdf_password(&owner_pass, &user_pass,
+ 				(void *)settings->output);
+ 	else
+@@ -789,7 +786,7 @@
+ {
+ 	nserror res = NSERROR_OK;
+ 
+-	if (option_enable_PDF_password && owner_pass != NULL ) {
++	if (nsoption_bool(enable_PDF_password) && owner_pass != NULL ) {
+ 		HPDF_SetPassword(pdf_doc, owner_pass, user_pass);
+ 		HPDF_SetEncryptionMode(pdf_doc, HPDF_ENCRYPT_R3, 16);
+ 		free(owner_pass);
+--- netsurf-3.6/frontends/gtk/scaffolding.c
++++ netsurf-3.6/frontends/gtk/scaffolding.c
+@@ -731,14 +731,14 @@
+ 
+ 	free(url_name);
+ 
+-	strncpy(dirname, option_downloads_directory, PATH_MAX);
++	strncpy(dirname, nsoption_charp(downloads_directory), PATH_MAX);
+ 	strncat(dirname, "/", PATH_MAX - strlen(dirname));
+ 	dirname[PATH_MAX - 1] = '\0';
+ 
+ 	/* this way the scale used by PDF functions is synchronized with that
+ 	 * used by the all-purpose print interface
+ 	 */
+-	haru_nsfont_set_scale((float)option_export_scale / 100);
++	haru_nsfont_set_scale((float)nsoption_int(export_scale) / 100);
+ 
+ 	save_dialog = gtk_file_chooser_dialog_new("Export to PDF", g->window,
+ 		GTK_FILE_CHOOSER_ACTION_SAVE,
diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index 7d16da327347..e53232c547c3 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -19,6 +19,10 @@
 	<flag name="rosprite">RISC OS Sprite bitmap image support (media-libs/librosprite)</flag>
 	<flag name="svgtiny">SVG image support via media-libs/svgatiny instead of gnome-base/librsvg</flag>
 	<flag name="webp">WebP image support (media-libs/libwebp)</flag>
+	<flag name="psl">Use public suffix list via media-libs/libnspsl</flag>
+	<flag name="gtk">Build GTK GUI, defaults to GTK3</flag>
+	<flag name="gtk2">Build GTK2 GUI</flag>
+	<flag name="gtk3">Build GTK3 GUI</flag>
 	<flag name="duktape">Use duktape.org javascript engine</flag>
 </use>
 <longdescription lang="en">
diff --git a/www-client/netsurf/netsurf-3.6.ebuild b/www-client/netsurf/netsurf-3.6.ebuild
new file mode 100644
index 000000000000..1d709ecffdc6
--- /dev/null
+++ b/www-client/netsurf/netsurf-3.6.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+NETSURF_COMPONENT_TYPE=binary
+NETSURF_BUILDSYSTEM=buildsystem-1.5
+inherit netsurf
+
+DESCRIPTION="a free, open source web browser"
+HOMEPAGE="http://www.netsurf-browser.org/"
+SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz
+	http://xmw.de/mirror/netsurf-fb.modes-example.gz
+	${NETSURF_BUILDSYSTEM_SRC_URI}"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc"
+IUSE="+bmp +duktape fbcon truetype +gif gstreamer gtk gtk2 gtk3 +javascript +jpeg +mng
+	pdf-writer +png +psl +rosprite +svg +svgtiny +webp fbcon_frontend_able
+	fbcon_frontend_linux fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x"
+
+REQUIRED_USE="|| ( fbcon gtk gtk2 gtk3 )
+	amd64? ( abi_x86_32? ( javascript? ( duktape ) ) )
+	fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl
+		fbcon_frontend_vnc fbcon_frontend_x ) )
+	duktape? ( javascript )"
+
+RDEPEND=">=dev-libs/libnsutils-0.0.2[${MULTILIB_USEDEP}]
+	>=dev-libs/libutf8proc-1.1.6-r1[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:2[${MULTILIB_USEDEP}]
+	net-misc/curl[${MULTILIB_USEDEP}]
+	>=dev-libs/libcss-0.6.0[${MULTILIB_USEDEP}]
+	>=net-libs/libhubbub-0.3.1-r1[${MULTILIB_USEDEP}]
+	>=net-libs/libdom-0.3.0[${MULTILIB_USEDEP}]
+	bmp? ( >=media-libs/libnsbmp-0.1.2-r1[${MULTILIB_USEDEP}] )
+	fbcon? ( >=dev-libs/libnsfb-0.1.3-r1[${MULTILIB_USEDEP}]
+		truetype? ( media-fonts/dejavu
+			>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
+	)
+	gif? ( >=media-libs/libnsgif-0.1.2-r1[${MULTILIB_USEDEP}] )
+	gtk2? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
+	gtk3? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+	gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+	gstreamer? ( media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] )
+	javascript? ( >=dev-libs/nsgenbind-0.3[${MULTILIB_USEDEP}]
+		!duktape? ( dev-lang/spidermonkey:0= ) )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	mng? ( >=media-libs/libmng-1.0.10-r2[${MULTILIB_USEDEP}] )
+	pdf-writer? ( media-libs/libharu[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.2.51:0[${MULTILIB_USEDEP}] )
+	rosprite? ( >=media-libs/librosprite-0.1.2-r1[${MULTILIB_USEDEP}] )
+	svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1[${MULTILIB_USEDEP}] )
+		!svgtiny? ( gnome-base/librsvg:2[${MULTILIB_USEDEP}] ) )
+	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-libs/check[${MULTILIB_USEDEP}]
+	dev-perl/HTML-Parser"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.6-CFLAGS.patch
+	"${FILESDIR}"/${PN}-3.6-conditionally-include-image-headers.patch
+	"${FILESDIR}"/${PN}-3.6-pdf-writer.patch )
+DOCS=( fb.modes README Docs/USING-Framebuffer
+	Docs/ideas/{cache,css-engine,render-library}.txt )
+
+src_prepare() {
+	rm -r frontends/{amiga,atari,beos,cocoa,monkey,riscos,windows} || die
+
+	mv "${WORKDIR}"/netsurf-fb.modes-example fb.modes
+
+	netsurf_src_prepare
+}
+
+src_configure() {
+	netsurf_src_configure
+
+	netsurf_makeconf+=(
+		NETSURF_USE_BMP=$(usex bmp YES NO)
+		NETSURF_USE_GIF=$(usex gif YES NO)
+		NETSURF_USE_JPEG=$(usex jpeg YES NO)
+		NETSURF_USE_PNG=$(usex png YES NO)
+		NETSURF_USE_NSPSL=$(usex psl YES NO)
+		NETSURF_USE_MNG=$(usex mng YES NO)
+		NETSURF_USE_WEBP=$(usex webp YES NO)
+		NETSURF_USE_VIDEO=$(usex gstreamer YES NO)
+		NETSURF_USE_MOZJS=$(usex javascript $(usex duktape NO YES) NO)
+		NETSURF_USE_JS=NO
+		NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) NO)
+		NETSURF_USE_HARU_PDF=$(usex pdf-writer YES NO)
+		NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
+		NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
+		NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
+		PKG_CONFIG=$(tc-getPKG_CONFIG)
+		$(usex fbcon_frontend_able  NETSURF_FB_FRONTEND=able  "")
+		$(usex fbcon_frontend_linux NETSURF_FB_FRONTEND=linux "")
+		$(usex fbcon_frontend_sdl   NETSURF_FB_FRONTEND=sdl   "")
+		$(usex fbcon_frontend_vnc   NETSURF_FB_FRONTEND=vnc   "")
+		$(usex fbcon_frontend_x     NETSURF_FB_FRONTEND=x     "")
+		NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
+		NETSURF_FB_FONTPATH=${EROOT}usr/share/fonts/dejavu
+		TARGET=dummy
+	)
+}
+
+src_compile() {
+	if use fbcon ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
+		netsurf_src_compile
+	fi
+	if use gtk2 ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
+		netsurf_src_compile
+	fi
+	if use gtk3 || use gtk ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
+		netsurf_src_compile
+	fi
+}
+
+src_install() {
+	sed -e '1iexit;' \
+		-i "${WORKDIR}"/*/utils/git-testament.pl || die
+
+	if use fbcon ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
+		netsurf_src_install
+		elog "framebuffer binary has been installed as netsurf-fb"
+		make_desktop_entry "${EROOT}"usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
+		elog "In order to setup the framebuffer console, netsurf needs an /etc/fb.modes"
+		elog "You can use an example from /usr/share/doc/${PF}/fb.modes.* (bug 427092)."
+		elog "Please make /dev/input/mice readable to the account using netsurf-fb."
+		elog "Either use chmod a+r /dev/input/mice (security!!!) or use an group."
+	fi
+	if use gtk2 ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
+		netsurf_src_install
+		elog "netsurf gtk2 version has been installed as netsurf-gtk"
+		make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
+	fi
+	if use gtk3 || use gtk ; then
+		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
+		netsurf_src_install
+		elog "netsurf gtk3 version has been installed as netsurf-gtk3"
+		make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
+	fi
+
+	insinto /usr/share/pixmaps
+	doins frontends/gtk/res/netsurf.xpm
+}