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,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