NetSurf 3.10 and dependencies.

This commit is contained in:
Adrien Destugues
2020-05-30 11:31:15 +02:00
parent 8da414bf23
commit d90f35b5dd
15 changed files with 80 additions and 127 deletions

View File

@@ -1,19 +1,19 @@
SUMMARY="A lightweight multi-platform web browser"
DESCRIPTION="NetSurf provides a small, fast, comprehensive multiplatform Web browsing \
solution supporting HTML 4.01 and CSS standards.
solution supporting HTML 5 and CSS standards.
NetSurf is an open source web browser which uses its own layout engine. \
Its design goal is to be lightweight and portable. NetSurf provides \
features including tabbed browsing, bookmarks and page thumbnailing."
HOMEPAGE="https://www.netsurf-browser.org/"
COPYRIGHT="2003-2018 The NetSurf Browser project"
COPYRIGHT="2003-2020 The NetSurf Browser project"
LICENSE="GNU GPL v2"
REVISION="6"
REVISION="1"
# Do NOT use the netsurf-all package. It contains a bunch of subprojects which
# we build as separate packages so they can easily be used by other projects.
SOURCE_URI="https://download.netsurf-browser.org/netsurf/releases/source/netsurf-$portVersion-src.tar.gz"
CHECKSUM_SHA256="d72f1c6f6113a01e541f8476a93c347235068779140090df55ba402eb4a8ecc3"
PATCHES="netsurf-$portVersion.patchset"
CHECKSUM_SHA256="36484429e193614685c2ff246f55bd0a6dddf31a018bee45e0d1f7c28851995e"
PATCHES="netsutf-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
if [ "$targetArchitecture" = x86_gcc2 ]; then
@@ -50,24 +50,24 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libcheck$secondaryArchSuffix
devel:libcss$secondaryArchSuffix >= 0.9.0
devel:libcss$secondaryArchSuffix >= 0.9.1
devel:libcurl$secondaryArchSuffix
devel:libdom$secondaryArchSuffix >= 0.4.0
devel:libdom$secondaryArchSuffix >= 0.4.1
devel:libexpat$secondaryArchSuffix
devel:libhubbub$secondaryArchSuffix >= 0.3.6
devel:libhubbub$secondaryArchSuffix >= 0.3.7
devel:libiconv$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libnsbmp$secondaryArchSuffix >= 0.1.5
devel:libnsbmp$secondaryArchSuffix >= 0.1.6
devel:libnsgif$secondaryArchSuffix >= 0.2.1
devel:libnslog$secondaryArchSuffix >= 0.1.2
devel:libnspsl$secondaryArchSuffix >= 0.1.5
devel:libnsutils$secondaryArchSuffix >= 0.0.5
devel:libnslog$secondaryArchSuffix >= 0.1.3
devel:libnspsl$secondaryArchSuffix >= 0.1.6
devel:libnsutils$secondaryArchSuffix >= 0.1.0
devel:libparserutils$secondaryArchSuffix >= 0.2.4
devel:libpng16$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libsvgtiny$secondaryArchSuffix >= 0.1.7
devel:libutf8proc$secondaryArchSuffix
devel:libwapcaplet$secondaryArchSuffix >= 0.4.2
devel:libwapcaplet$secondaryArchSuffix >= 0.4.3
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
@@ -78,7 +78,7 @@ BUILD_PREREQUIRES="
cmd:git
cmd:gperf
cmd:make
cmd:nsgenbind
cmd:nsgenbind >= 0.8
cmd:pkg_config$secondaryArchSuffix
cmd:xxd
"

View File

@@ -0,0 +1,22 @@
From 2849315a8ea6860d890f8e70c5a45bcebd019f83 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 30 May 2020 11:24:15 +0200
Subject: build fix for libutf8proc
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 */
--
2.26.0

View File

@@ -1,31 +0,0 @@
From 8ca7db438b21b07fd3a90b9283ab9f9dcda35801 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 20 Nov 2019 19:34:02 +0100
Subject: libutf8proc2 patch
diff --git a/utils/idna.c b/utils/idna.c
index d657f90..73f4f4a 100644
--- a/utils/idna.c
+++ b/utils/idna.c
@@ -27,7 +27,7 @@
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
-#include <libutf8proc/utf8proc.h>
+#include <utf8proc.h>
#include "netsurf/inttypes.h"
@@ -172,7 +172,7 @@ static bool idna__contextj_rule(int32_t *label, int index, size_t len)
return false; /* No previous character */
}
unicode_props = utf8proc_get_property(label[index - 1]);
- if (unicode_props->combining_class == IDNA_UNICODE_CCC_VIRAMA) {
+ if (unicode_props->combining_class == UTF8PROC_BIDI_CLASS_EN) {
return true;
}
--
2.24.0