netsurf 3.10

8 files changed, 89 insertions, 33 deletions

diff --git a/http/netsurf/BUILD b/http/netsurf/BUILD
index c9dda20535..f0504e49e5 100755
--- a/http/netsurf/BUILD
+++ b/http/netsurf/BUILD
@@ -1 +1,3 @@
-make PREFIX=${INSTALL_ROOT}/usr
+# XXX js handler refuses to build with -ffast-math
+CFLAGS="${CFLAGS//-ffast-math}" &&
+default_build
diff --git a/http/netsurf/DEPENDS b/http/netsurf/DEPENDS
index 47f48b73fa..6fdd7c7dc8 100755
--- a/http/netsurf/DEPENDS
+++ b/http/netsurf/DEPENDS
@@ -1,14 +1,26 @@
 depends libxml2 &&
-depends gtk+2 &&
-depends libglade2 &&
-depends lcms &&
+depends gtk+3 TARGET=gtk3 &&
+depends lcms2 &&
 depends freetype2 &&
-depends curl &&
-depends re2c &&
-depends lemon &&
-depends SSL &&
+depends netsurf-buildsystem &&
+depends nsgenbind &&
 depends hubbub &&
+depends libcss &&
+depends libdom &&
+depends libnsutils &&
+depends libparserutils &&
+depends libwapcaplet &&
+depends vim && # needed for xxd
 #optional
+optional_depends utf8proc \
+		 NETSURF_USE_UTF8PROC={YES,NO} \
+		 'for UTF8 support' &&
+optional_depends SSL \
+		 NETSURF_USE_OPENSSL={YES,NO}\
+		 'for SSL/TLS support' &&
+optional_depends curl \
+		 NETSURF_USE_CURL={YES,NO} \
+		 'to use CURL' &&
 optional_depends libnsbmp \
                  "NETSURF_USE_BMP=YES" \
                  "NETSURF_USE_BMP=NO" \
@@ -29,16 +41,36 @@ optional_depends libmng \
                  "NETSURF_USE_MNG=YES" \
                  "NETSURF_USE_MNG=NO" \
                  "for displaying MNGs, JNGs, PNGs" &&
+optional_depends libwebp \
+		 NETSURF_USE_WEBP={YES,NO} \
+		 'for WebP support' &&
+optional_depends gstreamer \
+		 NETSURF_USE_VIDEO={YES,NO} \
+		 'for video playback support' &&
 optional_depends libharu2-scm \
                  "NETSURF_USE_HARU_PDF=YES" \
                  "NETSURF_USE_HARU_PDF=NO" \
                  "for PDF export and GTK printing support" &&
+optional_depends libsvgtiny \
+                 NETSURF_USE_NSSVG={YES,NO} \
+                 "for displaying SVGs" &&
 optional_depends librsvg2 \
                  "NETSURF_USE_RSVG=YES" \
                  "NETSURF_USE_RSVG=NO" \
                  "for displaying SVGs" &&
+optional_depends libpencil \
+                 NETSURF_USE_PENCIL={YES,NO} \
+                 "for displaying RISC OS Drawfiles" &&
 optional_depends librosprite \
                  "NETSURF_USE_ROSPRITE=YES" \
                  "NETSURF_USE_ROSPRITE=NO" \
-                 "for displaying RISC OS Sprites"
-
+                 "for displaying RISC OS Sprites" &&
+optional_depends libnslog \
+		 NETSURF_USE_NSLOG={YES,NO} \
+		 'for logging support' &&
+optional_depends libnspsl \
+		 NETSURF_USE_NSPSL={YES,NO} \
+		 'to use NetSurf public suffix list handling' &&
+optional_depends duktape \
+		 NETSURF_USE_DUKTAPE={YES,NO} \
+		 'for Javascript support'
diff --git a/http/netsurf/DETAILS b/http/netsurf/DETAILS
index 6ec388a039..9905d73f7a 100755
--- a/http/netsurf/DETAILS
+++ b/http/netsurf/DETAILS
@@ -1,21 +1,18 @@
+. "$GRIMOIRE"/NETSURF_FUNCTIONS
            SPELL=netsurf
-if [[ $NETSURF_SCM == y ]] ; then
-if [[ $NETSURF_SCM_AUTO == y ]] ; then
-         VERSION=$(date +%Y%m%d)
-else
-         VERSION=scm
-fi
-          SOURCE="${SPELL}-scm.tar.bz2"
-   SOURCE_URL[0]=svn://svn.netsurf-browser.org/trunk/${SPELL}:${SPELL}-scm
+if [ "$NETSURF_BRANCH" = scm ]; then
+         VERSION=$(get_scm_version)
+          SOURCE="$SPELL-scm.tar.bz2"
+   SOURCE_URL[0]="svn://svn.netsurf-browser.org/trunk/$SPELL:$SPELL-scm"
   FORCE_DOWNLOAD=on
    SOURCE_IGNORE=volatile
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-scm"
 else
-         VERSION=2.1
-          SOURCE="${SPELL}-${VERSION}-src.tar.gz"
-   SOURCE_URL[0]=http://www.${SPELL}-browser.org/downloads/releases/${SOURCE}
-     SOURCE_HASH=sha512:40a5aa00ed740e3de50a5d0c0dc2f830a451103d1ca2d48ebdd78ac7b6d6a6e729488b1c36729956f73ef9bbf6ffc15641da029740c3883fe6affcde35ddf022
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+         VERSION=3.10
+          SOURCE="$SPELL-$VERSION-src.tar.gz"
+   SOURCE_URL[0]="http://download.netsurf-browser.org/netsurf/releases/source/$SOURCE"
+     SOURCE_HASH=sha512:1b1153916438e08146271dc04200aefbdba3b2c4ca9432a43abfc3811b5418df7ed21bbd91767f12d04331a236227379d2c412fcf13f25349685a549723bf13d
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 fi
         WEB_SITE="http://www.netsurf-browser.org/"
       LICENSE[0]=GPLv2
diff --git a/http/netsurf/HISTORY b/http/netsurf/HISTORY
index 080f538651..58d87b9c9b 100644
--- a/http/netsurf/HISTORY
+++ b/http/netsurf/HISTORY
@@ -1,3 +1,17 @@
+2021-09-27 Ismael Luceno <ismael@sourcemage.org>
+	* DETAILS: updated spell to 3.10
+	  use NETSURF_FUNCTIONS
+	* DEPENDS: switched to gtk+3 and lcms2
+	  changed blabla
+	  removed libglade2, lemon and re2c
+	  added netsurf-buildsystem, utf8proc, libparserutils, libwapcaplet,
+	  libnsutil, libnspsl, libnslog, libdom, libcss, libwebp, gstreamer, and vim
+	* INSTALL: removed, no longer needed
+	* BUILD: switched to NetSurf's default_build
+	  removed -ffast-math from CFLAGS
+	* DETAILS, PREPARE: switched to prepare_select_branch
+	* PRE_BUILD, patches/utf8proc-path.diff: fixed compiling against system's utf8proc
+
 2014-08-19  Treeve Jelbert <treeve@sourcemage.org>
         * DEPENDS: openssl => SSL
 
@@ -10,4 +24,3 @@
 
 2009-04-28 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
 	* BUILD, DEPENDS, DETAILS: spell created
-
diff --git a/http/netsurf/INSTALL b/http/netsurf/INSTALL
deleted file mode 100755
index 621f3f869f..0000000000
--- a/http/netsurf/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-make PREFIX=${INSTALL_ROOT}/usr install
diff --git a/http/netsurf/PREPARE b/http/netsurf/PREPARE
index 3a2d629f7e..53a455205c 100755
--- a/http/netsurf/PREPARE
+++ b/http/netsurf/PREPARE
@@ -1,7 +1,2 @@
-config_query NETSURF_SCM "Do you want SCM version" "n" &&
-if [[ "${NETSURF_SCM}" == "y" ]]
-then
-config_query NETSURF_SCM_AUTO \
-          "Automaticaly update the spell on sorcery queue/system-update?" \
-          "n"
-fi
+. "$GRIMOIRE"/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/http/netsurf/PRE_BUILD b/http/netsurf/PRE_BUILD
new file mode 100755
index 0000000000..c230ad14bf
--- /dev/null
+++ b/http/netsurf/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/http/netsurf/patches/utf8proc-path.diff b/http/netsurf/patches/utf8proc-path.diff
new file mode 100644
index 0000000000..86ff9c72b7
--- /dev/null
+++ b/http/netsurf/patches/utf8proc-path.diff
@@ -0,0 +1,15 @@
+Origin: Void Linux
+
+diff --git a/utils/idna.c b/utils/idna.c
+index 628ef1f..f6e498a 100644
+--- a/utils/idna.c
++++ b/utils/idna.c
+@@ -167,7 +167,7 @@ idna__ace_to_ucs4(const char *ace_label,
+ 
+ #ifdef WITH_UTF8PROC
+ 
+-#include <libutf8proc/utf8proc.h>
++#include <utf8proc.h>
+ 
+ int32_t idna_contexto[] = {
+ 	/* CONTEXTO codepoints which have a rule defined */