netsurf: build on x86 and x86_64

* fix dependencies and build system
* check doesn't build correctly with haikuporter on x86_64 beause
of a Python bug (hard link extraction in tar files)
This commit is contained in:
Jerome Duval
2014-08-30 19:38:02 +00:00
parent 982571ec0d
commit 36e2c0ed6d
16 changed files with 504 additions and 140 deletions

View File

@@ -10,8 +10,8 @@ format.
HOMEPAGE="http://check.sourceforge.net/"
LICENSE="GNU LGPL v2.1"
REVISION="1"
ARCHITECTURES="x86_gcc2"
SRC_URI="http://sourceforge.net/projects/check/files/check/0.9.13/check-0.9.13.tar.gz"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SRC_URI="http://sourceforge.net/projects/check/files/check/$portVersion/check-$portVersion.tar.gz"
CHECKSUM_SHA256="ca6589c34f9c60ffd4c3e198ce581e944a9f040ca9352ed54068dd61bebb5cb7"
COPYRIGHT="xxx"
@@ -53,7 +53,12 @@ TEST()
make check
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
check_devel = $portVersion
devel:libcheck = $portVersion
"
"
REQUIRES_devel="
check == $portVersion base
"

View File

@@ -0,0 +1,67 @@
SUMMARY="Unit Testing Framework for C"
DESCRIPTION="
Check is a unit testing framework for C. It features a simple interface for \
defining unit tests, putting little in the way of the developer. Tests are \
run in a separate address space, so both assertion failures and code errors \
that cause segmentation faults or other signals can be caught. Test results \
are reportable in the following: Subunit, TAP, XML, and a generic logging \
format.
"
HOMEPAGE="http://check.sourceforge.net/"
LICENSE="GNU LGPL v2.1"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
# NOTE: on x86_64 haikuporter/python 2.7.6 cannot extract correctly the archive
# because it contains hard links. One has to extract manually, put flag.unpack
# build, then copy the packages. No source package can be produced.
SRC_URI="http://sourceforge.net/projects/check/files/check/$portVersion/check-$portVersion.tar.gz"
CHECKSUM_SHA256="c272624645b1b738cf57fd5d81a3e4d9b722b99d6133ee3f3c4007d4d279840a"
COPYRIGHT="xxx"
PROVIDES="
check = $portVersion
cmd:checkmk
lib:libcheck = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:awk
cmd:gcc
cmd:make
"
BUILD()
{
runConfigure ./configure
make
}
INSTALL()
{
make install
prepareInstalledDevelLib libcheck
fixPkgconfig libcheck
packageEntries devel $developDir
}
TEST()
{
make check
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
check_devel = $portVersion
devel:libcheck = $portVersion
"
REQUIRES_devel="
check == $portVersion base
"

View File

@@ -4,26 +4,24 @@ JSON-C implements a reference counting object model that allows you to easily \
construct JSON objects in C, output them as JSON formatted strings and parse \
JSON formatted strings back into the C representation of JSON objects.
"
SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/json-c-0.12-nodoc.tar.gz"
CHECKSUM_SHA256="6fd6d2311d610b279e1bcdd5c6d4f699700159d3e0786de8306af7b4bc94fb35"
HOMEPAGE="https://github.com/json-c/json-c/wiki"
ARCHITECTURES="x86_gcc2"
REVISION="1"
LICENSE="MIT"
COPYRIGHT="
2009-2012 Eric Haszlakiewicz
2004, 2005 Metaparadigm Pte Ltd
"
SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/json-c-0.12-nodoc.tar.gz"
CHECKSUM_SHA256="6fd6d2311d610b279e1bcdd5c6d4f699700159d3e0786de8306af7b4bc94fb35"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
json_c = $portVersion
lib:libjson_c = $portVersion
lib:libjson_c = 2.0.1 compat >= 2
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:aclocal
@@ -31,13 +29,15 @@ BUILD_PREREQUIRES="
cmd:gcc
cmd:libtool
cmd:make
"
"
SOURCE_DIR="json-c-$portVersion"
PATCHES="json_c-$portVersion.patchset"
BUILD()
{
sh autogen.sh
autoreconf -fi
runConfigure ./configure
make
}
@@ -56,9 +56,12 @@ TEST()
make check
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
json_c_devel = $portVersion
devel:libjson_c = $portVersion
devel:libjson_c = 2.0.1 compat >= 2
"
REQUIRES_devel="
json_c$secondaryArchSuffix == $portVersion base
"
REQUIRES_devel="json_c == $portVersion base"

View File

@@ -3,44 +3,41 @@ DESCRIPTION="
LibCSS is a CSS (Cascading Style Sheet) parser and selection engine.
"
HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
SRC_URI="http://download.netsurf-browser.org/libs/releases/libcss-0.3.0-src.tar.gz"
COPYRIGHT="2007-2014 J-M Bell"
LICENSE="MIT"
SRC_URI="http://download.netsurf-browser.org/libs/releases/libcss-$portVersion-src.tar.gz"
CHECKSUM_SHA256="4065dbfdfc9926e14a2f0f2c600fc72abac97bd20769ac6a908ac50226e95e1a"
REVISION="2"
LICENSE="MIT"
COPYRIGHT="2007-2014 J-M Bell"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
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
netsurf_buildsystem >= 0
devel:libiconv
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:perl
cmd:pkg_config$secondaryArchSuffix
netsurf_buildsystem >= 0
"
PATCHES="libcss-0.3.0.patchset"
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
@@ -50,10 +47,15 @@ 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 libcss
packageEntries devel $developDir
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}
TEST()
@@ -62,7 +64,12 @@ TEST()
LDFLAGS="-liconv -lwapcaplet -lparserutils"
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libcss${secondaryArchSuffix}_devel = $portVersion
devel:libcss$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
libcss$secondaryArchSuffix == $portVersion base
"

View File

@@ -9,7 +9,7 @@ REVISION="1"
LICENSE="MIT"
COPYRIGHT="2007-2014 J-M Bell"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
@@ -25,12 +25,12 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libiconv${secondaryArchSuffix}
netsurf_buildsystem >= 1.1
lib:libiconv${secondaryArchSuffix}
"
BUILD_PREREQUIRES="
netsurf_buildsystem >= 1.1
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make

View File

@@ -11,7 +11,7 @@ REVISION="2"
LICENSE="MIT"
COPYRIGHT="2009-2014 The NetSurf Browser project"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="

View File

@@ -1,11 +1,25 @@
#FIXME: Appending installation info to /packages/html_parser-3.70-1/.self/lib/perl5/5.18.1/BePC-haiku/perllocal.pod
#FIXME: Warning: prerequisite HTML::Tagset 3 not found.
SUMMARY="Encode or decode strings with HTML entities"
DESCRIPTION="
The HTML-Parser distribution is is a collection of perl modules that parse and \
extract information from HTML documents.
"
HOMEPAGE="http://search.cpan.org/~gaas/HTML-Parser/"
SRC_URI="https://github.com/gisle/html-parser/archive/3.71.tar.gz"
COPYRIGHT="
1995-2009 Gisle Aas. All rights reserved.
1999-2000 Michael A. Chase. All rights reserved.
"
LICENSE="
GNU GPL v1
Artistic (Perl)
"
SRC_URI="https://github.com/gisle/html-parser/archive/$portVersion.tar.gz"
SRC_FILENAME="html_parser-$portVersion.tar.gz"
CHECKSUM_SHA256="0ef2ec6ed99f80a344ce3bc93d5eff6dd8613f4a544fa4ffe44a823cfd19b851"
REVISION="1"
ARCHITECTURES="x86 x86_gcc2"
REVISION="2"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
html_parser = $portVersion
"
@@ -13,32 +27,24 @@ REQUIRES="
haiku >= $haikuVersion
perl
"
COPYRIGHT="
1995-2009 Gisle Aas. All rights reserved.
1999-2000 Michael A. Chase. All rights reserved.
"
LICENSE="
GNU GPL v1
Artistic (Perl)
"
BUILD_REQUIRES="
haiku_devel >= $haikuVersion
"
BUILD_PREREQUIRES="
cmd:gcc
cmd:make
cmd:perl"
cmd:perl
"
SOURCE_DIR="html-parser-3.71"
BUILD() {
SOURCE_DIR="html-parser-$portVersion"
BUILD()
{
perl Makefile.PL PREFIX=$prefix
make
}
INSTALL() {
INSTALL()
{
make install
}
DESCRIPTION="
The HTML-Parser distribution is is a collection of perl modules that parse and \
extract information from HTML documents.
"

View File

@@ -9,7 +9,7 @@ REVISION="1"
COPYRIGHT="1998-2000 Larry Wall and Clark Cooper. All rights reserved."
LICENSE="Artistic (Perl)"
ARCHITECTURES="x86 x86_gcc2"
ARCHITECTURES="x86 x86_gcc2 x86_64"
PROVIDES="
xml_parser = $portVersion
@@ -23,9 +23,12 @@ REQUIRES="
BUILD_REQUIRES="
haiku_devel >= $haikuVersion
devel:libexpat
"
BUILD_PREREQUIRES="
cmd:gcc
cmd:make
cmd:perl"
cmd:perl
"
SOURCE_DIR="XML-Parser-2.36"

View File

@@ -9,7 +9,7 @@ REVISION="1"
LICENSE="MIT"
COPYRIGHT="2009 - 2013 The NetSurf Browser project"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="

View File

@@ -1,23 +1,30 @@
DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats"
SUMMARY="A decoding library for BMP and ICO images"
HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/"
SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-0.1.1-src.tar.gz"
HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/"
COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox"
LICENSE="MIT"
SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-$portVersion-src.tar.gz"
CHECKSUM_SHA256="584046809d3213e5917cd26eafb03068ca94274229f595f0e0520b15fa454f98"
REVISION="1"
ARCHITECTURES="x86_gcc2"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="libnsbmp-$portVersion.patchset"
PROVIDES="
libnsbmp = $portVersion
"
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_REQUIRES="
netsurf_buildsystem
"
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
netsurf_buildsystem
cmd:gcc
cmd:make
"
"
PATCHES="libnsbmp-0.1.1.patchset"
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
@@ -29,14 +36,19 @@ INSTALL()
INCLUDEDIR=$relativeIncludeDir install
prepareInstalledDevelLib libnsbmp
fixPkgconfig libnsbmp
packageEntries devel $developDir
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}
LICENSE="MIT"
COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox"
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libnsbmp_devel = $portVersion
devel:libnsbmp = $portVersion
"
"
REQUIRES_devel="
libnsbmp$secondaryArchSuffix == $portVersion base
"

View File

@@ -1,23 +1,30 @@
DESCRIPTION="Libnsgif is a decoding library for GIF image file format"
SUMMARY="A decoding library for GIF images"
HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/"
SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsgif-0.1.1-src.tar.gz"
COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox"
LICENSE="MIT"
SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsgif-$portVersion-src.tar.gz"
CHECKSUM_SHA256="d450ea0a9da234486e997248b30a86524f75f1021ca67017b5597423cf6c0a15"
REVISION="1"
ARCHITECTURES="x86_gcc2"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="libnsgif-$portVersion.patchset"
PROVIDES="
libnsgif = $portVersion
"
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_REQUIRES="
netsurf_buildsystem
"
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
netsurf_buildsystem
cmd:gcc
cmd:make
"
"
PATCHES="libnsgif-0.1.1.patchset"
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
@@ -29,14 +36,19 @@ INSTALL()
INCLUDEDIR=$relativeIncludeDir install
prepareInstalledDevelLib libnsgif
fixPkgconfig libnsgif
packageEntries devel $developDir
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}
LICENSE="MIT"
COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox"
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libnsgif_devel = $portVersion
devel:libnsgif = $portVersion
"
"
REQUIRES_devel="
libnsgif$secondaryArchSuffix == $portVersion base
"

View File

@@ -5,28 +5,34 @@ 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"
SRC_URI="http://download.netsurf-browser.org/libs/releases/libsvgtiny-0.1.1-src.tar.gz"
COPYRIGHT="2003-2014 The NetSurf Developers"
LICENSE="MIT"
SRC_URI="http://download.netsurf-browser.org/libs/releases/libsvgtiny-$portVersion-src.tar.gz"
CHECKSUM_SHA256="0835de639ae0266c394824fa78dc210013c5eeddef222d8b6485edb7fe0ddcd6"
REVISION="1"
ARCHITECTURES="x86_gcc2"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="libsvgtiny-$portVersion.patchset"
PROVIDES="
libsvgtiny = $portVersion
"
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_REQUIRES="
devel:libwapcaplet
devel:libdom
netsurf_buildsystem
"
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
netsurf_buildsystem
cmd:gcc
gperf
cmd:gperf
cmd:make
cmd:pkg_config
"
PATCHES="libsvgtiny-0.1.1.patchset"
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
@@ -39,13 +45,19 @@ INSTALL()
INCLUDEDIR=$relativeIncludeDir install
prepareInstalledDevelLib libsvgtiny
fixPkgconfig libsvgtiny
packageEntries devel $developDir
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}
LICENSE="MIT"
COPYRIGHT="2003-2014 The NetSurf Developers"
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libsvgtiny_devel = $portVersion
devel:libsvgtiny = $portVersion
"
"
REQUIRES_devel="
libsvgtiny$secondaryArchSuffix == $portVersion base
"

View File

@@ -9,37 +9,39 @@ 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/"
SRC_URI="http://download.netsurf-browser.org/libs/releases/libhubbub-0.3.0-src.tar.gz"
HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
LICENSE="MIT"
COPYRIGHT="2007-2014 J-M Bell"
SRC_URI="http://download.netsurf-browser.org/libs/releases/libhubbub-$portVersion-src.tar.gz"
CHECKSUM_SHA256="dbf3b55bf2531d2a8e70f370a9b396cc78bfd5a092f87beb10b05c04fd7cdaa7"
REVISION="1"
ARCHITECTURES="x86_gcc2"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
libhubbub = $portVersion
lib:libhubbub = $portVersion
hubbub = $portVersion
lib:libhubbub = $portVersion compat >= 0
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_REQUIRES="
netsurf_buildsystem >= 0.3.0
devel:libparserutils
devel:libjson_c
devel:libiconv
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
netsurf_buildsystem >= 0.3.0
cmd:gcc
cmd:make
cmd:perl
cmd:pkg_config
"
PATCHES="libhubbub-0.3.0.patchset"
PATCHES="libhubbub-$portVersion.patchset"
SOURCE_DIR="libhubbub-$portVersion"
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
@@ -65,10 +67,12 @@ TEST()
LDFLAGS="-liconv -lparserutils" test
}
LICENSE="MIT"
COPYRIGHT="2007-2014 J-M Bell"
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libhubbub_devel = $portVersion
devel:libhubbub = $portVersion
hubbub_devel = $portVersion
devel:libhubbub = $portVersion compat >= 0
"
REQUIRES_devel="
hubbub$secondaryArchSuffix == $portVersion base
"

View File

@@ -1,15 +1,22 @@
SUMMARY="LibDOM is 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/"
HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
LICENSE="MIT"
COPYRIGHT="2007-2014 J-M Bell"
SRC_URI="http://download.netsurf-browser.org/libs/releases/libdom-0.1.0-src.tar.gz"
CHECKSUM_SHA256="235fde8bcfcf71e325c1344acfb995d5d59e1d8ebfcb9c87c1aefd1a08c8fae6"
REVISION="1"
ARCHITECTURES="x86_gcc2"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="libdom-$portVersion.patchset"
PROVIDES="
libdom = $portVersion
"
lib:libdom = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
devel:libexpat
devel:libhubbub
@@ -17,7 +24,7 @@ BUILD_REQUIRES="
devel:libwapcaplet
netsurf_buildsystem
xml_parser
"
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
@@ -25,9 +32,8 @@ BUILD_PREREQUIRES="
cmd:make
cmd:perl
cmd:pkg_config
"
"
PATCHES="libdom-0.1.0.patchset"
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
@@ -48,10 +54,12 @@ TEST()
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test
}
LICENSE="MIT"
COPYRIGHT="2007-2014 J-M Bell"
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libdom_devel = $portVersion
devel:libdom = $portVersion
"
REQUIRES_devel="
libdom$secondaryArchSuffix == $portVersion base
"

View File

@@ -9,19 +9,29 @@ 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/"
# Do NOT use the netsurf-all package. It contains a bunch of subprojects which
# we build as separate packages. NetSurf is statically linked to them, so the
# resulting binary is the same.
SRC_URI="http://git.netsurf-browser.org/netsurf.git/snapshot/release/3.1.tar.gz"
CHECKSUM_SHA256="e2d4f7879762008b8e0c415e927a0a07f86f2e614f5e8659aa558471843e7490"
REVISION="1"
ARCHITECTURES="x86_gcc2"
COPYRIGHT="2003-2014 The NetSurf Browser project"
LICENSE="GNU GPL v2"
SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-$portVersion-src.tar.gz"
CHECKSUM_SHA256="1ef12b2e2bc68f9eff8465646b7359e3cb483e1042aed750cc283a70dd4c540c"
REVISION="2"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="netsurf-$portVersion.patchset"
PROVIDES="
netsurf = $portVersion
app:NetSurf = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
lib:libcurl
lib:libexpat
lib:libiconv
lib:libpng
lib:libjpeg
"
lib:libssl
lib:libz
"
BUILD_REQUIRES="
haiku_devel >= $haikuVersion
devel:libcurl
@@ -53,26 +63,15 @@ BUILD_PREREQUIRES="
cmd:pkg_config
"
PROVIDES="
netsurf = $portVersion
app:NetSurf = $portVersion
"
SOURCE_DIR="release/$portVersion"
PATCHES="netsurf-3.1.patchset"
BUILD()
{
make TARGET=beos PREFIX=$prefix/ DESTDIR=$appsDir/ \
make PREFIX=$prefix/ DESTDIR=$appsDir/ \
NETSURF_BEOS_BIN=netsurf/ NETSURF_BEOS_RESOURCES=netsurf/res/
}
INSTALL()
{
make TARGET=beos PREFIX=$prefix/ DESTDIR=$appsDir/ \
make PREFIX=$prefix/ DESTDIR=$appsDir/ \
NETSURF_BEOS_BIN=netsurf/ NETSURF_BEOS_RESOURCES=netsurf/res/ install
addAppDeskbarSymlink $appsDir/netsurf/NetSurf NetSurf
}
LICENSE="GNU GPL v2"
COPYRIGHT="2003-2014 The NetSurf Browser project"

View File

@@ -1,4 +1,4 @@
From e461303c7a9f1c6e71ec10e9e0d910e897f493f5 Mon Sep 17 00:00:00 2001
From 5eba735be6cfdd28056a7e10028a6e43d520b62d Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 9 Jun 2014 21:44:48 +0200
Subject: Fix include path for 3.1 release.
@@ -21,7 +21,7 @@ index cd8070e..2483a22 100644
1.8.3.4
From e00ad71338b86fde1cecf9b6cfc65676e3d2f153 Mon Sep 17 00:00:00 2001
From 0ca5cc927067cbbc43fc14c2753bea6a80d7e629 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 20 Jun 2014 13:23:22 +0200
Subject: Use PathFinder to locate resource folder.
@@ -80,3 +80,229 @@ index 365a356..caa6ef4 100644
--
1.8.3.4
From 10221eb8e3326f1fc7db289a88d3962097ded3fd Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 30 Aug 2014 17:08:21 +0000
Subject: let's find libcss
diff --git a/Makefile b/Makefile
index 4f9380a..58a3fd6 100644
--- a/Makefile
+++ b/Makefile
@@ -200,7 +200,7 @@ else
CC := gcc
CXX := g++
EXEEXT :=
- PKG_CONFIG :=
+ PKG_CONFIG := pkg-config
#endif
else
ifeq ($(TARGET),windows)
diff --git a/beos/Makefile.target b/beos/Makefile.target
index ed7532d..26ac998 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -79,6 +79,11 @@ else
$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF))
$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG ))
endif
+$(eval $(call pkg_config_find_and_add,libcss,CSS))
+$(eval $(call pkg_config_find_and_add,libdom,DOM))
+$(eval $(call pkg_config_find_and_add,libhubbub,Hubbub))
+$(eval $(call pkg_config_find_and_add,openssl,OpenSSL))
+$(eval $(call pkg_config_find_and_add,libcurl,Curl ))
# ----------------------------------------------------------------------------
# Source file setup
--
1.8.3.4
From 62d67afbfcd0a586107b1ce104ba7d40cd79a1c0 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 30 Aug 2014 17:42:55 +0000
Subject: declaration of 'BRect frame' shadows a parameter
diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp
index 35153b3..0df5365 100644
--- a/beos/scaffolding.cpp
+++ b/beos/scaffolding.cpp
@@ -186,12 +186,12 @@ private:
const BBitmap *fIconBitmap;
};
-NSIconTextControl::NSIconTextControl(BRect frame, const char* name,
+NSIconTextControl::NSIconTextControl(BRect _frame, const char* name,
const char* label, const char* initialText,
BMessage* message,
uint32 resizeMode,
uint32 flags)
- : BTextControl(frame, name, label, initialText, message, resizeMode, flags),
+ : BTextControl(_frame, name, label, initialText, message, resizeMode, flags),
fIconOffset(0,0),
fIconBitmap(NULL)
{
--
1.8.3.4
From 563da3f7cd533d395ac3b6a45d7828ffbd5b45bf Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 30 Aug 2014 17:47:22 +0000
Subject: fix Haiku case
diff --git a/Makefile b/Makefile
index 58a3fd6..36b8380 100644
--- a/Makefile
+++ b/Makefile
@@ -61,10 +61,6 @@ else
ifeq ($(HOST),BeOS)
HOST := beos
endif
- ifeq ($(HOST),Haiku)
- # Haiku implements the BeOS API
- HOST := beos
- endif
ifeq ($(HOST),beos)
# Build happening on BeOS platform, default target is BeOS backend
ifeq ($(TARGET),)
@@ -100,11 +96,18 @@ else
TARGET := windows
endif
endif
-
+ ifeq ($(HOST),Haiku)
+ # Build happening on Haiku platform, default target is BeOS backend
+ ifeq ($(TARGET),)
+ TARGET := beos
+ endif
+ endif
+
# Default target is GTK backend
ifeq ($(TARGET),)
TARGET := gtk
endif
+
endif
endif
endif
@@ -194,14 +197,11 @@ ifeq ($(TARGET),riscos)
else
ifeq ($(TARGET),beos)
# Building for BeOS/Haiku
- #ifeq ($(HOST),beos)
- # Build for BeOS on BeOS
- GCCSDK_INSTALL_ENV := /boot/develop
- CC := gcc
- CXX := g++
- EXEEXT :=
- PKG_CONFIG := pkg-config
- #endif
+ GCCSDK_INSTALL_ENV := /boot/develop
+ CC := gcc
+ CXX := g++
+ EXEEXT :=
+ PKG_CONFIG := pkg-config
else
ifeq ($(TARGET),windows)
ifneq ($(HOST),windows)
diff --git a/beos/Makefile.target b/beos/Makefile.target
index 26ac998..2beaa46 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -38,12 +38,8 @@ ifeq ($(HOST),beos)
ifneq ($(wildcard /boot/develop/lib/*/libzeta.so),)
LDFLAGS += -lzeta
endif
- ifneq ($(wildcard /boot/develop/lib/*/libnetwork.so),)
+ ifeq ($(HOST),Haiku)
# Haiku
- CFLAGS += -I/boot/common/include \
- -I/boot/common/include/hubbub \
- -I/boot/common/include/libcss \
- -I/boot/common/include/parserutils
NETLDFLAGS := -lnetwork
else
ifneq ($(wildcard /boot/develop/lib/*/libbind.so),)
@@ -72,18 +68,19 @@ ifeq ($(HOST),beos)
$(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif)))
$(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) ))
else
+ NETLDFLAGS := -lnetwork
NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
+endif
$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP))
$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF))
$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG ))
-endif
-$(eval $(call pkg_config_find_and_add,libcss,CSS))
-$(eval $(call pkg_config_find_and_add,libdom,DOM))
-$(eval $(call pkg_config_find_and_add,libhubbub,Hubbub))
-$(eval $(call pkg_config_find_and_add,openssl,OpenSSL))
-$(eval $(call pkg_config_find_and_add,libcurl,Curl ))
+ $(eval $(call pkg_config_find_and_add,libcss,CSS))
+ $(eval $(call pkg_config_find_and_add,libdom,DOM))
+ $(eval $(call pkg_config_find_and_add,libhubbub,Hubbub))
+ $(eval $(call pkg_config_find_and_add,openssl,OpenSSL))
+ $(eval $(call pkg_config_find_and_add,libcurl,Curl ))
# ----------------------------------------------------------------------------
# Source file setup
--
1.8.3.4
From 542734b11d256a596eb1735cdac273f90a70d865 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 30 Aug 2014 19:29:14 +0000
Subject: x86_64 fixes
diff --git a/beos/filetype.cpp b/beos/filetype.cpp
index d5bd3d7..a3bcddb 100644
--- a/beos/filetype.cpp
+++ b/beos/filetype.cpp
@@ -72,7 +72,7 @@ void beos_fetch_filetype_init(void)
continue;
}
// the mime db doesn't know about it yet
- BMessage extensions(0UL);
+ BMessage extensions((uint32)0UL);
if (default_types[i].ext1)
extensions.AddString("extensions", default_types[i].ext1);
if (default_types[i].ext2)
diff --git a/beos/window.cpp b/beos/window.cpp
index 8975c18..af736b8 100644
--- a/beos/window.cpp
+++ b/beos/window.cpp
@@ -1288,7 +1288,7 @@ void gui_get_clipboard(char **buffer, size_t *length)
clip = be_clipboard->Data();
if (clip) {
const char *text;
- int32 textlen;
+ ssize_t textlen;
if (clip->FindData("text/plain", B_MIME_TYPE,
(const void **)&text, &textlen) >= B_OK) {
*buffer = (char *)malloc(textlen);
diff --git a/utils/talloc.c b/utils/talloc.c
index 44b65aa..408e94b 100644
--- a/utils/talloc.c
+++ b/utils/talloc.c
@@ -55,7 +55,7 @@
#include "replace.h"
#else
#include <stdarg.h>
-#if !defined(__BEOS__) && !defined(__HAIKU__) && __GNUC__ > 2
+#if !defined(__BEOS__) && __GNUC__ > 2
/* Assume we've got va_copy */
#define HAVE_VA_COPY
#include <string.h>
--
1.8.3.4