NetSurf: update to 3.6 (and all dependencies)

Fixes many bugs, runs even faster, render more pages properly.
This commit is contained in:
Adrien Destugues
2016-12-21 22:19:54 +01:00
parent 1592a02862
commit 75cdba91bb
27 changed files with 112 additions and 1286 deletions

View File

@@ -1,22 +0,0 @@
DESCRIPTION="LibCSS is a CSS (Cascading Style Sheet) parser and selection engine"
HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libcss-0.1.2-src.tar.gz"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/libparserutils >= 0.1.1"
BUILD()
{
cd libcss-0.1.2
make
}
INSTALL()
{
cd libcss-0.1.2
make install
}
LICENSE="MIT
GNU GPL v2"
COPYRIGHT="2003 - 2012 The NetSurf Developers"

View File

@@ -1,75 +0,0 @@
SUMMARY="A CSS parser and selection engine"
DESCRIPTION="
LibCSS is a CSS (Cascading Style Sheet) parser and selection engine.
"
HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
COPYRIGHT="2007-2014 J-M Bell"
LICENSE="MIT"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libcss-$portVersion-src.tar.gz"
CHECKSUM_SHA256="4065dbfdfc9926e14a2f0f2c600fc72abac97bd20769ac6a908ac50226e95e1a"
REVISION="2"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PATCHES="libcss-$portVersion.patchset"
PROVIDES="
libcss$secondaryArchSuffix = $portVersion
lib:libcss$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libparserutils${secondaryArchSuffix}
lib:libwapcaplet${secondaryArchSuffix}
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libparserutils${secondaryArchSuffix} >= 0.1.1
devel:libwapcaplet${secondaryArchSuffix} >= 0.1.1
devel:libiconv
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:perl
cmd:pkg_config$secondaryArchSuffix
netsurf_buildsystem >= 0
"
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
}
INSTALL()
{
make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
mkdir -p $prefix/develop/lib
mkdir -p $(dirname $includeDir)
mv $prefix/include $includeDir
prepareInstalledDevelLib libcss
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}
TEST()
{
make test PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
LDFLAGS="-liconv -lwapcaplet -lparserutils"
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libcss${secondaryArchSuffix}_devel = $portVersion
devel:libcss$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
libcss$secondaryArchSuffix == $portVersion base
"

View File

@@ -1,70 +0,0 @@
SUMMARY="A CSS parser and selection engine"
DESCRIPTION="LibCSS is a CSS (Cascading Style Sheet) parser and selection engine. \
It was developed as part of the NetSurf project"
HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
COPYRIGHT="2007-2014 J-M Bell"
LICENSE="MIT"
REVISION="2"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libcss-$portVersion-src.tar.gz"
CHECKSUM_SHA256="0be9509d9d352abdeec87764c1f8ba13950d9dc4f63acade0477209b7fd21748"
PATCHES="libcss-0.3.0.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libcss$secondaryArchSuffix = $portVersion
lib:libcss$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libparserutils${secondaryArchSuffix}
lib:libwapcaplet${secondaryArchSuffix}
"
PROVIDES_devel="
libcss${secondaryArchSuffix}_devel = $portVersion
devel:libcss$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libparserutils${secondaryArchSuffix} >= 0.2.0
devel:libwapcaplet${secondaryArchSuffix} >= 0.2.1
devel:libiconv
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:perl
cmd:pkg_config$secondaryArchSuffix
netsurf_buildsystem >= 1.2
"
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
INCLUDEDIR=$relativeIncludeDir
}
INSTALL()
{
make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
INCLUDEDIR=$relativeIncludeDir
mkdir -p $developLibDir
prepareInstalledDevelLib libcss
fixPkgconfig
# devel package
packageEntries devel $developDir
}
TEST()
{
make test PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
LDFLAGS="-liconv -lwapcaplet -lparserutils"
}

View File

@@ -2,12 +2,11 @@ SUMMARY="A CSS parser and selection engine"
DESCRIPTION="
LibCSS is a CSS (Cascading Style Sheet) parser and selection engine."
HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
COPYRIGHT="2007-2014 J-M Bell"
COPYRIGHT="2007-2016 J-M Bell"
LICENSE="MIT"
REVISION="2"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libcss-$portVersion-src.tar.gz"
CHECKSUM_SHA256="ecaa09b07d4ecfd4644163bc0f0332b81aaaffbb9a373465e15e44e06666faf1"
PATCHES="libcss-0.3.0.patchset"
CHECKSUM_SHA256="0a71ec6bef24ec1bc33a7505b4909befbe9e9165ca13f6159a3aa43bc413de4f"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -31,8 +30,8 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libparserutils${secondaryArchSuffix} >= 0.2.0
devel:libwapcaplet${secondaryArchSuffix} >= 0.2.1
devel:libparserutils${secondaryArchSuffix} >= 0.2.3
devel:libwapcaplet${secondaryArchSuffix} >= 0.3.1
devel:libiconv
"
BUILD_PREREQUIRES="
@@ -41,7 +40,7 @@ BUILD_PREREQUIRES="
cmd:make
cmd:perl
cmd:pkg_config$secondaryArchSuffix
netsurf_buildsystem >= 1.3
netsurf_buildsystem >= 1.5
"
BUILD()

View File

@@ -1,78 +0,0 @@
From 53ba61ff1f71c50a26a03909a9b35e12b79d939d Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 9 Jun 2014 18:01:21 +0200
Subject: Fix build with gcc2.
diff --git a/test/dump.h b/test/dump.h
index 941117c..97a6cfd 100644
--- a/test/dump.h
+++ b/test/dump.h
@@ -733,13 +733,14 @@ void dump_bytecode(css_style *style, char **ptr, uint32_t depth)
opcode_t op;
uint32_t value;
uint32_t opv = *((uint32_t *) bytecode);
+ uint32_t i;
ADVANCE(sizeof(opv));
op = getOpcode(opv);
*((*ptr)++) = '|';
- for (uint32_t i = 0; i < depth; i++)
+ for (i = 0; i < depth; i++)
*((*ptr)++) = ' ';
*ptr += sprintf(*ptr, "%s: ", opcode_names[op]);
@@ -2657,10 +2658,10 @@ void dump_font_face(css_font_face *font_face, char **ptr)
uint32_t i;
css_font_face_src *srcs = font_face->srcs;
for (i = 0; i < font_face->n_srcs; ++i) {
+ css_font_face_format format;
*ptr += sprintf(*ptr, "\n| src: ");
- css_font_face_format format =
- css_font_face_src_format(&srcs[i]);
+ format = css_font_face_src_format(&srcs[i]);
*ptr += sprintf(*ptr, "\n| format: ");
--
1.8.3.4
From 7bb3452686257d7732b6c6cbcf5c8ace35280a09 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 9 Jun 2014 18:01:32 +0200
Subject: Fix include paths for Haiku.
diff --git a/Makefile b/Makefile
index d80178c..321eb5c 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ endif
include $(NSBUILD)/Makefile.top
# Extra installation rules
-I := /include/libcss
+I := /$(INCLUDEDIR)/libcss
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/computed.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/errors.h
diff --git a/libcss.pc.in b/libcss.pc.in
index 695aa76..8df11b4 100644
--- a/libcss.pc.in
+++ b/libcss.pc.in
@@ -1,7 +1,7 @@
prefix=PREFIX
exec_prefix=${prefix}
libdir=${exec_prefix}/LIBDIR
-includedir=${prefix}/include
+includedir=${prefix}/INCLUDEDIR
Name: libcss
Description: CSS parsing and selection library
--
1.8.3.4

View File

@@ -2,12 +2,11 @@ SUMMARY="NetSurf generalised utility library"
DESCRIPTION="Various things useful to the NetSurf browser, and possibly to \
other applications."
HOMEPAGE="http://git.netsurf-browser.org/libnsutils.git/"
COPYRIGHT="2014 Vincent Sanders"
COPYRIGHT="2014-2016 Vincent Sanders"
LICENSE="MIT"
REVISION="2"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnsutils-$portVersion-src.tar.gz"
CHECKSUM_SHA256="9ad6b921bceed2c0d44ca6ff36fa76841cc6533f8ed7ccb0a941fd9a78731afd"
PATCHES="libnsutils-$portVersion.patchset"
CHECKSUM_SHA256="15b8bf715da6e020509bcadea61f8b33d861b153121857a775b91fcb32b13d73"
ARCHITECTURES="x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="x86"
@@ -22,7 +21,7 @@ REQUIRES="
PROVIDES_devel="
libnsutils${secondaryArchSuffix}_devel = $portVersion
devel:libnsutils$secondaryArchSuffix = 0.0.1 compat >= 0
devel:libnsutils$secondaryArchSuffix = $portVersion compat >= 0
"
REQUIRES_devel="
"
@@ -31,7 +30,7 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
netsurf_buildsystem >= 1.1
netsurf_buildsystem >= 1.5
cmd:gcc$secondaryArchSuffix
cmd:make
"

View File

@@ -1,35 +0,0 @@
From f094cf954fe20d718df8da777ccb9f10cca09315 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sat, 21 Mar 2015 19:05:43 +0100
Subject: fix for INCLUDEDIR
diff --git a/Makefile b/Makefile
index 807ba75..fa44370 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ TESTLDFLAGS := -lm -l$(COMPONENT) $(TESTLDFLAGS)
include $(NSBUILD)/Makefile.top
# Extra installation rules
-I := /include/nsutils
+I := /$(INCLUDEDIR)/nsutils
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/nsutils/errors.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/nsutils/base64.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/nsutils/time.h
diff --git a/libnsutils.pc.in b/libnsutils.pc.in
index 38023de..a327662 100644
--- a/libnsutils.pc.in
+++ b/libnsutils.pc.in
@@ -1,7 +1,7 @@
prefix=PREFIX
exec_prefix=${prefix}
libdir=${exec_prefix}/LIBDIR
-includedir=${prefix}/include
+includedir=${prefix}/INCLUDEDIR
Name: libnsutils
Description: NetSurf utilities
--
2.2.2

View File

@@ -3,19 +3,19 @@ DESCRIPTION="utf8proc is a small, clean C library that provides Unicode \
normalization, case-folding, and other operations for data in the UTF-8 \
encoding, supporting Unicode version 7.0."
HOMEPAGE="http://julialang.org/utf8proc/"
COPYRIGHT="2006-2013 Public Software Group"
COPYRIGHT="2006-2016 Public Software Group"
LICENSE="MIT"
REVISION="2"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libutf8proc-1.1.6-src.tar.gz"
CHECKSUM_SHA256="16e0dacf459bf42098614b714a262633de26ba5a03f05812d6d052c9aeeac384"
PATCHES="libutf8proc-1.1.6.patchset"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libutf8proc-1.3.1-2-src.tar.gz"
CHECKSUM_SHA256="465128ccbc7f8c1c3987d2247bf852fc1daf10bc6c7c25bbfe5df9e1e76fc083"
SOURCE_DIR="libutf8proc-1.3.1-2"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
libutf8proc$secondaryArchSuffix = $portVersion
lib:libutf8proc$secondaryArchSuffix = 1.1.6 compat >= 1
lib:libutf8proc$secondaryArchSuffix = 1.3.1 compat >= 1
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -23,7 +23,7 @@ REQUIRES="
PROVIDES_devel="
libutf8proc${secondaryArchSuffix}_devel = $portVersion
devel:libutf8proc$secondaryArchSuffix = 1.1.6 compat >= 1
devel:libutf8proc$secondaryArchSuffix = 1.3.1 compat >= 1
"
REQUIRES_devel="
libutf8proc$secondaryArchSuffix == $portVersion base

View File

@@ -1,35 +0,0 @@
From 21fed2fcdad029c1329c5baff7ce427c978b0422 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sat, 21 Mar 2015 18:17:16 +0100
Subject: INCLUDEDIR fixes.
diff --git a/Makefile b/Makefile
index 858f4a8..d76e971 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ ifeq ($(WANT_TEST),yes)
endif
# Extra installation rules
-I := /include/libutf8proc
+I := /$(INCLUDEDIR)/libutf8proc
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libutf8proc/utf8proc.h
INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)
diff --git a/libutf8proc.pc.in b/libutf8proc.pc.in
index 2155841..f4645c0 100644
--- a/libutf8proc.pc.in
+++ b/libutf8proc.pc.in
@@ -1,7 +1,7 @@
prefix=PREFIX
exec_prefix=${prefix}
libdir=${exec_prefix}/LIBDIR
-includedir=${prefix}/include
+includedir=${prefix}/INCLUDEDIR
Name: libutf8proc
Description: UTF8 processing
--
2.2.2

View File

@@ -1,64 +0,0 @@
SUMMARY="A string internment library"
DESCRIPTION="LibWapcaplet is a string internment library.
It provides reference counted string interment and rapid string comparison \
functionality."
HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
COPYRIGHT="2009-2014 The NetSurf Browser project"
LICENSE="MIT"
REVISION="2"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libwapcaplet-0.2.1-src.tar.gz"
CHECKSUM_SHA256="9e4a8df3dfe6d7e1bcc4a3ccce18c3d02230545f4726b05b09b9e504946c8ec8"
PATCHES="libwapcaplet-0.2.1.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libwapcaplet$secondaryArchSuffix = $portVersion
lib:libwapcaplet$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
"
PROVIDES_devel="
libwapcaplet${secondaryArchSuffix}_devel = $portVersion
devel:libwapcaplet$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
libwapcaplet$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
netsurf_buildsystem >= 0
lib:libcheck
devel:libcheck
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
"
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
}
INSTALL()
{
make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
INCLUDEDIR=$relativeIncludeDir
mkdir -p $prefix/develop/lib
prepareInstalledDevelLib libwapcaplet
fixPkgconfig
packageEntries devel $developDir
}
TEST()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test
}

View File

@@ -3,12 +3,11 @@ DESCRIPTION="LibWapcaplet is a string internment library.
It provides reference counted string interment and rapid string comparison \
functionality."
HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
COPYRIGHT="2009-2014 The NetSurf Browser project"
COPYRIGHT="2009-2016 The NetSurf Browser project"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libwapcaplet-${portVersion}-src.tar.gz"
CHECKSUM_SHA256="38021992e1e6b3ec50d0d3bf7add069bee4c5b179691afa6a76dd58695201485"
PATCHES="libwapcaplet-0.2.1.patchset"
CHECKSUM_SHA256="7b87a997b2531298af1efd32a622be5faee61349ad4e6c868fcb286ce805d997"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"

View File

@@ -1,35 +0,0 @@
From 32b0d42e141a2bab66d7420e1f7159282f5beb69 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 8 Jun 2014 22:42:45 +0200
Subject: Fix include dirs for Haiku.
diff --git a/Makefile b/Makefile
index f40842d..db191ee 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ ifeq ($(WANT_TEST),yes)
endif
# Extra installation rules
-I := /include/libwapcaplet
+I := /$(INCLUDEDIR)/libwapcaplet
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libwapcaplet/libwapcaplet.h
INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)
diff --git a/libwapcaplet.pc.in b/libwapcaplet.pc.in
index 9bdfdf5..9c05e37 100644
--- a/libwapcaplet.pc.in
+++ b/libwapcaplet.pc.in
@@ -1,7 +1,7 @@
prefix=PREFIX
exec_prefix=${prefix}
libdir=${exec_prefix}/LIBDIR
-includedir=${prefix}/include
+includedir=${prefix}/INCLUDEDIR
Name: libwapcaplet
Description: String internalisation dictionary
--
1.8.3.4

View File

@@ -2,13 +2,13 @@ SUMMARY="NetSurf generator for javascript bindings"
DESCRIPTION="This is a tool to generate JavaScript to DOM bindings from w3c \
webidl files and a binding configuration file."
HOMEPAGE="http://git.netsurf-browser.org/nsgenbind.git/"
COPYRIGHT="2012 Vincent Sanders"
COPYRIGHT="2012-2016 Vincent Sanders"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/nsgenbind-0.1.2-src.tar.gz"
CHECKSUM_SHA256="94a87e9a223791693724e929cc7b13e334d4baaf73f7d0a91fdf938c9a260a9a"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/nsgenbind-$portVersion-src.tar.gz"
CHECKSUM_SHA256="c6680492e83718aacd456ae8e2b3c9f8cb042f50f079a0167bcb24cddcba0f1d"
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="