mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
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
@@ -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"
|
||||
@@ -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
|
||||
"
|
||||
@@ -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"
|
||||
}
|
||||
@@ -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()
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user