# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1538671981 -10800
# Node ID 95d959e089ea9d203e80203e6ce77de269d1f240
# Parent  f09bb1f3629e16435873460b6559234f950733c5
Update netsurf, use combined sources, separated packages no more required

diff -r f09bb1f3629e -r 95d959e089ea libcss/receipt
--- a/libcss/receipt	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="libcss"
-COMMIT=""
-VERSION="0.7.0"
-CATEGORY="system-tools"
-SHORT_DESC="CSS parser and selection engine"
-MAINTAINER="erjo@slitaz.org"
-LICENSE="MIT"
-WEB_SITE="http://www.netsurf-browser.org/projects/libcss/"
-
-TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2"
-BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot"
-if [ -n "$COMMIT" ]; then
-	WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2"
-else
-	WGET_URL="$BASE_URL/release/$VERSION.tar.bz2"
-fi
-
-BUILD_DEPENDS="netsurf-buildsystem libwapcaplet-dev libparserutils-dev"
-SPLIT="libcss-dev"
-
-compile_rules() {
-	[ -z "$COMMIT" ] && cd $VERSION
-
-	sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|' Makefile
-	export CFLAGS="-Wno-error=unused-but-set-variable"
-
-	make \
-		PREFIX=/usr \
-		LIBDIR=lib \
-		INCLUDEDIR=include \
-		COMPONENT_TYPE=lib-shared \
-		install
-}
-
-genpkg_rules() {
-	case $PACKAGE in
-		libcss)
-			copy @std
-			DEPENDS="libparserutils libwapcaplet"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="libcss libparserutils-dev libwapcaplet-dev"
-			;;
-	esac
-	TAGS="netsurf"
-}
diff -r f09bb1f3629e -r 95d959e089ea libcss/stuff/patches/gcc7.patch
--- a/libcss/stuff/patches/gcc7.patch	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
---- a/0.7.0/src/parse/parse.c
-+++ b/0.7.0/src/parse/parse.c
-@@ -2098,8 +2098,8 @@
- 			;
- 
- 		state->substate = Go;
--		/* Fall through */
- 	}
-+		/* FALLTHROUGH */
- 	case Go:
- 		while (1) {
- 			char want;
-@@ -2296,8 +2296,8 @@
- 			;
- 
- 		state->substate = Go;
--		/* Fall through */
- 	}
-+		/* FALLTHROUGH */
- 	case Go:
- 		while (1) {
- 			char want;
---- a/0.7.0/src/select/arena_hash.h
-+++ b/0.7.0/src/select/arena_hash.h
-@@ -50,7 +50,9 @@
- 	/* Hash any left over bytes */
- 	switch (len) {
- 	case 3: h ^= data[2] << 16;
-+		/* FALLTHROUGH */
- 	case 2: h ^= data[1] << 8;
-+		/* FALLTHROUGH */
- 	case 1: h ^= data[0];
- 		h *= m;
- 	}
diff -r f09bb1f3629e -r 95d959e089ea libcss/stuff/patches/series
--- a/libcss/stuff/patches/series	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gcc7.patch
diff -r f09bb1f3629e -r 95d959e089ea libdom/receipt
--- a/libdom/receipt	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="libdom"
-COMMIT=""
-VERSION="0.3.3"
-CATEGORY="web"
-SHORT_DESC="Implementation of the W3C DOM"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="MIT"
-WEB_SITE="http://www.netsurf-browser.org/projects/libdom/"
-
-TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2"
-BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot"
-if [ -n "$COMMIT" ]; then
-	WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2"
-else
-	WGET_URL="$BASE_URL/release/$VERSION.tar.bz2"
-fi
-
-BUILD_DEPENDS="netsurf-buildsystem libparserutils-dev libwapcaplet-dev \
-libhubbub-dev expat-dev"
-SPLIT="libdom-dev"
-
-compile_rules() {
-	[ -z "$COMMIT" ] && cd $VERSION
-
-	sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|' Makefile
-	export CFLAGS='-Wno-error=unused-but-set-variable'
-
-	make \
-		PREFIX=/usr \
-		LIBDIR=lib \
-		INCLUDEDIR=include \
-		COMPONENT_TYPE=lib-shared \
-		install
-}
-
-genpkg_rules() {
-	case $PACKAGE in
-		libdom)
-			copy @std
-			DEPENDS="expat libhubbub libparserutils libwapcaplet"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="libdom expat-dev libhubbub-dev"
-			;;
-	esac
-	TAGS="netsurf"
-}
diff -r f09bb1f3629e -r 95d959e089ea libhubbub/receipt
--- a/libhubbub/receipt	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="libhubbub"
-COMMIT=""
-VERSION="0.3.5"
-CATEGORY="system-tools"
-SHORT_DESC="Hubbub is an HTML5 compliant parsing library, written in C"
-MAINTAINER="pankso@slitaz.org"
-LICENSE="MIT"
-WEB_SITE="http://www.netsurf-browser.org/projects/hubbub/"
-
-TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2"
-BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot"
-if [ -n "$COMMIT" ]; then
-	WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2"
-else
-	WGET_URL="$BASE_URL/release/$VERSION.tar.bz2"
-fi
-
-BUILD_DEPENDS="netsurf-buildsystem libparserutils-dev"
-SPLIT="libhubbub-dev"
-
-compile_rules() {
-	[ -z "$COMMIT" ] && cd $VERSION
-
-	make \
-		PREFIX=/usr \
-		LIBDIR=lib \
-		INCLUDEDIR=include \
-		COMPONENT_TYPE=lib-shared \
-		install
-}
-
-genpkg_rules() {
-	case $PACKAGE in
-		libhubbub)
-			copy @std
-			DEPENDS="libparserutils"
-			PROVIDE="hubbub" # old package name
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="libhubbub libparserutils-dev"
-			PROVIDE="hubbub-dev"
-			;;
-	esac
-	TAGS="netsurf"
-}
diff -r f09bb1f3629e -r 95d959e089ea libnsbmp/receipt
--- a/libnsbmp/receipt	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="libnsbmp"
-COMMIT=""
-VERSION="0.1.5"
-CATEGORY="libs"
-SHORT_DESC="Decoding library for BMP and ICO image file formats"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="MIT"
-WEB_SITE="http://www.netsurf-browser.org/projects/libnsbmp/"
-
-TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2"
-BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot"
-if [ -n "$COMMIT" ]; then
-	WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2"
-else
-	WGET_URL="$BASE_URL/release/$VERSION.tar.bz2"
-fi
-
-BUILD_DEPENDS="netsurf-buildsystem"
-SPLIT="libnsbmp-dev"
-
-compile_rules() {
-	[ -z "$COMMIT" ] && cd $VERSION
-
-	make \
-		PREFIX=/usr \
-		LIBDIR=lib \
-		INCLUDEDIR=include \
-		COMPONENT_TYPE=lib-shared \
-		install
-}
-
-genpkg_rules() {
-	case $PACKAGE in
-		libnsbmp) copy @std;;
-		*-dev)    copy @dev;;
-	esac
-	TAGS="netsurf"
-}
diff -r f09bb1f3629e -r 95d959e089ea libnsgif/receipt
--- a/libnsgif/receipt	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="libnsgif"
-COMMIT=""
-VERSION="0.2.1"
-CATEGORY="libs"
-SHORT_DESC="Decoding library for the GIF image file format"
-MAINTAINER="pankso@slitaz.org"
-LICENSE="MIT"
-WEB_SITE="http://www.netsurf-browser.org/projects/libnsgif/"
-
-TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2"
-BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot"
-if [ -n "$COMMIT" ]; then
-	WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2"
-else
-	WGET_URL="$BASE_URL/release/$VERSION.tar.bz2"
-fi
-
-BUILD_DEPENDS="netsurf-buildsystem"
-SPLIT="libnsgif-dev"
-
-compile_rules() {
-	[ -z "$COMMIT" ] && cd $VERSION
-
-	export CFLAGS="$CFLAGS -fno-strict-aliasing"
-
-	make \
-		PREFIX=/usr \
-		LIBDIR=lib \
-		INCLUDEDIR=include \
-		COMPONENT_TYPE=lib-shared \
-		install
-}
-
-genpkg_rules() {
-	case $PACKAGE in
-		libnsgif) copy @std;;
-		*-dev)    copy @dev;;
-	esac
-	TAGS="netsurf"
-}
diff -r f09bb1f3629e -r 95d959e089ea libnslayout/receipt
--- a/libnslayout/receipt	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="libnslayout"
-COMMIT="b77ae8ab7d1ce435d8afd3c77613c5a56c477025"
-VERSION="0-170617"
-CATEGORY="libs"
-SHORT_DESC="NetSurf Layout Engine"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="MIT"
-WEB_SITE="http://source.netsurf-browser.org/libnslayout.git/"
-
-TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2"
-BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot"
-if [ -n "$COMMIT" ]; then
-	WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2"
-else
-	WGET_URL="$BASE_URL/release/$VERSION.tar.bz2"
-fi
-
-BUILD_DEPENDS="netsurf-buildsystem libcss-dev libdom-dev libwapcaplet-dev \
-libparserutils-dev"
-SPLIT="libnslayout-dev"
-
-compile_rules() {
-	[ -z "$COMMIT" ] && cd $VERSION
-
-	make \
-		PREFIX=/usr \
-		LIBDIR=lib \
-		INCLUDEDIR=include \
-		COMPONENT_TYPE=lib-shared \
-		install
-}
-
-genpkg_rules() {
-	case $PACKAGE in
-		libnslayout)
-			copy @std
-			DEPENDS="expat libcss libdom libhubbub libparserutils libwapcaplet"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="libnslayout libcss-dev libdom-dev libparserutils-dev \
-			libwapcaplet-dev"
-			;;
-	esac
-	TAGS="netsurf"
-}
diff -r f09bb1f3629e -r 95d959e089ea libnslog/receipt
--- a/libnslog/receipt	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="libnslog"
-COMMIT=""
-VERSION="0.1.0"
-CATEGORY="libs"
-SHORT_DESC="NetSurf Parametric Logging Library"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="MIT"
-WEB_SITE="http://source.netsurf-browser.org/libnslog.git/"
-
-TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2"
-BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot"
-if [ -n "$COMMIT" ]; then
-	WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2"
-else
-	WGET_URL="$BASE_URL/release/$VERSION.tar.bz2"
-fi
-
-BUILD_DEPENDS="netsurf-buildsystem"
-SPLIT="libnslog-dev"
-
-compile_rules() {
-	[ -z "$COMMIT" ] && cd $VERSION
-
-	make \
-		PREFIX=/usr \
-		LIBDIR=lib \
-		INCLUDEDIR=include \
-		COMPONENT_TYPE=lib-shared \
-		install
-}
-
-genpkg_rules() {
-	case $PACKAGE in
-		libnslog) copy @std;;
-		*-dev)    copy @dev;;
-	esac
-	TAGS="netsurf"
-}
diff -r f09bb1f3629e -r 95d959e089ea libnspsl/receipt
--- a/libnspsl/receipt	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="libnspsl"
-COMMIT=""
-VERSION="0.1.2"
-CATEGORY="libs"
-SHORT_DESC="NetSurf public suffix list handling"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="MIT"
-WEB_SITE="http://source.netsurf-browser.org/libnspsl.git/"
-
-TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2"
-BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot"
-if [ -n "$COMMIT" ]; then
-	WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2"
-else
-	WGET_URL="$BASE_URL/release/$VERSION.tar.bz2"
-fi
-
-BUILD_DEPENDS="netsurf-buildsystem"
-SPLIT="libnspsl-dev"
-
-compile_rules() {
-	[ -z "$COMMIT" ] && cd $VERSION
-
-	make \
-		PREFIX=/usr \
-		LIBDIR=lib \
-		INCLUDEDIR=include \
-		COMPONENT_TYPE=lib-shared \
-		install
-}
-
-genpkg_rules() {
-	case $PACKAGE in
-		libnspsl) copy @std;;
-		*-dev)    copy @dev;;
-	esac
-	TAGS="netsurf"
-}
diff -r f09bb1f3629e -r 95d959e089ea libnsutils/receipt
--- a/libnsutils/receipt	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="libnsutils"
-COMMIT=""
-VERSION="0.0.3"
-CATEGORY="utilities"
-SHORT_DESC="NetSurf Utilities"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="MIT"
-WEB_SITE="http://source.netsurf-browser.org/libnsutils.git/"
-
-TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2"
-BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot"
-if [ -n "$COMMIT" ]; then
-	WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2"
-else
-	WGET_URL="$BASE_URL/release/$VERSION.tar.bz2"
-fi
-
-BUILD_DEPENDS="netsurf-buildsystem"
-SPLIT="libnsutils-dev"
-
-compile_rules() {
-	[ -z "$COMMIT" ] && cd $VERSION
-
-	make \
-		PREFIX=/usr \
-		LIBDIR=lib \
-		INCLUDEDIR=include \
-		COMPONENT_TYPE=lib-shared \
-		install
-}
-
-genpkg_rules() {
-	case $PACKAGE in
-		libnsutils) copy @std;;
-		*-dev)      copy @dev;;
-	esac
-	TAGS="netsurf"
-}
diff -r f09bb1f3629e -r 95d959e089ea libparserutils/receipt
--- a/libparserutils/receipt	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="libparserutils"
-COMMIT=""
-VERSION="0.2.4"
-CATEGORY="system-tools"
-SHORT_DESC="Library for building efficient parsers"
-MAINTAINER="pankso@slitaz.org"
-LICENSE="MIT"
-WEB_SITE="http://www.netsurf-browser.org/projects/libparserutils/"
-
-TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2"
-BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot"
-if [ -n "$COMMIT" ]; then
-	WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2"
-else
-	WGET_URL="$BASE_URL/release/$VERSION.tar.bz2"
-fi
-
-BUILD_DEPENDS="netsurf-buildsystem"
-SPLIT="libparserutils-dev"
-
-compile_rules() {
-	[ -z "$COMMIT" ] && cd $VERSION
-
-	sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|' Makefile
-	echo 'CFLAGS += -DWITH_ICONV_FILTER' > Makefile.config.override
-
-	make \
-		PREFIX=/usr \
-		LIBDIR=lib \
-		INCLUDEDIR=include \
-		COMPONENT_TYPE=lib-shared \
-		install
-}
-
-genpkg_rules() {
-	case $PACKAGE in
-		libparserutils) copy @std;;
-		*-dev)          copy @dev;;
-	esac
-	TAGS="netsurf"
-}
diff -r f09bb1f3629e -r 95d959e089ea libsvgtiny/receipt
--- a/libsvgtiny/receipt	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="libsvgtiny"
-COMMIT=""
-VERSION="0.1.6"
-CATEGORY="libs"
-SHORT_DESC="SVG Tiny library"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="MIT"
-WEB_SITE="http://www.netsurf-browser.org/projects/libsvgtiny/"
-
-TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2"
-BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot"
-if [ -n "$COMMIT" ]; then
-	WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2"
-else
-	WGET_URL="$BASE_URL/release/$VERSION.tar.bz2"
-fi
-
-BUILD_DEPENDS="netsurf-buildsystem libdom-dev libwapcaplet-dev gperf"
-SPLIT="libsvgtiny-dev"
-
-compile_rules() {
-	[ -z "$COMMIT" ] && cd $VERSION
-
-	sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|' Makefile
-	export CFLAGS="-Wno-error=unused-but-set-variable"
-
-	make \
-		PREFIX=/usr \
-		LIBDIR=lib \
-		INCLUDEDIR=include \
-		COMPONENT_TYPE=lib-shared \
-		install
-}
-
-genpkg_rules() {
-	case $PACKAGE in
-		libsvgtiny)
-			copy @std
-			DEPENDS="expat libdom libhubbub libparserutils libwapcaplet"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="libsvgtiny libdom-dev"
-			;;
-	esac
-	TAGS="netsurf"
-}
diff -r f09bb1f3629e -r 95d959e089ea libutf8proc/receipt
--- a/libutf8proc/receipt	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="libutf8proc"
-COMMIT="770e329cceaf0620c7b482589a9b17ed1d19c16d"
-VERSION="1.3.1-2-161123"
-CATEGORY="libs"
-SHORT_DESC="C library for processing UTF-8 encoded Unicode strings"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="MIT"
-WEB_SITE="http://git.netsurf-browser.org/libutf8proc.git/"
-
-TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2"
-BASE_URL="http://git.netsurf-browser.org/$PACKAGE.git/snapshot"
-if [ -n "$COMMIT" ]; then
-	WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2"
-else
-	WGET_URL="$BASE_URL/release/$VERSION.tar.bz2"
-fi
-
-BUILD_DEPENDS="netsurf-buildsystem"
-SPLIT="libutf8proc-dev"
-
-compile_rules() {
-	[ -z "$COMMIT" ] && cd $VERSION
-
-	make \
-		PREFIX=/usr \
-		LIBDIR=lib \
-		INCLUDEDIR=include \
-		COMPONENT_TYPE=lib-shared \
-		install
-}
-
-genpkg_rules() {
-	case $PACKAGE in
-		libutf8proc) copy @std;;
-		*-dev)       copy @dev;;
-	esac
-}
diff -r f09bb1f3629e -r 95d959e089ea libwapcaplet/receipt
--- a/libwapcaplet/receipt	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="libwapcaplet"
-COMMIT=""
-VERSION="0.4.1"
-CATEGORY="system-tools"
-SHORT_DESC="String internment library with rapid string comparison"
-MAINTAINER="erjo@slitaz.org"
-LICENSE="MIT"
-WEB_SITE="http://www.netsurf-browser.org/projects/libwapcaplet/"
-
-TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2"
-BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot"
-if [ -n "$COMMIT" ]; then
-	WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2"
-else
-	WGET_URL="$BASE_URL/release/$VERSION.tar.bz2"
-fi
-
-BUILD_DEPENDS="netsurf-buildsystem"
-SPLIT="libwapcaplet-dev"
-
-compile_rules() {
-	[ -z "$COMMIT" ] && cd $VERSION
-
-	sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|' Makefile
-
-	make \
-		PREFIX=/usr \
-		LIBDIR=lib \
-		INCLUDEDIR=include \
-		COMPONENT_TYPE=lib-shared \
-		install
-}
-
-genpkg_rules() {
-	case $PACKAGE in
-		libwapcaplet) copy @std;;
-		*-dev)        copy @dev;;
-	esac
-	TAGS="netsurf"
-}
diff -r f09bb1f3629e -r 95d959e089ea netsurf-buildsystem/receipt
--- a/netsurf-buildsystem/receipt	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="netsurf-buildsystem"
-COMMIT=""
-VERSION="1.6"
-CATEGORY="development"
-SHORT_DESC="The Netsurf buildsystem"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="MIT"
-WEB_SITE="http://source.netsurf-browser.org/buildsystem.git/"
-
-TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2"
-BASE_URL="http://source.netsurf-browser.org/buildsystem.git/snapshot"
-if [ -n "$COMMIT" ]; then
-	WGET_URL="$BASE_URL/buildsystem-$COMMIT.tar.bz2"
-else
-	WGET_URL="$BASE_URL/release/$VERSION.tar.bz2"
-fi
-
-compile_rules() {
-	[ -z "$COMMIT" ] && cd $VERSION
-
-	sed -i 's|-Werror||' Makefile
-
-	make \
-		PREFIX=/usr \
-		install
-}
-
-genpkg_rules() {
-	copy @std @dev
-	DEPENDS="perl"
-	TAGS="netsurf"
-}
diff -r f09bb1f3629e -r 95d959e089ea netsurf/.icon.png
Binary file netsurf/.icon.png has changed
diff -r f09bb1f3629e -r 95d959e089ea netsurf/receipt
--- a/netsurf/receipt	Thu Oct 04 16:01:47 2018 +0300
+++ b/netsurf/receipt	Thu Oct 04 19:53:01 2018 +0300
@@ -1,73 +1,62 @@
 # SliTaz package receipt v2.
 
 PACKAGE="netsurf"
-COMMIT=""
-VERSION="3.7"
+VERSION="3.8"
 CATEGORY="network"
 SHORT_DESC="Lightweight and fast web browser"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://www.netsurf-browser.org/"
 
-TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2"
-BASE_URL="http://source.netsurf-browser.org/$PACKAGE.git/snapshot"
-if [ -n "$COMMIT" ]; then
-	WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2"
-else
-	WGET_URL="$BASE_URL/release/$VERSION.tar.bz2"
-fi
+TARBALL="$PACKAGE-all-$VERSION.tar.gz"
+WGET_URL="http://download.netsurf-browser.org/netsurf/releases/source-full/$TARBALL"
 
-BUILD_DEPENDS="libjpeg-turbo-dev libharu-dev duktape-dev libcss-dev libdom-dev \
-libnsutils-dev libutf8proc-dev curl-dev openssl-dev libpng16-dev libnsbmp-dev \
-libnsgif-dev libsvgtiny-dev libnspsl-dev libnslog-dev gstreamer0-dev gtk+-dev \
-check-dev perl-html-parser nsgenbind" # librsvg-dev
+BUILD_DEPENDS="bison flex perl expat-dev gperf libjpeg-turbo-dev curl-dev \
+openssl-dev libpng16-dev librsvg-dev gtk+-dev check-dev perl-html-parser"
+# libharu-dev gstreamer0-dev
 
 compile_rules() {
-	[ -z "$COMMIT" ] && cd $VERSION
+	cat > netsurf/Makefile.config <<EOT
+# Enable NetSurf's use of gstreamer for displaying videos.
+# Currently disabled: not maintained and produce build errors.
+# override NETSURF_USE_VIDEO := YES
 
-	# Enable NetSurf's use of gstreamer for displaying videos
-#	echo 'override NETSURF_USE_VIDEO := YES' > Makefile.config
-	# Enable NetSurf's use of libharu for PDF export and GTK printing support.
-#	echo 'override NETSURF_USE_HARU_PDF := YES' >> Makefile.config
-	# Template used for constructing the User Agent: string.
-	# 1,2: major & minor version numbers; 3 `uname -s`; 4 `uname -m`
-	echo 'override NETSURF_UA_FORMAT_STRING := "NetSurf/%d.%d (SliTaz GNU/%s %s)"' >> Makefile.config
-	# Default home page, if one is not defined by the user.
-	echo 'override NETSURF_HOMEPAGE := "file:///usr/share/webhome/index.html"' >> Makefile.config
+# Enable NetSurf's use of libharu for PDF export and GTK printing support.
+# Currently disabled: not maintained and produce build errors.
+# override NETSURF_USE_HARU_PDF := YES
 
+# Default home page, if one is not defined by the user.
+override NETSURF_HOMEPAGE := "file:///usr/share/webhome/index.html"
+EOT
 
-	# fix installing
-	sed -i '/install \$(EXETARGET)/ s|^|#|' frontends/gtk/Makefile
+	sed -i 's|-Werror||' libsvgtiny/Makefile
 
 	make \
 		PREFIX=/usr \
-		LIBDIR=lib \
-		INCLUDEDIR=include \
 		TARGET=gtk \
-		NETSURF_GTK_MAJOR=2 \
 		install || return 1
-	# FIXME: it is job for `make`
-	cp -af nsgtk $install/usr/bin/netsurf-gtk
 
 	# desktop shortcut
-	mkdir -p $install/usr/share/applications
-	sed 's|netsurf.png|netsurf|' \
-		< frontends/gtk/res/netsurf-gtk.desktop \
-		> $install/usr/share/applications/netsurf-gtk.desktop
+	mkdir -p $install/usr/share/applications/
+	sed 's|netsurf.png|netsurf|; s|netsurf-gtk|netsurf|' \
+		< netsurf/frontends/gtk/res/netsurf-gtk.desktop \
+		> $install/usr/share/applications/netsurf.desktop
+
 	# desktop icons
-	mkdir -p $install/usr/share/icons
-	cp -r $stuff/hicolor $install/usr/share/icons
+	mkdir -p $install/usr/share/icons/
+	cp -r $stuff/hicolor/ $install/usr/share/icons/
 
-	chown -R root:root $install
+	# wrapper
+	install -Dm755 $stuff/netsurf $install/usr/bin/netsurf
+
+	chown -R root:root $install # fix 107:nogroop somewhere
 }
 
 genpkg_rules() {
 	copy @std
 	# Remove files to save some space
 	rm -rf $fs/usr/share/netsurf/*.xpm
-	DEPENDS="atk cairo expat fontconfig freetype gdk-pixbuf glib gstreamer0 \
-	gtk+ openssl libcss libcurl libdom libhubbub libjpeg-turbo libnsbmp \
-	libnsgif libnslog libnspsl libnsutils libparserutils libpng16 \
-	libsvgtiny libutf8proc libwapcaplet libxml2 pango zlib"
-	TAGS="web-browser netsurf"
+	DEPENDS="cairo expat gdk-pixbuf glib gtk+ libcurl libjpeg-turbo libpng16 \
+	librsvg openssl pango zlib"
+	TAGS="web-browser"
 }
diff -r f09bb1f3629e -r 95d959e089ea netsurf/stuff/netsurf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netsurf/stuff/netsurf	Thu Oct 04 19:53:01 2018 +0300
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -d "/usr/share/netsurf/${LANG:0:2}" ] && exec netsurf-gtk "$@"
+
+LANG=en_US.UTF-8 exec netsurf-gtk "$@"
diff -r f09bb1f3629e -r 95d959e089ea netsurf/stuff/oldstuff/Makefile.config
--- a/netsurf/stuff/oldstuff/Makefile.config	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-#
-# NetSurf default build configuration fro SliTaz
-#
-
-NETSURF_USE_BMP := NO
-NETSURF_UA_FORMAT_STRING := "NetSurf/%d.%d (%s; %s) SliTaz"
-NETSURF_HOMEPAGE := "file:///usr/share/webhome/netsurf.html"
-PREFIX := /usr
-
diff -r f09bb1f3629e -r 95d959e089ea netsurf/stuff/oldstuff/Makefile.defaults
--- a/netsurf/stuff/oldstuff/Makefile.defaults	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
-#
-# NetSurf default build configuration
-#
-# Some of these options support an 'AUTO' option, as well as YES and NO.
-# When an option is set to AUTO, the Makefile will attempt to detect if that
-# feature is available, enabling it if possible.
-#
-# Options marked "highly recommended" have a severe impact on NetSurf's
-# use as a web browser and should be set to YES unless there is a particularly
-# good reason not to.
-#
-# This file should be treated as INVIOLATE and only altered to alter
-# the defaults by a core developer. If you wish to configure the build
-# of NetSurf then instead please create a file called Makefile.config
-# and simply override the statements you require in that.  Remember
-# that Makefile.config cannot override the TARGET. That must be set on
-# the commandline. i.e. 'make TARGET=framebuffer' However
-# Makefile.config can use the TARGET variable to control what to set
-# the configuration options to.
-#
-
-# ----------------------------------------------------------------------------
-# Options relating to all versions of NetSurf
-# ----------------------------------------------------------------------------
-
-# Enable NetSurf's use of libnsbmp for displaying BMPs and ICOs
-# Valid options: YES, NO
-NETSURF_USE_BMP := NO
-
-# Enable NetSurf's use of libnsgif for displaying GIFs
-# Valid options: YES, NO				  (highly recommended)
-NETSURF_USE_GIF := YES
-
-# Enable NetSurf's use of libjpeg for displaying JPEGs
-# Valid options: YES, NO				  (highly recommended)
-NETSURF_USE_JPEG := YES
-
-# Enable NetSurf's use of libpng for displaying PNGs.  If MNG and PNG
-# are both enabled then NetSurf will choose libpng for PNGs, leaving
-# MNGs and JNGs to libmng.
-# Valid options: YES, NO	  (at least one of PNG/MNG highly recommended)
-NETSURF_USE_PNG := YES
-
-# Enable NetSurf's use of libmng for displaying MNGs, JNGs and PNGs
-# Valid options: YES, NO	  (at least one of PNG/MNG highly recommended)
-NETSURF_USE_MNG := NO
-
-# Enable NetSurf's use of libharu for PDF export and GTK printing support.
-# There is no auto-detection available for this, as it does not have a
-# pkg-config file.
-# Valid options: YES, NO
-NETSURF_USE_HARU_PDF := NO
-
-# Enable stripping the NetSurf binary
-# Valid options: YES, NO
-NETSURF_STRIP_BINARY := YES
-
-# Template used for constructing the User Agent: string.  The first two
-# replacements are major/minor version, second two are OS and architecture.
-# Please don't be tempted to mention Mozilla here!  Let's let that lie die.
-NETSURF_UA_FORMAT_STRING := "NetSurf/%d.%d (%s; %s) SliTaz"
-
-# Default home page, if one is not defined by the user.  Note that this
-# option does not apply to the RISC OS version, as it has its own local
-# home page, and it can be changed by editing the end of gui_init2() in
-# riscos/gui.c
-NETSURF_HOMEPAGE := "file:///usr/share/webhome/netsurf.html"
-
-# Force using glibc internal iconv implementation instead of external libiconv
-# Valid options: YES, NO
-NETSURF_USE_LIBICONV_PLUG := YES
-
-# Initial CFLAGS. Optimisation level etc. tend to be target specific.
-CFLAGS := 
-
-# Default installation/execution prefix
-PREFIX := /usr
-
-# ----------------------------------------------------------------------------
-# RISC OS-specific options
-# ----------------------------------------------------------------------------
-ifeq ($(TARGET),riscos)
-
-  # Enable NetSurf's use of libsvgtiny for displaying SVGs
-  # Valid options: YES, NO
-  NETSURF_USE_NSSVG := YES
-
-  # Enable NetSurf's use of pencil for Drawfile export
-  # Valid options: YES, NO
-  NETSURF_USE_DRAW := YES
-
-  # Enable NetSurf's support for displaying RISC OS Sprites
-  # Valid options: YES, NO
-  NETSURF_USE_SPRITE := YES
-
-  # Enable NetSurf's use of AWRender for displaying ArtWorks files
-  # Valid options: YES, NO
-  NETSURF_USE_ARTWORKS := YES
-
-  # Enable NetSurf's support for the Acorn plugin protocol
-  # Valid options: YES, NO
-  NETSURF_USE_PLUGINS := NO
-
-  # Optimisation levels
-  CFLAGS += -O2 -Wuninitialized
-
-endif
-
-# ----------------------------------------------------------------------------
-# GTK-specific options
-# ----------------------------------------------------------------------------
-ifeq ($(TARGET),gtk)
-
-  # Where to search for NetSurf's resources after looking in ~/.netsurf and
-  # $NETSURFRES.  It must have a trailing /
-  NETSURF_GTK_RESOURCES := $(PREFIX)/share/netsurf/
-
-  # Where to install the netsurf binary
-  NETSURF_GTK_BIN := $(PREFIX)/bin/
-
-  # Enable NetSurf's use of librsvg in conjunction with Cairo to display SVGs
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_RSVG := AUTO
-
-  # Enable NetSurf's use of librosprite for displaying RISC OS Sprites
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_ROSPRITE := AUTO
-
-  # Configuration overrides for Mac OS X
-  ifeq ($(HOST),macosx)
-    NETSURF_USE_LIBICONV_PLUG := NO
-    NETSURF_USE_HARU_PDF := NO
-  endif
-
-  # Optimisation levels
-  CFLAGS += -O2 -Wuninitialized
-
-endif
-
-# ----------------------------------------------------------------------------
-# BeOS-specific options
-# ----------------------------------------------------------------------------
-ifeq ($(TARGET),beos)
-
-
-  # Where to install the netsurf binary
-  NETSURF_BEOS_BIN := /boot/apps/netsurf/
-
-  # TODO:HAIKU -- not sure if ~/.netsurf applies in beos
-  # Where to search for NetSurf's resources after looking in ~/.netsurf and
-  # $NETSURFRES.  It must have a trailing /
-  NETSURF_BEOS_RESOURCES := /boot/apps/netsurf/res/
-
-  # Enable NetSurf's use of librosprite for displaying RISC OS Sprites
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_ROSPRITE := AUTO
-
-  # Enable NetSurf's use of libharu for PDF export.
-  # Valid options: YES, NO
-  NETSURF_USE_HARU_PDF := NO
-
-  # Force using glibc internal iconv implementation instead of external libiconv
-  # Valid options: YES, NO
-  NETSURF_USE_LIBICONV_PLUG := NO
-
-  # Optimisation levels
-  CFLAGS += -O2 -Wuninitialized
-
-endif
-
-# ----------------------------------------------------------------------------
-# Amiga-specific options
-# ----------------------------------------------------------------------------
-ifeq ($(TARGET),amiga)
-
-  # Enable NetSurf's use of librosprite for displaying RISC OS Sprites
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_ROSPRITE := YES
-
-  # Enable NetSurf's use of libsvgtiny for displaying SVGs
-  # (NB: Requires NETSURF_AMIGA_USE_CAIRO)
-  # Valid options: YES, NO
-  NETSURF_USE_NSSVG := NO
-
-  # Enable NetSurf's use of libcairo for some plotter functions
-  # This will also link NetSurf with shared objects, and
-  # requires AmigaOS 4.1 or higher to run the resulting executable
-  # Valid options: YES, NO
-  NETSURF_AMIGA_USE_CAIRO := NO
-
-  # Optimisation levels
-  CFLAGS += -O2 -Wuninitialized
-
-endif
-
-# ----------------------------------------------------------------------------
-# Framebuffer-target-specific options
-# ----------------------------------------------------------------------------
-ifeq ($(TARGET),framebuffer)
-  # Optimisation levels
-  CFLAGS += -O2 -Wuninitialized
-
-  # Framebuffer frontend.
-  # Valid values are: linux, sdl, vnc, able
-  NETSURF_FB_FRONTEND := linux
-
-  # Use libharu to enable PDF export and GTK printing support.
-  # Valid options: YES, NO
-  NETSURF_USE_HARU_PDF := NO
-
-  # Library to use for font plotting 
-  # Valid options: internal, freetype
-  NETSURF_FB_FONTLIB := internal
-
-  # Framebuffer frontends may have differing root paths for resources
-  # As such, these specify the resource path and config path.
-  NETSURF_FB_RESPATH_linux := $(PREFIX)/share/netsurf/
-  NETSURF_FB_RESPATH_able := (tftpboot)/
-  NETSURF_FB_RESPATH_dummy := ./
-  NETSURF_FB_RESPATH_sdl := $(PREFIX)/share/netsurf/
-  NETSURF_FB_RESPATH_vnc := $(PREFIX)/share/netsurf/
-
-  NETSURF_FRAMEBUFFER_RESOURCES = $(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND))
-  NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/
-
-endif
-
-# Include any local configuration
--include Makefile.config
-
diff -r f09bb1f3629e -r 95d959e089ea netsurf/stuff/oldstuff/netsurf.desktop
--- a/netsurf/stuff/oldstuff/netsurf.desktop	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=NetSurf Web Browser
-Name[de]=Netznavigator NetSurf
-Name[fr]=Navigateur Web NetSurf
-Name[pt]=Navegador Web NetSurf
-Name[pt_BR]=Navegador Web NetSurf
-Type=Application
-Categories=Network;
-MimeType=text/html;application/xhtml+xml;
-Exec=netsurf %u
-Icon=netsurf
diff -r f09bb1f3629e -r 95d959e089ea netsurf/stuff/oldstuff/netsurf.png
Binary file netsurf/stuff/oldstuff/netsurf.png has changed
diff -r f09bb1f3629e -r 95d959e089ea netsurf/stuff/oldstuff/webhome/netsurf.html
--- a/netsurf/stuff/oldstuff/webhome/netsurf.html	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-    <title>SliTaz - Web Homepage</title>
-    <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-    <meta name="author" content="Christophe Lincoln"/>
-    <link rel="shortcut icon" href="favicon.ico" />
-    <link rel="stylesheet" type="text/css" href="style.css" />
-</head>
-<body>
-
-<!-- Header -->
-<div id="header">
-	<div id="logo"></div>
-	<div id="network">
-		<a href="http://www.slitaz.org/">Website</a>
-		<a href="http://scn.slitaz.org/">Community</a>
-		<a href="http://doc.slitaz.org/">Doc</a>
-		<a href="http://forum.slitaz.org/">Forum</a>
-		<a href="http://labs.slitaz.org/issues">Bugs</a>
-		<a href="http://hg.slitaz.org/">Hg</a>
-	</div>
-	<h1>SliTaz Web Home</h1>
-</div>
-
-<div id="block"></div>
-
-<!-- Content -->
-<div id="content">
-
-<!-- Custom style for netsurf -->
-<style type="text/css">
-#search { text-align: center; margin: 40px 0px; }
-input[type=submit] {
-	border: 1px solid #b64b22;
-	background-color: #b64b22;
-	color: white;
-	font-weight: bold;
-	cursor: pointer;
-	padding: 3px 10px;
-	font-size: 15px;
-	margin-left: -5px;
-}
-input[type=text] {
-	border: 1px solid #333333;
-	padding: 4px;
-	height: 15px;
-	width: 68%;
-}
-</style>
-
-<div id="search">
-	<form method="get" action="http://www.google.com/search">
-		<p>
-			<input type="text" name="q" size="55" maxlength="255" />
-			<input type="submit" value="Google" style="height: 25px;" />
-		</p>
-	</form>
-</div>
-
-<!-- SliTaz Social -->
-<div id="social">
-	SliTaz @
-	<a href="http://twitter.com/slitaz">Twitter</a>
-	<a href="http://www.facebook.com/slitaz">Facebook</a>
-	<a href="http://distrowatch.com/slitaz">Distrowatch</a>
-	<a href="http://en.wikipedia.org/wiki/SliTaz">Wikipedia</a>
-	<a href="http://flattr.com/profile/slitaz">Flattr</a>
-</div>
-
-<!-- End of content with round corner -->
-</div>
-
-</body>
-</html>
diff -r f09bb1f3629e -r 95d959e089ea netsurf/stuff/oldstuff/webhome/style.css
--- a/netsurf/stuff/oldstuff/webhome/style.css	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/* CSS style for SliTaz GNU/Linux generic xHTML files. */
-
-html { min-height: 102%; }
-
-body {
-	background: #ffffff;
-	color: black;
-	font: 13px sans-serif, vernada, arial;
-	margin: 0;
-	min-width: 640px;
-}
-
-a { text-decoration: underline; color: #215090; }
-a:hover { text-decoration: none; color: blue; }
-img { border: 0pt none; vertical-align: middle; }
-h2 { color: #444; }
-h3 { color: #666; font-size: 140%; }
-
-#header { 
-	height: 40px; 
-	background: #351a0a;
-}
-
-#header h1 {
-	margin: 0;
-	padding: 8px 0 0 8px;
-	width: 250px;
-	color: white;
-	font-size: 20px;
-	font-style: italic;
-}
-
-#header h1 a { 
-	color: white; 
-	text-decoration: none;
-	font-size: 20px;
-	font-style: italic;
-}
-
-#header h1 a:hover, #network a:hover { 
-	color: #d66018;
-}
-
-#network { 
-	float: right; 
-	padding: 12px 5px 0; 
-	font-size: 12px;
-}
-
-#network a { padding: 0 6px; }
-
-#network a { 
-	color: #fff; 
-	font-weight: bold;
-	text-decoration: none;
-}
-
-#block { 
-	height: 8px; 
-	background: #d66018; 
-	padding: 0;
-	border-bottom: 1px solid #f5f5f5;
-}
-
-#content {
-	padding: 30px 80px;
-	text-align: justify;
-}
-
-#social { text-align: center; color: #666; }
-#social a { color: #666; padding: 0 2px; }
-
-#footer {
-	text-align: center;
-	border-top: 1px solid #ddd;
-	padding: 40px;
-	color: #666;
-}
-
-#footer a { color: #666; padding: 0 2px; }
diff -r f09bb1f3629e -r 95d959e089ea netsurf/stuff/patches/headers.patch
--- a/netsurf/stuff/patches/headers.patch	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-desktop/font.h -> desktop/gui_layout.h
-http://git.netsurf-browser.org/netsurf.git/commit/?id=974a4a21e16a2da85a66aae9b80eeca15ca26dd6
-
-desktop/gui_layout.h -> include/netsurf/layout.h
-http://git.netsurf-browser.org/netsurf.git/commit/?id=9ce71876ce500e242e2384c21abb38a8f431138b
-
-desktop/gui_misc.h -> include/netsurf/misc.h
-http://git.netsurf-browser.org/netsurf.git/commit/?id=fe7eb85614244d5e0659c88431fbd9726fa33051
-
---- a/desktop/font_haru.c
-+++ b/desktop/font_haru.c
-@@ -38,7 +38,7 @@
- 
- #include "utils/nsoption.h"
- #include "desktop/font_haru.h"
--#include "desktop/font.h"
-+#include "netsurf/layout.h"
- #include "utils/log.h"
- 
- 
---- a/desktop/font_haru.h
-+++ b/desktop/font_haru.h
-@@ -27,7 +27,7 @@
- #include <hpdf.h>
- 
- #include "desktop/plot_style.h"
--#include "desktop/font.h"
-+#include "netsurf/layout.h"
- 
- bool haru_nsfont_apply_style(const plot_font_style_t *fstyle,
- 			      	HPDF_Doc doc, HPDF_Page page,
---- a/desktop/save_pdf.c
-+++ b/desktop/save_pdf.c
-@@ -60,7 +60,7 @@
- #include "utils/useragent.h"
- #include "content/hlcache.h"
- #include "utils/nsoption.h"
--#include "desktop/gui_misc.h"
-+#include "netsurf/misc.h"
- #include "desktop/gui_internal.h"
- #include "netsurf/bitmap.h"
- 
diff -r f09bb1f3629e -r 95d959e089ea netsurf/stuff/patches/netsurf-3.6-CFLAGS.patch
--- a/netsurf/stuff/patches/netsurf-3.6-CFLAGS.patch	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
---- a/Makefile.defaults
-+++ b/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
- 
---- a/frontends/framebuffer/Makefile
-+++ b/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 \
---- a/frontends/framebuffer/Makefile.defaults
-+++ b/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,
---- a/frontends/gtk/Makefile
-+++ b/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 \
---- a/frontends/gtk/Makefile.defaults
-+++ b/frontends/gtk/Makefile.defaults
-@@ -39,4 +39,4 @@
- NETSURF_GTK_MAJOR ?= 2
- 
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS += 
---- a/test/Makefile
-+++ b/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 -r f09bb1f3629e -r 95d959e089ea netsurf/stuff/patches/netsurf-3.6-conditionally-include-image-headers.patch
--- a/netsurf/stuff/patches/netsurf-3.6-conditionally-include-image-headers.patch	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
---- a/content/handlers/image/image.c
-+++ b/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 -r f09bb1f3629e -r 95d959e089ea netsurf/stuff/patches/netsurf-3.6-gstreamer.patch
--- a/netsurf/stuff/patches/netsurf-3.6-gstreamer.patch	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
---- a/frontends/gtk/Makefile
-+++ b/frontends/gtk/Makefile
-@@ -16,7 +16,6 @@
- 
- # GTK and GLIB flags to disable depricated usage
- GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
--		-DG_DISABLE_DEPRECATED \
- 	       	-DGTK_DISABLE_SINGLE_INCLUDES \
- 		-DGTK_MULTIHEAD_SAFE \
- 		-DPANGO_DISABLE_DEPRECATED
---- a/content/handlers/image/video.c
-+++ b/content/handlers/image/video.c
-@@ -22,6 +22,8 @@
- #include "content/content_protected.h"
- 
- #include "image/video.h"
-+#include "utils/http/parameter.h"
-+#include "content/llcache.h"
- 
- typedef struct nsvideo_content {
- 	struct content base;
---- a/content/content_factory.h
-+++ b/content/content_factory.h
-@@ -25,6 +25,7 @@
- 
- #include "netsurf/content_type.h"
- #include "utils/errors.h"
-+#include "utils/utils.h"
- 
- #define CONTENT_FACTORY_REGISTER_TYPES(HNAME, HTYPELIST, HHANDLER)	\
- 									\
diff -r f09bb1f3629e -r 95d959e089ea netsurf/stuff/patches/netsurf-3.6-pdf-writer.patch
--- a/netsurf/stuff/patches/netsurf-3.6-pdf-writer.patch	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
---- a/desktop/font_haru.c
-+++ b/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"
- 
---- a/desktop/save_pdf.c
-+++ b/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);
---- a/frontends/gtk/scaffolding.c
-+++ b/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 -r f09bb1f3629e -r 95d959e089ea netsurf/stuff/patches/openssl.patch
--- a/netsurf/stuff/patches/openssl.patch	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-From e8a9e3744523671228fef385ce7e1e11f93283b0 Mon Sep 17 00:00:00 2001
-From: Vincent Sanders <vince@kyllikki.org>
-Date: Sun, 20 Nov 2016 12:14:36 +0000
-Subject: fix openSSL 1.1.0 X509 certificate handling
-
----
-diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
-index 66970ef..7ddf512 100644
---- a/content/fetchers/curl.c
-+++ b/content/fetchers/curl.c
-@@ -128,6 +128,26 @@ static char fetch_error_buffer[CURL_ERROR_SIZE];
- static char fetch_proxy_userpwd[100];
- 
- 
-+/* OpenSSL 1.0.x to 1.1.0 certificate reference counting changed */
-+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL)
-+static int ns_X509_up_ref(X509 *cert)
-+{
-+	cert->references++;
-+	return 1;
-+}
-+
-+static void ns_X509_free(X509 *cert)
-+{
-+	cert->references--;
-+	if (cert->references == 0) {
-+		X509_free(cert);
-+	}
-+}
-+#else
-+#define ns_X509_up_ref X509_up_ref
-+#define ns_X509_free X509_free
-+#endif
-+
- /**
-  * Initialise a cURL fetcher.
-  */
-@@ -438,7 +458,7 @@ fetch_curl_verify_callback(int verify_ok, X509_STORE_CTX *x509_ctx)
- 	 */
- 	if (!fetch->cert_data[depth].cert) {
- 		fetch->cert_data[depth].cert = X509_STORE_CTX_get_current_cert(x509_ctx);
--		fetch->cert_data[depth].cert->references++;
-+		ns_X509_up_ref(fetch->cert_data[depth].cert);
- 		fetch->cert_data[depth].err = X509_STORE_CTX_get_error(x509_ctx);
- 	}
- 
-@@ -815,10 +835,7 @@ static void fetch_curl_free(void *vf)
- 	}
- 
- 	for (i = 0; i < MAX_CERTS && f->cert_data[i].cert; i++) {
--		f->cert_data[i].cert->references--;
--		if (f->cert_data[i].cert->references == 0) {
--			X509_free(f->cert_data[i].cert);
--		}
-+		ns_X509_free(f->cert_data[i].cert);
- 	}
- 
- 	free(f);
-@@ -986,10 +1003,7 @@ curl_start_cert_validate(struct curl_fetch_info *f,
- 					      X509_get_pubkey(certs[depth].cert));
- 
- 		/* and clean up */
--		certs[depth].cert->references--;
--		if (certs[depth].cert->references == 0) {
--			X509_free(certs[depth].cert);
--		}
-+		ns_X509_free(certs[depth].cert);
- 	}
- 
- 	msg.type = FETCH_CERT_ERR;
---
-cgit v0.9.0.3-65-g4555
diff -r f09bb1f3629e -r 95d959e089ea netsurf/stuff/patches/series
--- a/netsurf/stuff/patches/series	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# from https://www.archlinux.org/packages/community/i686/netsurf/
-#openssl.patch
-
-# from https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/netsurf/files
-# (modified files placing)
-#netsurf-3.6-CFLAGS.patch
-#netsurf-3.6-conditionally-include-image-headers.patch
-#netsurf-3.6-pdf-writer.patch
-#netsurf-3.6-gstreamer.patch
-
-#headers.patch
diff -r f09bb1f3629e -r 95d959e089ea nsgenbind/receipt
--- a/nsgenbind/receipt	Thu Oct 04 16:01:47 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="nsgenbind"
-COMMIT="dd752ec19370014f7b222f4983c52ddbbe3e66cf"
-VERSION="0.4-170323"
-CATEGORY="libs"
-SHORT_DESC="NetSurf JavaScript binding generator"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="GPL"
-WEB_SITE="http://git.netsurf-browser.org/nsgenbind.git/"
-
-TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.bz2"
-BASE_URL="http://git.netsurf-browser.org/$PACKAGE.git/snapshot"
-if [ -n "$COMMIT" ]; then
-	WGET_URL="$BASE_URL/$PACKAGE-$COMMIT.tar.bz2"
-else
-	WGET_URL="$BASE_URL/release/$VERSION.tar.bz2"
-fi
-
-BUILD_DEPENDS="netsurf-buildsystem"
-
-compile_rules() {
-	[ -z "$COMMIT" ] && cd $VERSION
-
-	make \
-		PREFIX=/usr \
-		install
-}
-
-genpkg_rules() {
-	copy @std
-}