diff --git a/dev-libs/libcss/libcss-0.9.0.recipe b/dev-libs/libcss/libcss-0.9.1.recipe similarity index 92% rename from dev-libs/libcss/libcss-0.9.0.recipe rename to dev-libs/libcss/libcss-0.9.1.recipe index 277b2355b..6e4263779 100644 --- a/dev-libs/libcss/libcss-0.9.0.recipe +++ b/dev-libs/libcss/libcss-0.9.1.recipe @@ -6,7 +6,7 @@ COPYRIGHT="2007-2018 The NetSurf Developers" LICENSE="MIT" REVISION="1" SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libcss-$portVersion-src.tar.gz" -CHECKSUM_SHA256="b98fba7664bd5307cb39a6101098da76f635a97e157b87f45e9ce42ada9089ef" +CHECKSUM_SHA256="d2dce16e93392e8d6a7209420d47c2d56a3811701a0e81a724fc541c63d3c6dc" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -36,10 +36,10 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libiconv$secondaryArchSuffix devel:libparserutils$secondaryArchSuffix >= 0.2.4 - devel:libwapcaplet$secondaryArchSuffix >= 0.4.2 + devel:libwapcaplet$secondaryArchSuffix >= 0.4.3 " BUILD_PREREQUIRES=" - netsurf_buildsystem >= 1.8 + netsurf_buildsystem >= 1.9 cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/dev-libs/libnslog/libnslog-0.1.2.recipe b/dev-libs/libnslog/libnslog-0.1.3.recipe similarity index 91% rename from dev-libs/libnslog/libnslog-0.1.2.recipe rename to dev-libs/libnslog/libnslog-0.1.3.recipe index e3224c9f8..0cbddd6a7 100644 --- a/dev-libs/libnslog/libnslog-0.1.2.recipe +++ b/dev-libs/libnslog/libnslog-0.1.3.recipe @@ -3,11 +3,11 @@ 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-2018 Vincent Sanders" +COPYRIGHT="2014-2020 Vincent Sanders" LICENSE="MIT" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libnslog-$portVersion-src.tar.gz" -CHECKSUM_SHA256="4d12d836efd55a87e4f6429aa5527e1e15526fa4cac58b7879cba1db7737fabd" +CHECKSUM_SHA256="fc98dca9d7efa67096470a5d96c023146e25bfdec08c0db74661c7b4db0453d0" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -35,7 +35,7 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - netsurf_buildsystem >= 1.6 + netsurf_buildsystem >= 1.9 cmd:bison cmd:flex cmd:gcc$secondaryArchSuffix diff --git a/dev-libs/libnsutils/libnsutils-0.0.5.recipe b/dev-libs/libnsutils/libnsutils-0.1.0.recipe similarity index 90% rename from dev-libs/libnsutils/libnsutils-0.0.5.recipe rename to dev-libs/libnsutils/libnsutils-0.1.0.recipe index 8b7e6dd29..fff595606 100644 --- a/dev-libs/libnsutils/libnsutils-0.0.5.recipe +++ b/dev-libs/libnsutils/libnsutils-0.1.0.recipe @@ -2,11 +2,11 @@ SUMMARY="NetSurf generalised utility library" DESCRIPTION="Various things useful to the NetSurf browser, and possibly to \ other applications." HOMEPAGE="https://git.netsurf-browser.org/libnsutils.git/" -COPYRIGHT="2014-2018 Vincent Sanders" +COPYRIGHT="2014-2020 Vincent Sanders" LICENSE="MIT" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libnsutils-$portVersion-src.tar.gz" -CHECKSUM_SHA256="0e3b7a19f4348f25a1cac514bebfdc941e044dab9dcb1cb9c131067d7bcc8127" +CHECKSUM_SHA256="790c6516344abe82f6289d656392e9ccebe475b20cc7e1e2d843011385f7aef0" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -34,7 +34,7 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - netsurf_buildsystem + netsurf_buildsystem >= 1.9 cmd:gcc$secondaryArchSuffix cmd:make " diff --git a/dev-libs/libutf8proc/libutf8proc2-2.4.0.2.recipe b/dev-libs/libutf8proc/libutf8proc2-2.5.0.recipe similarity index 78% rename from dev-libs/libutf8proc/libutf8proc2-2.4.0.2.recipe rename to dev-libs/libutf8proc/libutf8proc2-2.5.0.recipe index 26d11c6ce..2dc0db56a 100644 --- a/dev-libs/libutf8proc/libutf8proc2-2.4.0.2.recipe +++ b/dev-libs/libutf8proc/libutf8proc2-2.5.0.recipe @@ -1,23 +1,23 @@ 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." +encoding, supporting Unicode version 13." HOMEPAGE="https://julialang.org/utf8proc/" -COPYRIGHT="2006-2019 Public Software Group - 2014-2019 Steven G. Johnson, Jiahao Chen, Tony Kelman, Jonas Fonseca, \ +COPYRIGHT="2006-2020 Public Software Group + 2014-2020 Steven G. Johnson, Jiahao Chen, Tony Kelman, Jonas Fonseca, \ and other contributors listed in the git history" LICENSE="MIT" REVISION="1" -SOURCE_URI="https://github.com/JuliaStrings/utf8proc/archive/v2.4.0.tar.gz" -CHECKSUM_SHA256="b2e5d547c1d94762a6d03a7e05cea46092aab68636460ff8648f1295e2cdfbd7" -SOURCE_FILENAME="utf8proc-2.4.0.tar.gz" -SOURCE_DIR="utf8proc-2.4.0" +SOURCE_URI="https://github.com/JuliaStrings/utf8proc/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="d4e8dfc898cfd062493cb7f42d95d70ccdd3a4cd4d90bec0c71b47cca688f1be" +SOURCE_FILENAME="utf8proc-$portVersion.tar.gz" +SOURCE_DIR="utf8proc-$portVersion" PATCHES="libutf8proc2-2.4.0.patchset" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -libVersion="2.3.1" +libVersion="2.3.2" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -85,5 +85,5 @@ EOF TEST() { cd build_haiku -# make check # test cases not supported yet with cmake + make check # test cases not supported yet with cmake } diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.2.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.4.3.recipe similarity index 90% rename from dev-libs/libwapcaplet/libwapcaplet-0.4.2.recipe rename to dev-libs/libwapcaplet/libwapcaplet-0.4.3.recipe index befbdecc9..8ad262ded 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.4.2.recipe +++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.3.recipe @@ -3,11 +3,11 @@ DESCRIPTION="LibWapcaplet is a string internment library. It provides reference counted string interment and rapid string comparison \ functionality." HOMEPAGE="https://www.netsurf-browser.org/projects/libwapcaplet/" -COPYRIGHT="2009-2019 The NetSurf Browser project" +COPYRIGHT="2009-2020 The NetSurf Browser project" LICENSE="MIT" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libwapcaplet-$portVersion-src.tar.gz" -CHECKSUM_SHA256="063d248ab3f206808c414934a105f6cb6426e2f0baf3bdd20a712179ecfa5cba" +CHECKSUM_SHA256="9b2aa1dd6d6645f8e992b3697fdbd87f0c0e1da5721fa54ed29b484d13160c5c" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="?x86_gcc2 x86" @@ -33,7 +33,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - netsurf_buildsystem >= 1.8 + netsurf_buildsystem >= 1.9 devel:libcheck$secondaryArchSuffix lib:libcheck$secondaryArchSuffix " diff --git a/dev-libs/nsgenbind/nsgenbind-0.7.recipe b/dev-libs/nsgenbind/nsgenbind-0.8.recipe similarity index 86% rename from dev-libs/nsgenbind/nsgenbind-0.7.recipe rename to dev-libs/nsgenbind/nsgenbind-0.8.recipe index 952dda7e4..247c29e67 100644 --- a/dev-libs/nsgenbind/nsgenbind-0.7.recipe +++ b/dev-libs/nsgenbind/nsgenbind-0.8.recipe @@ -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="https://git.netsurf-browser.org/nsgenbind.git/" -COPYRIGHT="2012-2019 Vincent Sanders" +COPYRIGHT="2012-2020 Vincent Sanders" LICENSE="MIT" REVISION="1" SOURCE_URI="https://download.netsurf-browser.org/libs/releases/nsgenbind-$portVersion-src.tar.gz" -CHECKSUM_SHA256="18632ea90fc98984771b4996a2f4fc06bd5f1bab33bf0379e4523b45fcacf466" +CHECKSUM_SHA256="4d8d53ad000ada712772365e6a73eb8fc5ce97584af9c865ac5b26a2187f1cb3" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -21,7 +21,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - netsurf_buildsystem >= 1.8 + netsurf_buildsystem >= 1.9 " BUILD_PREREQUIRES=" cmd:bison diff --git a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.8.recipe b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.8.recipe deleted file mode 100644 index 81852cdb8..000000000 --- a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.8.recipe +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY="NetSurf build framework" -DESCRIPTION="NetSurf build framework for compiling some of their libraries." -HOMEPAGE="https://git.netsurf-browser.org/buildsystem.git/" -COPYRIGHT="2009-2019 The NetSurf Browser project" -LICENSE="MIT" -REVISION="1" -SOURCE_URI="https://download.netsurf-browser.org/libs/releases/buildsystem-$portVersion.tar.gz" -SOURCE_FILENAME="netsurf-buildsystem-$portVersion.tar.gz" -SOURCE_DIR="buildsystem-$portVersion" -CHECKSUM_SHA256="e6a324e7c5965ca032d3196adddd6fd986b5f47c0e6340a646d0d23e3597cd39" - -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 -} diff --git a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.7.recipe b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.9.recipe similarity index 83% rename from dev-util/netsurf_buildsystem/netsurf_buildsystem-1.7.recipe rename to dev-util/netsurf_buildsystem/netsurf_buildsystem-1.9.recipe index c2183da9b..cddf1e5f4 100644 --- a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.7.recipe +++ b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.9.recipe @@ -1,13 +1,13 @@ SUMMARY="NetSurf build framework" DESCRIPTION="NetSurf build framework for compiling some of their libraries." HOMEPAGE="https://git.netsurf-browser.org/buildsystem.git/" -COPYRIGHT="2009-2018 The NetSurf Browser project" +COPYRIGHT="2009-2020 The NetSurf Browser project" LICENSE="MIT" REVISION="1" SOURCE_URI="https://download.netsurf-browser.org/libs/releases/buildsystem-$portVersion.tar.gz" -CHECKSUM_SHA256="1cd6453301cd88c4dcc36ae67c67d2023b8a56ec2fd0704851b58ccdbc5243e0" SOURCE_FILENAME="netsurf-buildsystem-$portVersion.tar.gz" SOURCE_DIR="buildsystem-$portVersion" +CHECKSUM_SHA256="93841e314a688209a20b8745f065393f3a90f01be68f45e96bc8d2f4a2aa9a2a" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes" diff --git a/media-libs/libnsbmp/libnsbmp-0.1.5.recipe b/media-libs/libnsbmp/libnsbmp-0.1.6.recipe similarity index 89% rename from media-libs/libnsbmp/libnsbmp-0.1.5.recipe rename to media-libs/libnsbmp/libnsbmp-0.1.6.recipe index 2c8806ece..50db930fe 100644 --- a/media-libs/libnsbmp/libnsbmp-0.1.5.recipe +++ b/media-libs/libnsbmp/libnsbmp-0.1.6.recipe @@ -1,11 +1,11 @@ SUMMARY="A decoding library for BMP and ICO images" DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats" HOMEPAGE="https://www.netsurf-browser.org/projects/libnsbmp/" -COPYRIGHT="2003-2018 The NetSurf Developers" +COPYRIGHT="2003-2020 The NetSurf Developers" LICENSE="MIT" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libnsbmp-$portVersion-src.tar.gz" -CHECKSUM_SHA256="65cc0d81727e2ece417b7997ba2451309f07a4e5932e52019a20867640152b52" +CHECKSUM_SHA256="79c49365f860ed451bfc4109eddec8de3e9b7ce5a3be069596bd2aa19279324f" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -33,7 +33,7 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - netsurf_buildsystem + netsurf_buildsystem >= 1.9 cmd:gcc$secondaryArchSuffix cmd:make " diff --git a/net-libs/hubbub/hubbub-0.3.6.recipe b/net-libs/hubbub/hubbub-0.3.7.recipe similarity index 93% rename from net-libs/hubbub/hubbub-0.3.6.recipe rename to net-libs/hubbub/hubbub-0.3.7.recipe index d5ae4aba6..af2dfb099 100644 --- a/net-libs/hubbub/hubbub-0.3.6.recipe +++ b/net-libs/hubbub/hubbub-0.3.7.recipe @@ -9,12 +9,12 @@ 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="https://www.netsurf-browser.org/projects/hubbub/" -COPYRIGHT="2007-2019 J-M Bell" +COPYRIGHT="2007-2020 J-M Bell" LICENSE="MIT" REVISION="1" SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libhubbub-$portVersion-src.tar.gz" SOURCE_DIR="libhubbub-$portVersion" -CHECKSUM_SHA256="d756c795c1a0e08beec4acd68364ac4477960d62fffa3b60da05f5a7763f7bf4" +CHECKSUM_SHA256="9e7ae253e6c9069e757eb9ad4e4846f38b4db52c0ca0151446a9fa4a977735b6" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -46,7 +46,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel - netsurf_buildsystem >= 1.8 + netsurf_buildsystem >= 1.9 cmd:gcc$secondaryArchSuffix cmd:make cmd:perl diff --git a/net-libs/libdom/libdom-0.4.0.recipe b/net-libs/libdom/libdom-0.4.1.recipe similarity index 88% rename from net-libs/libdom/libdom-0.4.0.recipe rename to net-libs/libdom/libdom-0.4.1.recipe index 6be48ba0b..6243493d9 100644 --- a/net-libs/libdom/libdom-0.4.0.recipe +++ b/net-libs/libdom/libdom-0.4.1.recipe @@ -1,11 +1,11 @@ SUMMARY="An implementation of the W3C DOM" DESCRIPTION="An implementation of the W3C DOM for NetSurf, written in C." HOMEPAGE="https://www.netsurf-browser.org/projects/libdom/" -COPYRIGHT="2007-2019 J-M Bell" +COPYRIGHT="2007-2020 J-M Bell" LICENSE="MIT" REVISION="1" SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libdom-$portVersion-src.tar.gz" -CHECKSUM_SHA256="9eb9cd308136d5078fd9a342f391ef65071e8660a0ea29d50cb41d37a8c6b3c7" +CHECKSUM_SHA256="98ee072471e55e208c9878e515c410ad462ca36f87b4afcbecad023f3a2cef4a" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -36,16 +36,16 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libexpat$secondaryArchSuffix - devel:libhubbub$secondaryArchSuffix >= 0.3.6 + devel:libhubbub$secondaryArchSuffix >= 0.3.7 devel:libparserutils$secondaryArchSuffix >= 0.2.4 - devel:libwapcaplet$secondaryArchSuffix >= 0.4.2 + devel:libwapcaplet$secondaryArchSuffix >= 0.4.3 " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:make cmd:perl cmd:pkg_config$secondaryArchSuffix - netsurf_buildsystem >= 1.8 + netsurf_buildsystem >= 1.9 xml_parser " diff --git a/net-libs/libnspsl/libnspsl-0.1.5.recipe b/net-libs/libnspsl/libnspsl-0.1.6.recipe similarity index 92% rename from net-libs/libnspsl/libnspsl-0.1.5.recipe rename to net-libs/libnspsl/libnspsl-0.1.6.recipe index e1ca4363f..99cf7bb9d 100644 --- a/net-libs/libnspsl/libnspsl-0.1.5.recipe +++ b/net-libs/libnspsl/libnspsl-0.1.6.recipe @@ -13,11 +13,11 @@ 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-2019 Vincent Sanders" +COPYRIGHT="2016-2020 Vincent Sanders" LICENSE="MIT" REVISION="1" SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libnspsl-$portVersion-src.tar.gz" -CHECKSUM_SHA256="cdc54dacc20cfdadb799b8b4a9ffe0a1b62ba39ab060c35d8ae5eceee447386a" +CHECKSUM_SHA256="d3c58205cb78d310bf81ca55347a2d098719cecac7046bc367983b138b45020b" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="?x86_gcc2 x86" @@ -43,7 +43,7 @@ REQUIRES_devel=" BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel - netsurf_buildsystem >= 1.8 + netsurf_buildsystem >= 1.9 cmd:gcc$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix diff --git a/www-client/netsurf/netsurf-3.9.recipe b/www-client/netsurf/netsurf-3.10.recipe similarity index 80% rename from www-client/netsurf/netsurf-3.9.recipe rename to www-client/netsurf/netsurf-3.10.recipe index 26c50ae00..54b911636 100644 --- a/www-client/netsurf/netsurf-3.9.recipe +++ b/www-client/netsurf/netsurf-3.10.recipe @@ -1,19 +1,19 @@ SUMMARY="A lightweight multi-platform web browser" DESCRIPTION="NetSurf provides a small, fast, comprehensive multiplatform Web browsing \ -solution supporting HTML 4.01 and CSS standards. +solution supporting HTML 5 and CSS standards. NetSurf is an open source web browser which uses its own layout engine. \ Its design goal is to be lightweight and portable. NetSurf provides \ features including tabbed browsing, bookmarks and page thumbnailing." HOMEPAGE="https://www.netsurf-browser.org/" -COPYRIGHT="2003-2018 The NetSurf Browser project" +COPYRIGHT="2003-2020 The NetSurf Browser project" LICENSE="GNU GPL v2" -REVISION="6" +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="https://download.netsurf-browser.org/netsurf/releases/source/netsurf-$portVersion-src.tar.gz" -CHECKSUM_SHA256="d72f1c6f6113a01e541f8476a93c347235068779140090df55ba402eb4a8ecc3" -PATCHES="netsurf-$portVersion.patchset" +CHECKSUM_SHA256="36484429e193614685c2ff246f55bd0a6dddf31a018bee45e0d1f7c28851995e" +PATCHES="netsutf-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" if [ "$targetArchitecture" = x86_gcc2 ]; then @@ -50,24 +50,24 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libcheck$secondaryArchSuffix - devel:libcss$secondaryArchSuffix >= 0.9.0 + devel:libcss$secondaryArchSuffix >= 0.9.1 devel:libcurl$secondaryArchSuffix - devel:libdom$secondaryArchSuffix >= 0.4.0 + devel:libdom$secondaryArchSuffix >= 0.4.1 devel:libexpat$secondaryArchSuffix - devel:libhubbub$secondaryArchSuffix >= 0.3.6 + devel:libhubbub$secondaryArchSuffix >= 0.3.7 devel:libiconv$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix - devel:libnsbmp$secondaryArchSuffix >= 0.1.5 + devel:libnsbmp$secondaryArchSuffix >= 0.1.6 devel:libnsgif$secondaryArchSuffix >= 0.2.1 - devel:libnslog$secondaryArchSuffix >= 0.1.2 - devel:libnspsl$secondaryArchSuffix >= 0.1.5 - devel:libnsutils$secondaryArchSuffix >= 0.0.5 + devel:libnslog$secondaryArchSuffix >= 0.1.3 + devel:libnspsl$secondaryArchSuffix >= 0.1.6 + devel:libnsutils$secondaryArchSuffix >= 0.1.0 devel:libparserutils$secondaryArchSuffix >= 0.2.4 devel:libpng16$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libsvgtiny$secondaryArchSuffix >= 0.1.7 devel:libutf8proc$secondaryArchSuffix - devel:libwapcaplet$secondaryArchSuffix >= 0.4.2 + devel:libwapcaplet$secondaryArchSuffix >= 0.4.3 devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -78,7 +78,7 @@ BUILD_PREREQUIRES=" cmd:git cmd:gperf cmd:make - cmd:nsgenbind + cmd:nsgenbind >= 0.8 cmd:pkg_config$secondaryArchSuffix cmd:xxd " diff --git a/www-client/netsurf/patches/netsurf-3.10.patchset b/www-client/netsurf/patches/netsurf-3.10.patchset new file mode 100644 index 000000000..a0dbf1389 --- /dev/null +++ b/www-client/netsurf/patches/netsurf-3.10.patchset @@ -0,0 +1,22 @@ +From 2849315a8ea6860d890f8e70c5a45bcebd019f83 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 30 May 2020 11:24:15 +0200 +Subject: build fix for libutf8proc + + +diff --git a/utils/idna.c b/utils/idna.c +index 628ef1f..f6e498a 100644 +--- a/utils/idna.c ++++ b/utils/idna.c +@@ -167,7 +167,7 @@ idna__ace_to_ucs4(const char *ace_label, + + #ifdef WITH_UTF8PROC + +-#include ++#include + + int32_t idna_contexto[] = { + /* CONTEXTO codepoints which have a rule defined */ +-- +2.26.0 + diff --git a/www-client/netsurf/patches/netsurf-3.9.patchset b/www-client/netsurf/patches/netsurf-3.9.patchset deleted file mode 100644 index 6a0c5d326..000000000 --- a/www-client/netsurf/patches/netsurf-3.9.patchset +++ /dev/null @@ -1,31 +0,0 @@ -From 8ca7db438b21b07fd3a90b9283ab9f9dcda35801 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Wed, 20 Nov 2019 19:34:02 +0100 -Subject: libutf8proc2 patch - - -diff --git a/utils/idna.c b/utils/idna.c -index d657f90..73f4f4a 100644 ---- a/utils/idna.c -+++ b/utils/idna.c -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - - #include "netsurf/inttypes.h" - -@@ -172,7 +172,7 @@ static bool idna__contextj_rule(int32_t *label, int index, size_t len) - return false; /* No previous character */ - } - unicode_props = utf8proc_get_property(label[index - 1]); -- if (unicode_props->combining_class == IDNA_UNICODE_CCC_VIRAMA) { -+ if (unicode_props->combining_class == UTF8PROC_BIDI_CLASS_EN) { - return true; - } - --- -2.24.0 -