Recipes for NetSurf 3.7 and libraries

This commit is contained in:
Adrien Destugues
2017-10-23 05:14:03 +02:00
parent fac2491abd
commit 63e56ae879
24 changed files with 98 additions and 760 deletions

View File

@@ -1,68 +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-2016 J-M Bell"
LICENSE="MIT"
REVISION="2"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libcss-$portVersion-src.tar.gz"
CHECKSUM_SHA256="4eb5228e5c480e31ba8ca098cedfec3a7ef90302ede77989caedf11670b8e462"
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.3
devel:libwapcaplet${secondaryArchSuffix} >= 0.3.0
devel:libiconv
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:perl
cmd:pkg_config$secondaryArchSuffix
netsurf_buildsystem >= 1.5
"
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
INCLUDEDIR=$relativeIncludeDir
}
INSTALL()
{
make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir
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,14 +2,14 @@ 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-2016 J-M Bell"
COPYRIGHT="2007-2017 J-M Bell"
LICENSE="MIT"
REVISION="3"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libcss-$portVersion-src.tar.gz"
CHECKSUM_SHA256="0a71ec6bef24ec1bc33a7505b4909befbe9e9165ca13f6159a3aa43bc413de4f"
CHECKSUM_SHA256="dfb2a3d4967339c35b45b04fb7a95c3b4782302adcbeed2be2f1c88de0d0b69a"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
ARCHITECTURES="?x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
PROVIDES="
libcss$secondaryArchSuffix = $portVersion
@@ -40,7 +40,7 @@ BUILD_PREREQUIRES="
cmd:make
cmd:perl
cmd:pkg_config$secondaryArchSuffix
netsurf_buildsystem >= 1.5
netsurf_buildsystem >= 1.6
"
BUILD()

View File

@@ -1,45 +1,48 @@
SUMMARY="A library for processing UTF-8 encoded Unicode strings"
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-2016 Public Software Group"
SUMMARY="NetSurf Parametric Logging Library"
DESCRIPTION="A category-based logging library which supports complex \
logging filters, multiple log levels, and provides context through to client \
applications."
HOMEPAGE="http://git.netsurf-browser.org/libnslog.git/"
COPYRIGHT="2014-2017 Vincent Sanders"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libutf8proc-$portVersion-src.tar.gz"
CHECKSUM_SHA256="78e950bfc691182d3b61109b1b4e234399743607231f72a395331a367c2ac675"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnslog-$portVersion-src.tar.gz"
CHECKSUM_SHA256="f8cc49f4fb0c8f1ebf46242e3449e5a232cae9b7925a9cabd18340cb6c2684fe"
ARCHITECTURES="x86_gcc2 x86 x86_64"
ARCHITECTURES="?x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
libutf8proc$secondaryArchSuffix = $portVersion
lib:libutf8proc$secondaryArchSuffix = 1.1.6 compat >= 1
libnslog$secondaryArchSuffix = $portVersion
lib:libnslog$secondaryArchSuffix = 0.1.0 compat >= 0
"
REQUIRES="
haiku$secondaryArchSuffix
"
PROVIDES_devel="
libutf8proc${secondaryArchSuffix}_devel = $portVersion
devel:libutf8proc$secondaryArchSuffix = 1.1.6 compat >= 1
libnslog${secondaryArchSuffix}_devel = $portVersion
devel:libnslog$secondaryArchSuffix = $portVersion compat >= 0
"
REQUIRES_devel="
libutf8proc$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
netsurf_buildsystem
netsurf_buildsystem >= 1.6
cmd:bison
cmd:flex
cmd:gcc$secondaryArchSuffix
cmd:make
"
BUILD()
{
# Build the static lib
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
# Build the shared lib
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
COMPONENT_TYPE=lib-shared
}
@@ -53,7 +56,7 @@ INSTALL()
mkdir -p $prefix/develop/lib
prepareInstalledDevelLib libutf8proc
prepareInstalledDevelLib libnslog
fixPkgconfig
packageEntries devel $developDir

View File

@@ -1,71 +0,0 @@
SUMMARY="A library for building efficient parsers"
DESCRIPTION="LibParserUtils is a library for building efficient parsers."
HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/"
COPYRIGHT="2007-2014 J-M Bell"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libparserutils-$portVersion-src.tar.gz"
CHECKSUM_SHA256="55c50abbffaaebe17acba43008ee2c4085401ce618e505fafa7c75baaa813da7"
PATCHES="libparserutils-0.2.0.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libparserutils$secondaryArchSuffix = $portVersion
lib:libparserutils$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libiconv${secondaryArchSuffix}
"
PROVIDES_devel="
libparserutils${secondaryArchSuffix}_devel = $portVersion
devel:libparserutils$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libiconv${secondaryArchSuffix}
lib:libiconv${secondaryArchSuffix}
"
BUILD_PREREQUIRES="
netsurf_buildsystem >= 1.1
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:perl
"
BUILD()
{
# Build the static lib
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
# Build the shared lib
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
COMPONENT_TYPE=lib-shared
}
INSTALL()
{
make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
INCLUDEDIR=$relativeIncludeDir
make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
INCLUDEDIR=$relativeIncludeDir COMPONENT_TYPE=lib-shared
mkdir -p $prefix/develop/lib
prepareInstalledDevelLib libparserutils
fixPkgconfig
packageEntries devel $developDir
}
TEST()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
LDFLAGS=-liconv test
}

View File

@@ -1,71 +0,0 @@
SUMMARY="A library for building efficient parsers"
DESCRIPTION="LibParserUtils is a library for building efficient parsers."
HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/"
COPYRIGHT="2007-2014 J-M Bell"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libparserutils-$portVersion-src.tar.gz"
CHECKSUM_SHA256="30589e6b3adf0c14b5a78de1fba3b9b84cbd74e95e22d45827fa3e09b563f735"
PATCHES="libparserutils-0.2.0.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libparserutils$secondaryArchSuffix = $portVersion
lib:libparserutils$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libiconv${secondaryArchSuffix}
"
PROVIDES_devel="
libparserutils${secondaryArchSuffix}_devel = $portVersion
devel:libparserutils$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libiconv${secondaryArchSuffix}
lib:libiconv${secondaryArchSuffix}
"
BUILD_PREREQUIRES="
netsurf_buildsystem >= 1.1
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:perl
"
BUILD()
{
# Build the static lib
CFLAGS=-Wno-error make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
# Build the shared lib
CFLAGS=-Wno-error make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
COMPONENT_TYPE=lib-shared
}
INSTALL()
{
make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir
make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir COMPONENT_TYPE=lib-shared
mkdir -p $prefix/develop/lib
prepareInstalledDevelLib libparserutils
fixPkgconfig
packageEntries devel $developDir
}
TEST()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
LDFLAGS=-liconv test
}

View File

@@ -1,50 +0,0 @@
From 40b2c1f916c450195884c7db57bbea9155e297fc Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 8 Jun 2014 18:39:53 +0200
Subject: Fix include directories for Haiku.
diff --git a/Makefile b/Makefile
index 5acdc36..14b8325 100644
--- a/Makefile
+++ b/Makefile
@@ -33,19 +33,19 @@ include $(NSBUILD)/Makefile.top
# Extra installation rules
Is := include/parserutils
-I := /include/parserutils
+I := /$(INCLUDEDIR)/parserutils
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/errors.h;$(Is)/functypes.h;$(Is)/parserutils.h;$(Is)/types.h
Is := include/parserutils/charset
-I := /include/parserutils/charset
+I := /$(INCLUDEDIR)/parserutils/charset
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/codec.h;$(Is)/mibenum.h;$(Is)/utf16.h;$(Is)/utf8.h
Is := include/parserutils/input
-I := /include/parserutils/input
+I := /$(INCLUDEDIR)/parserutils/input
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/inputstream.h
Is := include/parserutils/utils
-I := /include/parserutils/utils
+I := /$(INCLUDEDIR)/parserutils/utils
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/buffer.h;$(Is)/stack.h;$(Is)/vector.h
INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
diff --git a/libparserutils.pc.in b/libparserutils.pc.in
index 307e909..1a46cf8 100644
--- a/libparserutils.pc.in
+++ b/libparserutils.pc.in
@@ -1,7 +1,7 @@
prefix=PREFIX
exec_prefix=${prefix}
libdir=${exec_prefix}/LIBDIR
-includedir=${prefix}/include
+includedir=${prefix}/INCLUDEDIR
Name: libparserutils
Description: Utility library for facilitating parser development
--
1.8.3.4

View File

@@ -3,14 +3,14 @@ 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-2016 Public Software Group"
COPYRIGHT="2006-2017 Public Software Group"
LICENSE="MIT"
REVISION="2"
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"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libutf8proc-1.3.1-3-src.tar.gz"
CHECKSUM_SHA256="1223c2dd9c5cd077564feb30a6ad8b1c0e55ef5dfe7c275d3b9fe8274f207c70"
SOURCE_DIR="libutf8proc-1.3.1-3"
ARCHITECTURES="x86_gcc2 x86 x86_64"
ARCHITECTURES="?x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
@@ -33,7 +33,7 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
netsurf_buildsystem
netsurf_buildsystem >= 1.6
cmd:gcc$secondaryArchSuffix
cmd:make
"

View File

@@ -1,41 +0,0 @@
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-2016 Vincent Sanders"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/nsgenbind-$portVersion-src.tar.gz"
CHECKSUM_SHA256="ef21a08461165014c499aa3d38f5909a88b4528f5db8492bf7bcbfe3e957ba9b"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
nsgenbind$secondaryArchSuffix = $portVersion
cmd:nsgenbind
"
REQUIRES="
haiku$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
netsurf_buildsystem
"
BUILD_PREREQUIRES="
cmd:make
cmd:gcc$secondaryArchSuffix
cmd:bison
cmd:flex
"
BUILD()
{
make $jobArgs PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
}
INSTALL()
{
make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
}

View File

@@ -2,11 +2,11 @@ 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-2016 Vincent Sanders"
COPYRIGHT="2012-2017 Vincent Sanders"
LICENSE="MIT"
REVISION="3"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/nsgenbind-$portVersion-src.tar.gz"
CHECKSUM_SHA256="c6680492e83718aacd456ae8e2b3c9f8cb042f50f079a0167bcb24cddcba0f1d"
CHECKSUM_SHA256="5b86b60959a0fc86bfc676cf461d9ed5f5bb0b16cae49816a4d202ab54bb92c7"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"

View File

@@ -1,41 +0,0 @@
SUMMARY="NetSurf build framework"
DESCRIPTION="
NetSurf build framework for compiling some of their libraries."
HOMEPAGE="http://git.netsurf-browser.org/buildsystem.git/"
COPYRIGHT="2009 - 2013 The NetSurf Browser project"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/buildsystem-1.1.tar.gz"
CHECKSUM_SHA256="5c092afe653d1c6c0fadb39cc47659471e4741fdd2803127be42db4264e3ac44"
SOURCE_DIR="buildsystem-1.1"
PATCHES="netsurf_buildsystem-1.1.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
netsurf_buildsystem$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
"
BUILD()
{
# no-op
true
}
INSTALL()
{
make install PREFIX=$prefix BASE=$prefix/data/netsurf-buildsystem
}

View File

@@ -1,41 +0,0 @@
SUMMARY="NetSurf build framework"
DESCRIPTION="
NetSurf build framework for compiling some of their libraries."
HOMEPAGE="http://git.netsurf-browser.org/buildsystem.git/"
COPYRIGHT="2009-2014 The NetSurf Browser project"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/buildsystem-$portVersion.tar.gz"
CHECKSUM_SHA256="3903a4a1551c9c202e1d2047344c4f3598c8d9d6c35ebf8cc2e18874bd0c9d61"
SOURCE_DIR="buildsystem-$portVersion"
PATCHES="netsurf_buildsystem-1.1.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
netsurf_buildsystem$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
"
BUILD()
{
# no-op
true
}
INSTALL()
{
make install PREFIX=$prefix BASE=$prefix/data/netsurf-buildsystem
}

View File

@@ -1,41 +0,0 @@
SUMMARY="NetSurf build framework"
DESCRIPTION="
NetSurf build framework for compiling some of their libraries."
HOMEPAGE="http://git.netsurf-browser.org/buildsystem.git/"
COPYRIGHT="2009-2015 The NetSurf Browser project"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/buildsystem-$portVersion.tar.gz"
CHECKSUM_SHA256="10bbe95ba07476208da6047bd3c74685b6e61ba9904975b5d5c9a2c79a84ac79"
SOURCE_DIR="buildsystem-$portVersion"
PATCHES="netsurf_buildsystem-1.3.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
netsurf_buildsystem$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
"
BUILD()
{
# no-op
true
}
INSTALL()
{
make install PREFIX=$prefix BASE=$prefix/data/netsurf-buildsystem
}

View File

@@ -0,0 +1,37 @@
SUMMARY="NetSurf build framework"
DESCRIPTION="NetSurf build framework for compiling some of their libraries."
HOMEPAGE="http://git.netsurf-browser.org/buildsystem.git/"
COPYRIGHT="2009-2017 The NetSurf Browser project"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/buildsystem-$portVersion.tar.gz"
CHECKSUM_SHA256="3d9c8a2f60dab6add712a2e67ba35f592e31688566b2ded38d0d61461138b35c"
SOURCE_DIR="buildsystem-$portVersion"
ARCHITECTURES="any"
DISABLE_SOURCE_PACKAGE=yes
PROVIDES="
netsurf_buildsystem = $portVersion
"
REQUIRES="
haiku
"
BUILD_REQUIRES="
haiku_devel
"
BUILD_PREREQUIRES="
cmd:make
"
BUILD()
{
# no-op
true
}
INSTALL()
{
make install PREFIX=$prefix BASE=$prefix/data/netsurf-buildsystem
}

View File

@@ -1,44 +0,0 @@
From 4a0ea106ab2a23af3798b7a3114c969f7339c05a Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 8 Jun 2014 18:12:27 +0200
Subject: Add support for INCLUDEDIR in pkg-config files.
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 5b76f23..2f21be0 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -21,6 +21,8 @@
# (defaults to /usr/local)
# LIBDIR Library installation directory in ${PREFIX}
# (defaults to lib)
+# INCLUDEDIR Header installation directory in ${PREFIX}
+# (defaults to include)
#
###############################################################################
@@ -373,6 +375,9 @@ PREFIX ?= /usr/local
# Default libdir
LIBDIR ?= lib
+# Default includedir
+INCLUDEDIR ?= include
+
###############################################################################
# Tool defaults
###############################################################################
diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top
index 6329c47..bd51ecd 100644
--- a/makefiles/Makefile.top
+++ b/makefiles/Makefile.top
@@ -291,6 +291,7 @@ define install_pkgconfig
-e 's#MAJOR#$(major-version)#' \
-e 's#MINOR#$(minor-version)#' \
-e 's#PATCH#$(patch-version)#' \
+ -e 's#INCLUDEDIR#$(INCLUDEDIR)#' \
-e 's#VERSION#$(COMPONENT_VERSION)#' \
-e 's#REQUIRED#$(__required)#' \
$1 >$(BUILDDIR)/$(1:.in=)
--
1.8.3.4

View File

@@ -1,46 +0,0 @@
From 7aecf23ed919012dacf142de7aa1a49d9131570a Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sat, 21 Mar 2015 15:01:39 +0100
Subject: Allow to change include directory.
* On Haiku, includes are not stored in include/, but develop/headers. We
need the buildsystem to be able to adjust itself for this.
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 8a104d7..dd5ff91 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -22,6 +22,8 @@
# (defaults to /usr/local)
# LIBDIR Library installation directory in ${PREFIX}
# (defaults to lib)
+# INCLUDEDIR Header installtion directory in ${PREFIX}
+# (defaults to include)
#
###############################################################################
@@ -241,6 +243,9 @@ PREFIX ?= /usr/local
# Default libdir
LIBDIR ?= lib
+# Default includedir
+INCLUDEDIR ?= include
+
###############################################################################
# Tool defaults
###############################################################################
diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top
index 38922d1..476a93f 100644
--- a/makefiles/Makefile.top
+++ b/makefiles/Makefile.top
@@ -292,6 +292,7 @@ define install_pkgconfig
$(Q)$(SED) \
-e 's#PREFIX#$(PREFIX)#' \
-e 's#LIBDIR#$(LIBDIR)#' \
+ -e 's#INCLUDEDIR#$(INCLUDEDIR)#' \
-e 's#MAJOR#$(major-version)#' \
-e 's#MINOR#$(minor-version)#' \
-e 's#PATCH#$(patch-version)#' \
--
2.2.2

View File

@@ -2,11 +2,11 @@ SUMMARY="A decoding library for GIF images"
DESCRIPTION="Libnsgif is a decoding library for GIF image file format"
HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/"
COPYRIGHT="2006 Richard Wilson
2008-2016 Sean Fox"
2008-2017 Sean Fox"
LICENSE="MIT"
REVISION="2"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnsgif-$portVersion-src.tar.gz"
CHECKSUM_SHA256="d3d2c9c008047eab41fc0a4ce7c280456c55c479d191e1968f843b005f219fa8"
CHECKSUM_SHA256="0a8dd99f2260c645c940f15eb6527ec8116a1524813b93c069d654222a701cde"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
@@ -31,7 +31,7 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
netsurf_buildsystem
netsurf_buildsystem >= 1.6
cmd:gcc$secondaryArchSuffix
cmd:make
"

View File

@@ -1,61 +0,0 @@
SUMMARY="An implementation of SVG Tiny written in C"
DESCRIPTION="The overall idea of the library is to take some SVG as input, \
and return a list of paths and texts which can be rendered easily. The \
library does not do the actual rendering."
HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny"
COPYRIGHT="2003-2014 The NetSurf Developers"
LICENSE="MIT"
REVISION="2"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libsvgtiny-$portVersion-src.tar.gz"
CHECKSUM_SHA256="9624e575c5e6e3177e803f65fc52af59784952b2861adf8b4a6ca77e05692274"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
libsvgtiny$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
"
PROVIDES_devel="
libsvgtiny${secondaryArchSuffix}_devel = $portVersion
devel:libsvgtiny$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
libsvgtiny$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libwapcaplet$secondaryArchSuffix
devel:libdom$secondaryArchSuffix
devel:libhubbub$secondaryArchSuffix
devel:libparserutils$secondaryArchSuffix
"
BUILD_PREREQUIRES="
netsurf_buildsystem
cmd:gcc$secondaryArchSuffix
cmd:gperf
cmd:make
cmd:pkg_config$secondaryArchSuffix
"
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
INCLUDEDIR=$relativeIncludeDir
}
INSTALL()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir install
prepareInstalledDevelLib libsvgtiny
fixPkgconfig
# devel package
packageEntries devel $developDir
}

View File

@@ -3,13 +3,13 @@ DESCRIPTION="The overall idea of the library is to take some SVG as input, \
and return a list of paths and texts which can be rendered easily. The \
library does not do the actual rendering."
HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny"
COPYRIGHT="2003-2016 The NetSurf Developers"
COPYRIGHT="2003-2017 The NetSurf Developers"
LICENSE="MIT"
REVISION="2"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libsvgtiny-$portVersion-src.tar.gz"
CHECKSUM_SHA256="0ab9b13132b82596e0956daf4235fbcb1193433f84272d30255fe9d0d352b070"
CHECKSUM_SHA256="062ae047608dd04e4c3d8bc423a743c436131f3b06b8f5649e3e887ab2f0f78a"
ARCHITECTURES="x86_gcc2 x86 x86_64"
ARCHITECTURES="?x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
@@ -35,7 +35,7 @@ BUILD_REQUIRES="
devel:libparserutils$secondaryArchSuffix
"
BUILD_PREREQUIRES="
netsurf_buildsystem
netsurf_buildsystem >= 1.6
cmd:gcc$secondaryArchSuffix
cmd:gperf
cmd:make

View File

@@ -9,11 +9,11 @@ markup, both valid and invalid. As a result, Hubbub parses web content well.
If you are looking for an HTML5 parser in Python or Ruby, you may wish to \
look at html5lib."
HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
COPYRIGHT="2007-2016 J-M Bell"
COPYRIGHT="2007-2017 J-M Bell"
LICENSE="MIT"
REVISION="3"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libhubbub-$portVersion-src.tar.gz"
CHECKSUM_SHA256="066dffd127ead12da60050aa13b80891fb996d00197767d038e48ac163402780"
CHECKSUM_SHA256="e3f7e5cac0a14bf7de87782f3f6579d7e226be85de38e190ffc9e686362411ea"
SOURCE_DIR="libhubbub-$portVersion"
ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -42,7 +42,7 @@ BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
netsurf_buildsystem >= 0.5.0
netsurf_buildsystem >= 1.6
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:perl

View File

@@ -1,63 +0,0 @@
SUMMARY="An implementation of the W3C DOM"
DESCRIPTION="An implementation of the W3C DOM for NetSurf, written in C."
HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
COPYRIGHT="2007-2014 J-M Bell"
LICENSE="MIT"
REVISION="3"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libdom-$portVersion-src.tar.gz"
CHECKSUM_SHA256="1b1e8a940547cedfe718b3258de875837d2a4335f7498c7d555125211662c763"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
libdom$secondaryArchSuffix = $portVersion
lib:libdom$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
"
PROVIDES_devel="
libdom${secondaryArchSuffix}_devel = $portVersion
devel:libdom$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
libdom$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libexpat$secondaryArchSuffix
devel:libhubbub$secondaryArchSuffix
devel:libparserutils$secondaryArchSuffix
devel:libwapcaplet$secondaryArchSuffix
netsurf_buildsystem >= 1.5
xml_parser
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:perl
cmd:pkg_config$secondaryArchSuffix
"
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
}
INSTALL()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir install
prepareInstalledDevelLib libdom
fixPkgconfig
packageEntries devel $developDir
}
TEST()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test
}

View File

@@ -1,13 +1,13 @@
SUMMARY="An implementation of the W3C DOM"
DESCRIPTION="An implementation of the W3C DOM for NetSurf, written in C."
HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
COPYRIGHT="2007-2014 J-M Bell"
COPYRIGHT="2007-2017 J-M Bell"
LICENSE="MIT"
REVISION="2"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libdom-$portVersion-src.tar.gz"
CHECKSUM_SHA256="8a6c3eb8fcd9beb2e0df660caeb043dfff86632a00b8997cbcbef4a7f0c266ce"
CHECKSUM_SHA256="f16c76ffa71593b5cbb434e2496788480145ae675b48032f0de19acab1e867fd"
ARCHITECTURES="x86_gcc2 x86 x86_64"
ARCHITECTURES="?x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
@@ -32,7 +32,7 @@ BUILD_REQUIRES="
devel:libhubbub$secondaryArchSuffix
devel:libparserutils$secondaryArchSuffix
devel:libwapcaplet$secondaryArchSuffix
netsurf_buildsystem
netsurf_buildsystem >= 1.6
xml_parser
"
BUILD_PREREQUIRES="

View File

@@ -13,13 +13,13 @@ The principal use in a web browser is to restrict supercookies being set,
although it can also serve secondary purposes in the UI such as domain
highlighting"
HOMEPAGE="https://source.netsurf-browser.org/libnspsl.git/"
COPYRIGHT="2016 Vincent Sanders"
COPYRIGHT="2016-2017 Vincent Sanders"
LICENSE="MIT"
REVISION="2"
REVISION="1"
SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnspsl-$portVersion-src.tar.gz"
CHECKSUM_SHA256="be9030bdffa4135e95861465201e43f18f2cbba24555952aed7fa59b99ce6e74"
CHECKSUM_SHA256="c9031e564fa8a5c806801443bc7674b68a9a8e83dc2470d5ded965fe392c3572"
ARCHITECTURES="x86_gcc2 x86 x86_64"
ARCHITECTURES="?x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
@@ -40,7 +40,7 @@ REQUIRES_devel="
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
netsurf_buildsystem >= 1.5
netsurf_buildsystem >= 1.6
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix

View File

@@ -7,17 +7,16 @@ Whether you want to check your webmail, read the news or post to discussion \
forums, NetSurf is your lightweight gateway to the world wide web. Actively \
developed, NetSurf is continually evolving and improving."
HOMEPAGE="http://www.netsurf-browser.org/"
COPYRIGHT="2003-2016 The NetSurf Browser project"
COPYRIGHT="2003-2017 The NetSurf Browser project"
LICENSE="GNU GPL v2"
REVISION="7"
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="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-$portVersion-src.tar.gz"
CHECKSUM_SHA256="59ae4b50eff9e2a00a0a9742ef546c7de17223139c485af9644f195340979a9c"
CHECKSUM_SHA256="efc20a86a23ba1a966dc870f02b317d3f602e1bbb2e1b507608e34febfb37e16"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PATCHES="netsurf-3.6.patchset"
PROVIDES="
netsurf$secondaryArchSuffix = $portVersion

View File

@@ -1,63 +0,0 @@
From 743d9467f54a500543265f8a9c3917aed82f3b82 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 5 Feb 2017 09:31:55 +0100
Subject: BeOS: remove resources as separate files
Now bundled into the executable instead.
diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile
index 19ab43f..114578e 100644
--- a/frontends/beos/Makefile
+++ b/frontends/beos/Makefile
@@ -91,14 +91,7 @@ $(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS)
install-beos:
mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN)
- mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
@copyattr -d $(EXETARGET) $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/adblock.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/ca-bundle.txt $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/default.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL $(FRONTEND_RESOURCES_DIR)/SearchEngines $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
# ----------------------------------------------------------------------------
# Package target
--
2.7.0
From ff07d8f15b840619ac1aa98eaaf338412a0b8820 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 19 Aug 2017 21:50:33 +0200
Subject: gui_window_update_box: restore previous view
This can be called in the middle of other drawing operations. Make sure
to restore the context for them when done.
Fixes "No GC" error when resizing the window.
diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp
index 07d6af2..27f1404 100644
--- a/frontends/beos/window.cpp
+++ b/frontends/beos/window.cpp
@@ -1026,13 +1026,14 @@ static void gui_window_update_box(struct gui_window *g, const struct rect *rect)
if (!g->view->LockLooper())
return;
+ BView* oldView = nsbeos_current_gc();
nsbeos_current_gc_set(g->view);
//XXX +1 ??
g->view->Invalidate(BRect(rect->x0, rect->y0,
rect->x1 - 1, rect->y1 - 1));
- nsbeos_current_gc_set(NULL);
+ nsbeos_current_gc_set(oldView);
g->view->UnlockLooper();
}
--
2.7.0