From 75cdba91bb721aa411c1fa95fbd431d95446fa61 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 21 Dec 2016 22:19:54 +0100 Subject: [PATCH] NetSurf: update to 3.6 (and all dependencies) Fixes many bugs, runs even faster, render more pages properly. --- dev-libs/libcss/libcss-0.1.2.recipe | 22 -- dev-libs/libcss/libcss-0.3.0.recipe | 75 ----- dev-libs/libcss/libcss-0.4.0.recipe | 70 ----- ...ibcss-0.5.0.recipe => libcss-0.6.1.recipe} | 11 +- dev-libs/libcss/patches/libcss-0.3.0.patchset | 78 ------ ...s-0.0.1.recipe => libnsutils-0.0.3.recipe} | 11 +- .../patches/libnsutils-0.0.1.patchset | 35 --- ....1.6.recipe => libutf8proc-1.3.1~2.recipe} | 14 +- .../patches/libutf8proc-1.1.6.patchset | 35 --- .../libwapcaplet/libwapcaplet-0.2.1.recipe | 64 ----- ...0.2.2.recipe => libwapcaplet-0.4.0.recipe} | 5 +- .../patches/libwapcaplet-0.2.1.patchset | 35 --- ...bind-0.1.2.recipe => nsgenbind-0.4.recipe} | 8 +- media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe | 60 ---- media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe | 61 ---- ...y-0.1.3.recipe => libsvgtiny-0.1.5.recipe} | 7 +- .../patches/libsvgtiny-0.1.1.patchset | 35 --- net-libs/hubbub/hubbub-0.3.0.recipe | 78 ------ net-libs/hubbub/hubbub-0.3.1.recipe | 77 ----- .../hubbub/patches/libhubbub-0.3.0.patchset | 47 ---- net-libs/libdom/libdom-0.1.0.recipe | 63 ----- net-libs/libdom/libdom-0.1.1.recipe | 63 ----- ...ibdom-0.1.2.recipe => libdom-0.3.1.recipe} | 5 +- net-libs/libdom/patches/libdom-0.1.0.patchset | 84 ------ net-libs/libdom/patches/libdom-0.1.1.patchset | 265 ------------------ net-libs/libnspsl/libnspsl-0.1.0.recipe | 74 +++++ ...{netsurf-3.3.recipe => netsurf-3.6.recipe} | 16 +- 27 files changed, 112 insertions(+), 1286 deletions(-) delete mode 100644 dev-libs/libcss/libcss-0.1.2.recipe delete mode 100644 dev-libs/libcss/libcss-0.3.0.recipe delete mode 100644 dev-libs/libcss/libcss-0.4.0.recipe rename dev-libs/libcss/{libcss-0.5.0.recipe => libcss-0.6.1.recipe} (83%) delete mode 100644 dev-libs/libcss/patches/libcss-0.3.0.patchset rename dev-libs/libnsutils/{libnsutils-0.0.1.recipe => libnsutils-0.0.3.recipe} (84%) delete mode 100644 dev-libs/libnsutils/patches/libnsutils-0.0.1.patchset rename dev-libs/libutf8proc/{libutf8proc-1.1.6.recipe => libutf8proc-1.3.1~2.recipe} (81%) delete mode 100644 dev-libs/libutf8proc/patches/libutf8proc-1.1.6.patchset delete mode 100644 dev-libs/libwapcaplet/libwapcaplet-0.2.1.recipe rename dev-libs/libwapcaplet/{libwapcaplet-0.2.2.recipe => libwapcaplet-0.4.0.recipe} (89%) delete mode 100644 dev-libs/libwapcaplet/patches/libwapcaplet-0.2.1.patchset rename dev-libs/nsgenbind/{nsgenbind-0.1.2.recipe => nsgenbind-0.4.recipe} (80%) delete mode 100644 media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe delete mode 100644 media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe rename media-libs/libsvgtiny/{libsvgtiny-0.1.3.recipe => libsvgtiny-0.1.5.recipe} (89%) delete mode 100644 media-libs/libsvgtiny/patches/libsvgtiny-0.1.1.patchset delete mode 100644 net-libs/hubbub/hubbub-0.3.0.recipe delete mode 100644 net-libs/hubbub/hubbub-0.3.1.recipe delete mode 100644 net-libs/hubbub/patches/libhubbub-0.3.0.patchset delete mode 100644 net-libs/libdom/libdom-0.1.0.recipe delete mode 100644 net-libs/libdom/libdom-0.1.1.recipe rename net-libs/libdom/{libdom-0.1.2.recipe => libdom-0.3.1.recipe} (91%) delete mode 100644 net-libs/libdom/patches/libdom-0.1.0.patchset delete mode 100644 net-libs/libdom/patches/libdom-0.1.1.patchset create mode 100644 net-libs/libnspsl/libnspsl-0.1.0.recipe rename www-client/netsurf/{netsurf-3.3.recipe => netsurf-3.6.recipe} (87%) diff --git a/dev-libs/libcss/libcss-0.1.2.recipe b/dev-libs/libcss/libcss-0.1.2.recipe deleted file mode 100644 index 6b1343bed..000000000 --- a/dev-libs/libcss/libcss-0.1.2.recipe +++ /dev/null @@ -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" diff --git a/dev-libs/libcss/libcss-0.3.0.recipe b/dev-libs/libcss/libcss-0.3.0.recipe deleted file mode 100644 index 95780b847..000000000 --- a/dev-libs/libcss/libcss-0.3.0.recipe +++ /dev/null @@ -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 - " diff --git a/dev-libs/libcss/libcss-0.4.0.recipe b/dev-libs/libcss/libcss-0.4.0.recipe deleted file mode 100644 index 37d858dd9..000000000 --- a/dev-libs/libcss/libcss-0.4.0.recipe +++ /dev/null @@ -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" -} diff --git a/dev-libs/libcss/libcss-0.5.0.recipe b/dev-libs/libcss/libcss-0.6.1.recipe similarity index 83% rename from dev-libs/libcss/libcss-0.5.0.recipe rename to dev-libs/libcss/libcss-0.6.1.recipe index 92b4255ef..9af92987e 100644 --- a/dev-libs/libcss/libcss-0.5.0.recipe +++ b/dev-libs/libcss/libcss-0.6.1.recipe @@ -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() diff --git a/dev-libs/libcss/patches/libcss-0.3.0.patchset b/dev-libs/libcss/patches/libcss-0.3.0.patchset deleted file mode 100644 index 6232c4d62..000000000 --- a/dev-libs/libcss/patches/libcss-0.3.0.patchset +++ /dev/null @@ -1,78 +0,0 @@ -From 53ba61ff1f71c50a26a03909a9b35e12b79d939d Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -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 -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 - diff --git a/dev-libs/libnsutils/libnsutils-0.0.1.recipe b/dev-libs/libnsutils/libnsutils-0.0.3.recipe similarity index 84% rename from dev-libs/libnsutils/libnsutils-0.0.1.recipe rename to dev-libs/libnsutils/libnsutils-0.0.3.recipe index af442ff9b..52c897f55 100644 --- a/dev-libs/libnsutils/libnsutils-0.0.1.recipe +++ b/dev-libs/libnsutils/libnsutils-0.0.3.recipe @@ -2,12 +2,11 @@ SUMMARY="NetSurf generalised utility library" DESCRIPTION="Various things useful to the NetSurf browser, and possibly to \ other applications." HOMEPAGE="http://git.netsurf-browser.org/libnsutils.git/" -COPYRIGHT="2014 Vincent Sanders" +COPYRIGHT="2014-2016 Vincent Sanders" LICENSE="MIT" -REVISION="2" +REVISION="1" SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnsutils-$portVersion-src.tar.gz" -CHECKSUM_SHA256="9ad6b921bceed2c0d44ca6ff36fa76841cc6533f8ed7ccb0a941fd9a78731afd" -PATCHES="libnsutils-$portVersion.patchset" +CHECKSUM_SHA256="15b8bf715da6e020509bcadea61f8b33d861b153121857a775b91fcb32b13d73" ARCHITECTURES="x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -22,7 +21,7 @@ REQUIRES=" PROVIDES_devel=" libnsutils${secondaryArchSuffix}_devel = $portVersion - devel:libnsutils$secondaryArchSuffix = 0.0.1 compat >= 0 + devel:libnsutils$secondaryArchSuffix = $portVersion compat >= 0 " REQUIRES_devel=" " @@ -31,7 +30,7 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - netsurf_buildsystem >= 1.1 + netsurf_buildsystem >= 1.5 cmd:gcc$secondaryArchSuffix cmd:make " diff --git a/dev-libs/libnsutils/patches/libnsutils-0.0.1.patchset b/dev-libs/libnsutils/patches/libnsutils-0.0.1.patchset deleted file mode 100644 index 668e96b58..000000000 --- a/dev-libs/libnsutils/patches/libnsutils-0.0.1.patchset +++ /dev/null @@ -1,35 +0,0 @@ -From f094cf954fe20d718df8da777ccb9f10cca09315 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sat, 21 Mar 2015 19:05:43 +0100 -Subject: fix for INCLUDEDIR - - -diff --git a/Makefile b/Makefile -index 807ba75..fa44370 100644 ---- a/Makefile -+++ b/Makefile -@@ -40,7 +40,7 @@ TESTLDFLAGS := -lm -l$(COMPONENT) $(TESTLDFLAGS) - include $(NSBUILD)/Makefile.top - - # Extra installation rules --I := /include/nsutils -+I := /$(INCLUDEDIR)/nsutils - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/nsutils/errors.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/nsutils/base64.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/nsutils/time.h -diff --git a/libnsutils.pc.in b/libnsutils.pc.in -index 38023de..a327662 100644 ---- a/libnsutils.pc.in -+++ b/libnsutils.pc.in -@@ -1,7 +1,7 @@ - prefix=PREFIX - exec_prefix=${prefix} - libdir=${exec_prefix}/LIBDIR --includedir=${prefix}/include -+includedir=${prefix}/INCLUDEDIR - - Name: libnsutils - Description: NetSurf utilities --- -2.2.2 - diff --git a/dev-libs/libutf8proc/libutf8proc-1.1.6.recipe b/dev-libs/libutf8proc/libutf8proc-1.3.1~2.recipe similarity index 81% rename from dev-libs/libutf8proc/libutf8proc-1.1.6.recipe rename to dev-libs/libutf8proc/libutf8proc-1.3.1~2.recipe index 12d6ada81..7d3c04c00 100644 --- a/dev-libs/libutf8proc/libutf8proc-1.1.6.recipe +++ b/dev-libs/libutf8proc/libutf8proc-1.3.1~2.recipe @@ -3,19 +3,19 @@ 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-2013 Public Software Group" +COPYRIGHT="2006-2016 Public Software Group" LICENSE="MIT" -REVISION="2" -SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libutf8proc-1.1.6-src.tar.gz" -CHECKSUM_SHA256="16e0dacf459bf42098614b714a262633de26ba5a03f05812d6d052c9aeeac384" -PATCHES="libutf8proc-1.1.6.patchset" +REVISION="1" +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" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" libutf8proc$secondaryArchSuffix = $portVersion - lib:libutf8proc$secondaryArchSuffix = 1.1.6 compat >= 1 + lib:libutf8proc$secondaryArchSuffix = 1.3.1 compat >= 1 " REQUIRES=" haiku$secondaryArchSuffix @@ -23,7 +23,7 @@ REQUIRES=" PROVIDES_devel=" libutf8proc${secondaryArchSuffix}_devel = $portVersion - devel:libutf8proc$secondaryArchSuffix = 1.1.6 compat >= 1 + devel:libutf8proc$secondaryArchSuffix = 1.3.1 compat >= 1 " REQUIRES_devel=" libutf8proc$secondaryArchSuffix == $portVersion base diff --git a/dev-libs/libutf8proc/patches/libutf8proc-1.1.6.patchset b/dev-libs/libutf8proc/patches/libutf8proc-1.1.6.patchset deleted file mode 100644 index 4e537bb0d..000000000 --- a/dev-libs/libutf8proc/patches/libutf8proc-1.1.6.patchset +++ /dev/null @@ -1,35 +0,0 @@ -From 21fed2fcdad029c1329c5baff7ce427c978b0422 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sat, 21 Mar 2015 18:17:16 +0100 -Subject: INCLUDEDIR fixes. - - -diff --git a/Makefile b/Makefile -index 858f4a8..d76e971 100644 ---- a/Makefile -+++ b/Makefile -@@ -42,7 +42,7 @@ ifeq ($(WANT_TEST),yes) - endif - - # Extra installation rules --I := /include/libutf8proc -+I := /$(INCLUDEDIR)/libutf8proc - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libutf8proc/utf8proc.h - INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in - INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) -diff --git a/libutf8proc.pc.in b/libutf8proc.pc.in -index 2155841..f4645c0 100644 ---- a/libutf8proc.pc.in -+++ b/libutf8proc.pc.in -@@ -1,7 +1,7 @@ - prefix=PREFIX - exec_prefix=${prefix} - libdir=${exec_prefix}/LIBDIR --includedir=${prefix}/include -+includedir=${prefix}/INCLUDEDIR - - Name: libutf8proc - Description: UTF8 processing --- -2.2.2 - diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.1.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.2.1.recipe deleted file mode 100644 index 3146d82e8..000000000 --- a/dev-libs/libwapcaplet/libwapcaplet-0.2.1.recipe +++ /dev/null @@ -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 -} diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.2.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.4.0.recipe similarity index 89% rename from dev-libs/libwapcaplet/libwapcaplet-0.2.2.recipe rename to dev-libs/libwapcaplet/libwapcaplet-0.4.0.recipe index 14f0641c5..83b0ab6fe 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.2.2.recipe +++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.0.recipe @@ -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" diff --git a/dev-libs/libwapcaplet/patches/libwapcaplet-0.2.1.patchset b/dev-libs/libwapcaplet/patches/libwapcaplet-0.2.1.patchset deleted file mode 100644 index 8dab7c82f..000000000 --- a/dev-libs/libwapcaplet/patches/libwapcaplet-0.2.1.patchset +++ /dev/null @@ -1,35 +0,0 @@ -From 32b0d42e141a2bab66d7420e1f7159282f5beb69 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -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 - diff --git a/dev-libs/nsgenbind/nsgenbind-0.1.2.recipe b/dev-libs/nsgenbind/nsgenbind-0.4.recipe similarity index 80% rename from dev-libs/nsgenbind/nsgenbind-0.1.2.recipe rename to dev-libs/nsgenbind/nsgenbind-0.4.recipe index cba489e6f..c583c3933 100644 --- a/dev-libs/nsgenbind/nsgenbind-0.1.2.recipe +++ b/dev-libs/nsgenbind/nsgenbind-0.4.recipe @@ -2,13 +2,13 @@ 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 Vincent Sanders" +COPYRIGHT="2012-2016 Vincent Sanders" LICENSE="MIT" REVISION="1" -SOURCE_URI="http://download.netsurf-browser.org/libs/releases/nsgenbind-0.1.2-src.tar.gz" -CHECKSUM_SHA256="94a87e9a223791693724e929cc7b13e334d4baaf73f7d0a91fdf938c9a260a9a" +SOURCE_URI="http://download.netsurf-browser.org/libs/releases/nsgenbind-$portVersion-src.tar.gz" +CHECKSUM_SHA256="c6680492e83718aacd456ae8e2b3c9f8cb042f50f079a0167bcb24cddcba0f1d" -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe b/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe deleted file mode 100644 index 18259072f..000000000 --- a/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe +++ /dev/null @@ -1,60 +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="1" -SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libsvgtiny-$portVersion-src.tar.gz" -CHECKSUM_SHA256="0835de639ae0266c394824fa78dc210013c5eeddef222d8b6485edb7fe0ddcd6" -PATCHES="libsvgtiny-$portVersion.patchset" - -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PROVIDES=" - libsvgtiny = $portVersion - " -REQUIRES=" - haiku - " - -PROVIDES_devel=" - libsvgtiny_devel = $portVersion - devel:libsvgtiny = $portVersion - " -REQUIRES_devel=" - libsvgtiny$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku_devel - devel:libwapcaplet - devel:libdom - " -BUILD_PREREQUIRES=" - netsurf_buildsystem - cmd:gcc - cmd:gperf - cmd:make - cmd:pkg_config - " - -BUILD() -{ - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ - INCLUDEDIR=$relativeIncludeDir -} - -INSTALL() -{ - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ - INCLUDEDIR=$relativeIncludeDir install - - prepareInstalledDevelLib libsvgtiny - fixPkgconfig - - # devel package - packageEntries devel \ - $developDir -} diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe b/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe deleted file mode 100644 index 60e73371b..000000000 --- a/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe +++ /dev/null @@ -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="1" -SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libsvgtiny-$portVersion-src.tar.gz" -CHECKSUM_SHA256="a5ad4ba467e2ba10ac13fb881937655c5d0ef8e9582ede6a2c73447c87d06e90" -PATCHES="libsvgtiny-0.1.1.patchset" - -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PROVIDES=" - libsvgtiny = $portVersion - " -REQUIRES=" - haiku - " - -PROVIDES_devel=" - libsvgtiny_devel = $portVersion - devel:libsvgtiny = $portVersion - " -REQUIRES_devel=" - libsvgtiny$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku_devel - devel:libwapcaplet - devel:libdom - devel:libhubbub - devel:libparserutils - " -BUILD_PREREQUIRES=" - netsurf_buildsystem - cmd:gcc - cmd:gperf - cmd:make - cmd:pkg_config - " - -BUILD() -{ - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ - INCLUDEDIR=$relativeIncludeDir -} - -INSTALL() -{ - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ - INCLUDEDIR=$relativeIncludeDir install - - prepareInstalledDevelLib libsvgtiny - fixPkgconfig - - # devel package - packageEntries devel $developDir -} diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.3.recipe b/media-libs/libsvgtiny/libsvgtiny-0.1.5.recipe similarity index 89% rename from media-libs/libsvgtiny/libsvgtiny-0.1.3.recipe rename to media-libs/libsvgtiny/libsvgtiny-0.1.5.recipe index 1d154d059..b4fdcba01 100644 --- a/media-libs/libsvgtiny/libsvgtiny-0.1.3.recipe +++ b/media-libs/libsvgtiny/libsvgtiny-0.1.5.recipe @@ -3,12 +3,11 @@ 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" +COPYRIGHT="2003-2016 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="cbdc024743a56ccacbfa6d6bbce135ab6d701d38609f4a1ac56c2842457e5dff" -PATCHES="libsvgtiny-0.1.1.patchset" +CHECKSUM_SHA256="0ab9b13132b82596e0956daf4235fbcb1193433f84272d30255fe9d0d352b070" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" diff --git a/media-libs/libsvgtiny/patches/libsvgtiny-0.1.1.patchset b/media-libs/libsvgtiny/patches/libsvgtiny-0.1.1.patchset deleted file mode 100644 index 712480847..000000000 --- a/media-libs/libsvgtiny/patches/libsvgtiny-0.1.1.patchset +++ /dev/null @@ -1,35 +0,0 @@ -From 9dd8bfc5652cfa089bc2381385631818cb09453f Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 9 Jun 2014 20:32:12 +0200 -Subject: Fix paths for Haiku. - - -diff --git a/Makefile b/Makefile -index 392d9da..6925cab 100644 ---- a/Makefile -+++ b/Makefile -@@ -45,7 +45,7 @@ endif - include $(NSBUILD)/Makefile.top - - # Extra installation rules --I := /include -+I := /$(INCLUDEDIR) - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/svgtiny.h - INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in - INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) -diff --git a/libsvgtiny.pc.in b/libsvgtiny.pc.in -index a3021f6..c9ca402 100644 ---- a/libsvgtiny.pc.in -+++ b/libsvgtiny.pc.in -@@ -1,7 +1,7 @@ - prefix=PREFIX - exec_prefix=${prefix} - libdir=${exec_prefix}/LIBDIR --includedir=${prefix}/include -+includedir=${prefix}/INCLUDEDIR - - Name: libsvgtiny - Description: SVG Tiny 1.1 rendering library --- -1.8.3.4 - diff --git a/net-libs/hubbub/hubbub-0.3.0.recipe b/net-libs/hubbub/hubbub-0.3.0.recipe deleted file mode 100644 index 9b65ddf25..000000000 --- a/net-libs/hubbub/hubbub-0.3.0.recipe +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY="An HTML5 compliant parsing library" -DESCRIPTION=" -Hubbub is an HTML5 compliant parsing library, written in C. It was developed \ -as part of the NetSurf project and is available for use by other software \ -under the MIT licence. -The HTML5 specification defines a parsing algorithm, based on the behaviour \ -of mainstream browsers, which provides instructions for how to parse all \ -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/" -LICENSE="MIT" -COPYRIGHT="2007-2014 J-M Bell" -SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libhubbub-$portVersion-src.tar.gz" -CHECKSUM_SHA256="dbf3b55bf2531d2a8e70f370a9b396cc78bfd5a092f87beb10b05c04fd7cdaa7" -REVISION="1" -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PROVIDES=" - hubbub = $portVersion - lib:libhubbub = $portVersion compat >= 0 - " -REQUIRES=" - haiku - " -BUILD_REQUIRES=" - devel:libparserutils - devel:libjson_c - devel:libiconv - " -BUILD_PREREQUIRES=" - haiku_devel - netsurf_buildsystem >= 0.3.0 - cmd:gcc - cmd:make - cmd:perl - cmd:pkg_config - " - -PATCHES="libhubbub-$portVersion.patchset" - -SOURCE_DIR="libhubbub-$portVersion" - -BUILD() -{ - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem - 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 - - prepareInstalledDevelLib libhubbub - fixPkgconfig - packageEntries devel $developDir -} - -TEST() -{ - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ - LDFLAGS="-liconv -lparserutils" test -} - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - hubbub_devel = $portVersion - devel:libhubbub = $portVersion compat >= 0 -" -REQUIRES_devel=" - hubbub$secondaryArchSuffix == $portVersion base - " diff --git a/net-libs/hubbub/hubbub-0.3.1.recipe b/net-libs/hubbub/hubbub-0.3.1.recipe deleted file mode 100644 index 66cd2d063..000000000 --- a/net-libs/hubbub/hubbub-0.3.1.recipe +++ /dev/null @@ -1,77 +0,0 @@ -SUMMARY="An HTML5 compliant parsing library" -DESCRIPTION=" -Hubbub is an HTML5 compliant parsing library, written in C. It was developed \ -as part of the NetSurf project and is available for use by other software \ -under the MIT licence. -The HTML5 specification defines a parsing algorithm, based on the behaviour \ -of mainstream browsers, which provides instructions for how to parse all \ -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-2014 J-M Bell" -LICENSE="MIT" -REVISION="2" -SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libhubbub-$portVersion-src.tar.gz" -CHECKSUM_SHA256="1f8b31e86d0d32735f247c071a7ade1a475606b7a3583d2132e567a310b62053" -SOURCE_DIR="libhubbub-$portVersion" -PATCHES="libhubbub-0.3.0.patchset" - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - hubbub$secondaryArchSuffix = $portVersion - lib:libhubbub$secondaryArchSuffix = $portVersion compat >= 0 - " -REQUIRES=" - haiku$secondaryArchSuffix - " - -PROVIDES_devel=" - hubbub${secondaryArchSuffix}_devel = $portVersion - devel:libhubbub$secondaryArchSuffix = $portVersion compat >= 0 - " -REQUIRES_devel=" - hubbub$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - devel:libparserutils$secondaryArchSuffix - devel:libjson_c$secondaryArchSuffix - devel:libiconv$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - netsurf_buildsystem >= 0.3.0 - cmd:gcc$secondaryArchSuffix - cmd:make - cmd:perl - cmd:pkg_config$secondaryArchSuffix - " - -BUILD() -{ - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem - 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 - - prepareInstalledDevelLib libhubbub - fixPkgconfig - packageEntries devel $developDir -} - -TEST() -{ - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ - LDFLAGS="-liconv -lparserutils" test -} diff --git a/net-libs/hubbub/patches/libhubbub-0.3.0.patchset b/net-libs/hubbub/patches/libhubbub-0.3.0.patchset deleted file mode 100644 index 367ef2575..000000000 --- a/net-libs/hubbub/patches/libhubbub-0.3.0.patchset +++ /dev/null @@ -1,47 +0,0 @@ -From 977b947e2c464a1df18bdccaef261b0c7776406a Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sun, 8 Jun 2014 21:43:33 +0200 -Subject: Fix include dirs for Haiku. - - -diff --git a/Makefile b/Makefile -index 4ec03f3..f6bfff2 100644 ---- a/Makefile -+++ b/Makefile -@@ -47,9 +47,9 @@ ifeq ($(WANT_TEST),yes) - # We require the presence of libjson -- http://oss.metaparadigm.com/json-c/ - ifneq ($(PKGCONFIG),) - TESTCFLAGS := $(TESTCFLAGS) \ -- $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags json) -+ $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags json-c) - TESTLDFLAGS := $(TESTLDFLAGS) \ -- $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs json) -+ $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs json-c) - else - TESTCFLAGS := $(TESTCFLAGS) -I$(PREFIX)/include/json - TESTLDFLAGS := $(TESTLDFLAGS) -ljson -@@ -61,7 +61,7 @@ ifeq ($(WANT_TEST),yes) - endif - - # Extra installation rules --I := /include/hubbub -+I := /$(INCLUDEDIR)/hubbub - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/errors.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/functypes.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/hubbub.h -diff --git a/libhubbub.pc.in b/libhubbub.pc.in -index 2f9565e..b20a4a0 100644 ---- a/libhubbub.pc.in -+++ b/libhubbub.pc.in -@@ -1,7 +1,7 @@ - prefix=PREFIX - exec_prefix=${prefix} - libdir=${exec_prefix}/LIBDIR --includedir=${prefix}/include -+includedir=${prefix}/INCLUDEDIR - - Name: libhubbub - Description: HTML5 parsing library --- -1.8.3.4 - diff --git a/net-libs/libdom/libdom-0.1.0.recipe b/net-libs/libdom/libdom-0.1.0.recipe deleted file mode 100644 index c7fae1298..000000000 --- a/net-libs/libdom/libdom-0.1.0.recipe +++ /dev/null @@ -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="1" -SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libdom-0.1.0-src.tar.gz" -CHECKSUM_SHA256="235fde8bcfcf71e325c1344acfb995d5d59e1d8ebfcb9c87c1aefd1a08c8fae6" -PATCHES="libdom-$portVersion.patchset" - -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PROVIDES=" - libdom = $portVersion - lib:libdom = $portVersion - " -REQUIRES=" - haiku - " - -PROVIDES_devel=" - libdom_devel = $portVersion - devel:libdom = $portVersion - " -REQUIRES_devel=" - libdom == $portVersion base - " - -BUILD_REQUIRES=" - haiku_devel - devel:libexpat - devel:libhubbub - devel:libparserutils - devel:libwapcaplet - netsurf_buildsystem - xml_parser - " -BUILD_PREREQUIRES=" - cmd:gcc - cmd:make - cmd:perl - cmd:pkg_config - " - -BUILD() -{ - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem -} - -INSTALL() -{ - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ - INCLUDEDIR=$relativeIncludeDir install - - prepareInstalledDevelLib libdom - fixPkgconfig - packageEntries devel $developDir -} - -TEST() -{ - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test -} diff --git a/net-libs/libdom/libdom-0.1.1.recipe b/net-libs/libdom/libdom-0.1.1.recipe deleted file mode 100644 index 8a85a84ad..000000000 --- a/net-libs/libdom/libdom-0.1.1.recipe +++ /dev/null @@ -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="1" -SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libdom-$portVersion-src.tar.gz" -CHECKSUM_SHA256="e86c11e313cdfbbe9674ad14125093240e23a2fa9e6f05b996d6b655e40c2dd4" -PATCHES="libdom-$portVersion.patchset" - -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PROVIDES=" - libdom = $portVersion - lib:libdom = $portVersion - " -REQUIRES=" - haiku - " - -PROVIDES_devel=" - libdom_devel = $portVersion - devel:libdom = $portVersion - " -REQUIRES_devel=" - libdom == $portVersion base - " - -BUILD_REQUIRES=" - haiku_devel - devel:libexpat - devel:libhubbub - devel:libparserutils - devel:libwapcaplet - netsurf_buildsystem - xml_parser - " -BUILD_PREREQUIRES=" - cmd:gcc - cmd:make - cmd:perl - cmd:pkg_config - " - -BUILD() -{ - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem -} - -INSTALL() -{ - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ - INCLUDEDIR=$relativeIncludeDir install - - prepareInstalledDevelLib libdom - fixPkgconfig - packageEntries devel $developDir -} - -TEST() -{ - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test -} diff --git a/net-libs/libdom/libdom-0.1.2.recipe b/net-libs/libdom/libdom-0.3.1.recipe similarity index 91% rename from net-libs/libdom/libdom-0.1.2.recipe rename to net-libs/libdom/libdom-0.3.1.recipe index 835d02b47..d233d2b6c 100644 --- a/net-libs/libdom/libdom-0.1.2.recipe +++ b/net-libs/libdom/libdom-0.3.1.recipe @@ -5,8 +5,7 @@ COPYRIGHT="2007-2014 J-M Bell" LICENSE="MIT" REVISION="2" SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libdom-$portVersion-src.tar.gz" -CHECKSUM_SHA256="9cd3cf4487735c3cc5d63c5fdee05384eee65318476105646767b34d6e07e9e8" -PATCHES="libdom-0.1.1.patchset" +CHECKSUM_SHA256="1b1e8a940547cedfe718b3258de875837d2a4335f7498c7d555125211662c763" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -33,7 +32,7 @@ BUILD_REQUIRES=" devel:libhubbub$secondaryArchSuffix devel:libparserutils$secondaryArchSuffix devel:libwapcaplet$secondaryArchSuffix - netsurf_buildsystem + netsurf_buildsystem >= 1.5 xml_parser " BUILD_PREREQUIRES=" diff --git a/net-libs/libdom/patches/libdom-0.1.0.patchset b/net-libs/libdom/patches/libdom-0.1.0.patchset deleted file mode 100644 index 200c0b38b..000000000 --- a/net-libs/libdom/patches/libdom-0.1.0.patchset +++ /dev/null @@ -1,84 +0,0 @@ -From ff1657dd341291967f59059f5b8dbcd1c95335e9 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 9 Jun 2014 20:13:18 +0200 -Subject: Fix include paths for Haiku. - - -diff --git a/Makefile b/Makefile -index c6bc2bd..64bc3a8 100644 ---- a/Makefile -+++ b/Makefile -@@ -47,11 +47,11 @@ include $(NSBUILD)/Makefile.top - - # Extra installation rules - Is := include/dom --I := /include/dom -+I := /$(INCLUDEDIR)/dom - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/dom.h;$(Is)/functypes.h - - Is := include/dom/core --I := /include/dom/core -+I := /$(INCLUDEDIR)/dom/core - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/attr.h;$(Is)/characterdata.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/cdatasection.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/comment.h -@@ -66,7 +66,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/pi.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/text.h;$(Is)/typeinfo.h - - Is := include/dom/events --I := /include/dom/events -+I := /$(INCLUDEDIR)/dom/events - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/event.h;$(Is)/ui_event.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/custom_event.h;$(Is)/mouse_event.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/keyboard_event.h;$(Is)/text_event.h -@@ -78,7 +78,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/event_listener.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/document_event.h - - Is := include/dom/html --I := /include/dom/html -+I := /$(INCLUDEDIR)/dom/html - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_document.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_collection.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_element.h -diff --git a/bindings/hubbub/Makefile b/bindings/hubbub/Makefile -index 946219d..984ea3f 100644 ---- a/bindings/hubbub/Makefile -+++ b/bindings/hubbub/Makefile -@@ -1,7 +1,7 @@ - ifeq ($(WITH_HUBBUB_BINDING),yes) - DIR_SOURCES := parser.c - -- DIR_INSTALL_ITEMS := /include/dom/bindings/hubbub:errors.h;parser.h -+ DIR_INSTALL_ITEMS := /$(INCLUDEDIR)/dom/bindings/hubbub:errors.h;parser.h - - # Hubbub - ifneq ($(PKGCONFIG),) -diff --git a/bindings/xml/Makefile b/bindings/xml/Makefile -index ea7653c..1211c5e 100644 ---- a/bindings/xml/Makefile -+++ b/bindings/xml/Makefile -@@ -26,7 +26,7 @@ ifeq ($(WITH_EXPAT_BINDING),yes) - endif - - ifeq ($(DO_XML_INSTALL),yes) -- DIR_INSTALL_ITEMS := /include/dom/bindings/xml:xmlerror.h;xmlparser.h -+ DIR_INSTALL_ITEMS := /$(INCLUDEDIR)/dom/bindings/xml:xmlerror.h;xmlparser.h - endif - - include $(NSBUILD)/Makefile.subdir -diff --git a/libdom.pc.in b/libdom.pc.in -index b6e82cf..406ed9e 100644 ---- a/libdom.pc.in -+++ b/libdom.pc.in -@@ -1,7 +1,7 @@ - prefix=PREFIX - exec_prefix=${prefix} - libdir=${exec_prefix}/LIBDIR --includedir=${prefix}/include -+includedir=${prefix}/INCLUDEDIR - - Name: libdom - Description: W3C DOM implementation --- -1.8.3.4 - diff --git a/net-libs/libdom/patches/libdom-0.1.1.patchset b/net-libs/libdom/patches/libdom-0.1.1.patchset deleted file mode 100644 index 0792d0178..000000000 --- a/net-libs/libdom/patches/libdom-0.1.1.patchset +++ /dev/null @@ -1,265 +0,0 @@ -From f277f3130e78df0df95b08049ca99bce5b71a71b Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 9 Jun 2014 20:13:18 +0200 -Subject: Fix include paths for Haiku. - - -diff --git a/Makefile b/Makefile -index 2e2d4f5..0c49610 100644 ---- a/Makefile -+++ b/Makefile -@@ -47,11 +47,11 @@ include $(NSBUILD)/Makefile.top - - # Extra installation rules - Is := include/dom --I := /include/dom -+I := /$(INCLUDEDIR)/dom - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/dom.h;$(Is)/functypes.h - - Is := include/dom/core --I := /include/dom/core -+I := /$(INCLUDEDIR)/dom/core - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/attr.h;$(Is)/characterdata.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/cdatasection.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/comment.h -@@ -66,7 +66,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/pi.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/text.h;$(Is)/typeinfo.h - - Is := include/dom/events --I := /include/dom/events -+I := /$(INCLUDEDIR)/dom/events - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/event.h;$(Is)/ui_event.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/custom_event.h;$(Is)/mouse_event.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/keyboard_event.h;$(Is)/text_event.h -@@ -78,7 +78,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/event_listener.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/document_event.h - - Is := include/dom/html --I := /include/dom/html -+I := /$(INCLUDEDIR)/dom/html - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_document.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_collection.h - INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_element.h -diff --git a/bindings/hubbub/Makefile b/bindings/hubbub/Makefile -index 946219d..984ea3f 100644 ---- a/bindings/hubbub/Makefile -+++ b/bindings/hubbub/Makefile -@@ -1,7 +1,7 @@ - ifeq ($(WITH_HUBBUB_BINDING),yes) - DIR_SOURCES := parser.c - -- DIR_INSTALL_ITEMS := /include/dom/bindings/hubbub:errors.h;parser.h -+ DIR_INSTALL_ITEMS := /$(INCLUDEDIR)/dom/bindings/hubbub:errors.h;parser.h - - # Hubbub - ifneq ($(PKGCONFIG),) -diff --git a/bindings/xml/Makefile b/bindings/xml/Makefile -index ea7653c..1211c5e 100644 ---- a/bindings/xml/Makefile -+++ b/bindings/xml/Makefile -@@ -26,7 +26,7 @@ ifeq ($(WITH_EXPAT_BINDING),yes) - endif - - ifeq ($(DO_XML_INSTALL),yes) -- DIR_INSTALL_ITEMS := /include/dom/bindings/xml:xmlerror.h;xmlparser.h -+ DIR_INSTALL_ITEMS := /$(INCLUDEDIR)/dom/bindings/xml:xmlerror.h;xmlparser.h - endif - - include $(NSBUILD)/Makefile.subdir -diff --git a/libdom.pc.in b/libdom.pc.in -index b6e82cf..406ed9e 100644 ---- a/libdom.pc.in -+++ b/libdom.pc.in -@@ -1,7 +1,7 @@ - prefix=PREFIX - exec_prefix=${prefix} - libdir=${exec_prefix}/LIBDIR --includedir=${prefix}/include -+includedir=${prefix}/INCLUDEDIR - - Name: libdom - Description: W3C DOM implementation --- -1.8.3.4 - - -From fcadc23dde5471290018f727391f076d2a5bee84 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 1 Sep 2014 10:59:21 +0200 -Subject: gcc2 fixes. - - -diff --git a/src/html/html_collection.c b/src/html/html_collection.c -index 43a26c5..90e35a0 100644 ---- a/src/html/html_collection.c -+++ b/src/html/html_collection.c -@@ -219,6 +219,7 @@ dom_exception dom_html_collection_named_item(dom_html_collection *col, - if (n->type == DOM_ELEMENT_NODE && - col->ic(n, col->ctx) == true) { - dom_string *id = NULL; -+ dom_string *id_name = NULL; - - err = _dom_element_get_id((struct dom_element *) n, - &id); -@@ -238,7 +239,6 @@ dom_exception dom_html_collection_named_item(dom_html_collection *col, - dom_string_unref(id); - - /* Check for Name attr if id not matched/found */ -- dom_string *id_name = NULL; - err = _dom_element_get_attribute((dom_element *)n, - doc->memoised[hds_name], &id_name); - if(err != DOM_NO_ERR) { -diff --git a/src/html/html_table_element.c b/src/html/html_table_element.c -index 23351f0..54091c5 100644 ---- a/src/html/html_table_element.c -+++ b/src/html/html_table_element.c -@@ -207,6 +207,8 @@ dom_exception dom_html_table_element_set_caption( - dom_node_internal *check_node = ((dom_node_internal *)caption); - dom_html_document *doc = (dom_html_document *)(((dom_node_internal *)table)->owner); - dom_exception exp; -+ dom_node *new_caption; -+ - if(check_node == NULL) { - return DOM_HIERARCHY_REQUEST_ERR; - } -@@ -220,8 +222,6 @@ dom_exception dom_html_table_element_set_caption( - return exp; - - /* Create a new caption */ -- dom_node *new_caption; -- - return dom_node_append_child(table, caption, - &new_caption); - } -@@ -262,6 +262,7 @@ dom_exception dom_html_table_element_set_t_head( - dom_node_internal *check_node = ((dom_node_internal *)t_head); - dom_html_document *doc = (dom_html_document *)(((dom_node_internal *)table)->owner); - dom_exception exp; -+ dom_node *new_t_head; - - if (check_node == NULL) { - return DOM_HIERARCHY_REQUEST_ERR; -@@ -274,8 +275,6 @@ dom_exception dom_html_table_element_set_t_head( - if(exp != DOM_NO_ERR) - return exp; - -- dom_node *new_t_head; -- - return dom_node_append_child(table, - t_head, &new_t_head); - -@@ -318,6 +317,7 @@ dom_exception dom_html_table_element_set_t_foot( - dom_node_internal *check_node = ((dom_node_internal *)t_foot); /*< temporary node to check for raised exceptions */ - dom_html_document *doc = (dom_html_document *)(((dom_node_internal *)table)->owner); - dom_exception exp; -+ dom_node *new_t_foot; - - if(check_node == NULL) { - return DOM_HIERARCHY_REQUEST_ERR; -@@ -331,8 +331,6 @@ dom_exception dom_html_table_element_set_t_foot( - if(exp != DOM_NO_ERR) - return exp; - -- dom_node *new_t_foot; -- - return dom_node_append_child(table, t_foot, - &new_t_foot); - -@@ -728,14 +726,15 @@ dom_exception dom_html_table_element_insert_row( - *row = (dom_html_element *)new_row; - } - } else { -+ uint32_t window_len = 0, section_len; -+ dom_html_table_section_element *t_head; -+ dom_html_table_section_element *t_foot; -+ dom_node_internal *n; -+ - if(index ==-1) { - index = (int32_t)len; - } - -- dom_html_table_section_element *t_head; -- dom_html_table_section_element *t_foot; -- uint32_t window_len = 0, section_len; -- - exp = dom_html_table_element_get_t_head(element, &t_head); - if (exp != DOM_NO_ERR) - return exp; -@@ -763,7 +762,7 @@ dom_exception dom_html_table_element_insert_row( - - window_len += section_len; - -- dom_node_internal *n = (dom_node_internal *)element; -+ n = (dom_node_internal *)element; - - dom_html_collection_unref(rows); - -@@ -846,15 +845,17 @@ dom_exception dom_html_table_element_delete_row( - dom_html_collection_unref(rows); - return DOM_INDEX_SIZE_ERR; - } else { -+ uint32_t window_len = 0, section_len; -+ dom_html_table_section_element *t_head; -+ dom_html_table_section_element *t_foot; -+ dom_node_internal *n; -+ - if(index ==-1) { - index = (int32_t)len-1; - } - - dom_html_collection_unref(rows); - -- dom_html_table_section_element *t_head; -- dom_html_table_section_element *t_foot; -- uint32_t window_len = 0, section_len; - exp = dom_html_table_element_get_t_head(element, &t_head); - if(exp != DOM_NO_ERR) - return exp; -@@ -876,7 +877,7 @@ dom_exception dom_html_table_element_delete_row( - index-window_len); - } - window_len += section_len; -- dom_node_internal *n = (dom_node_internal *)element; -+ n = (dom_node_internal *)element; - - for (n = n->first_child; n != NULL; n = n->next) { - if((n->type == DOM_ELEMENT_NODE) && -diff --git a/src/html/html_tablecell_element.c b/src/html/html_tablecell_element.c -index 83ebb0c..403e796 100644 ---- a/src/html/html_tablecell_element.c -+++ b/src/html/html_tablecell_element.c -@@ -183,13 +183,14 @@ dom_exception dom_html_table_cell_element_get_cell_index( - dom_node_internal *n = ((dom_node_internal *)table_cell)->parent; - dom_html_document *doc = (dom_html_document *)(n->owner); - int32_t cnt = 0; -+ dom_node_internal *root; - while(n != NULL) { - if(dom_string_caseless_isequal(doc->memoised[hds_TR],n->name)) { - break; - } - n = n->parent; - } -- dom_node_internal *root = n; -+ root = n; - while(n != NULL) { - if(n == (dom_node_internal *)table_cell) { - break; -diff --git a/src/html/html_tablerow_element.c b/src/html/html_tablerow_element.c -index 0e4c3a8..e4d3514 100644 ---- a/src/html/html_tablerow_element.c -+++ b/src/html/html_tablerow_element.c -@@ -201,9 +201,10 @@ dom_exception dom_html_table_row_element_get_row_index( - (dom_string_caseless_isequal(parent->name, doc->memoised[hds_TBODY]) || - dom_string_caseless_isequal(parent->name, doc->memoised[hds_TFOOT]))) { - uint32_t len; -- n = parent->parent; - dom_html_table_section_element *t_head; - dom_html_collection *rows; -+ -+ n = parent->parent; - exp = dom_html_table_element_get_t_head( - (dom_html_table_element *)(parent->parent), - &t_head); --- -1.8.3.4 - diff --git a/net-libs/libnspsl/libnspsl-0.1.0.recipe b/net-libs/libnspsl/libnspsl-0.1.0.recipe new file mode 100644 index 000000000..60ffc5b67 --- /dev/null +++ b/net-libs/libnspsl/libnspsl-0.1.0.recipe @@ -0,0 +1,74 @@ +SUMMARY="Generate static code representation of the Public suffix list" +DESCRIPTION=" +Public suffix list +------------------ + +The public suffix list is a database of top level domain names. The database +allows an application to determine if if a domain name requires an additional +label to be valid. + +Uses +---- + +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="http://source.netsurf-browser.org/libnspsl.git/" +COPYRIGHT="2016 Vincent Sanders" +LICENSE="MIT" +REVISION="1" +SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnspsl-$portVersion-src.tar.gz" +#CHECKSUM_SHA256="066dffd127ead12da60050aa13b80891fb996d00197767d038e48ac163402780" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + libnspsl$secondaryArchSuffix = $portVersion + lib:libnspsl$secondaryArchSuffix = $portVersion compat >= 0 + " +REQUIRES=" + haiku$secondaryArchSuffix + " + +PROVIDES_devel=" + libnspsl${secondaryArchSuffix}_devel = $portVersion + devel:libnspsl$secondaryArchSuffix = $portVersion compat >= 0 + " +REQUIRES_devel=" + lbnspsl$secondaryArchSuffix == $portVersion base + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + netsurf_buildsystem >= 1.5 + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + +BUILD() +{ + make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem + 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 + + prepareInstalledDevelLib libnspsl + fixPkgconfig + packageEntries devel $developDir +} + +TEST() +{ + make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ + test +} diff --git a/www-client/netsurf/netsurf-3.3.recipe b/www-client/netsurf/netsurf-3.6.recipe similarity index 87% rename from www-client/netsurf/netsurf-3.3.recipe rename to www-client/netsurf/netsurf-3.6.recipe index b35b9f71d..46d2478f0 100644 --- a/www-client/netsurf/netsurf-3.3.recipe +++ b/www-client/netsurf/netsurf-3.6.recipe @@ -7,16 +7,15 @@ 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-2014 The NetSurf Browser project" +COPYRIGHT="2003-2016 The NetSurf Browser project" LICENSE="GNU GPL v2" -REVISION="3" +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="23f92a0940f577b9605f2e54786fea3521680d32d6c00f2a3db1eae3f29e3686" -PATCHES="netsurf-$portVersion.patchset" +CHECKSUM_SHA256="59ae4b50eff9e2a00a0a9742ef546c7de17223139c485af9644f195340979a9c" -ARCHITECTURES="x86_gcc2 x86 x86_64" +ARCHITECTURES="x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" @@ -28,6 +27,8 @@ REQUIRES=" lib:libcurl$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libiconv$secondaryArchSuffix + lib:libnsbmp$secondaryArchSuffix + lib:libnsgif$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libssl$secondaryArchSuffix @@ -39,6 +40,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libcurl$secondaryArchSuffix + devel:libcheck$secondaryArchSuffix devel:libexpat$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix @@ -66,6 +68,8 @@ BUILD_PREREQUIRES=" cmd:gperf cmd:make cmd:pkg_config$secondaryArchSuffix + + cmd:nsgenbind " BUILD() @@ -78,5 +82,5 @@ INSTALL() { make TARGET=beos PREFIX=$prefix/ DESTDIR=$appsDir/ \ NETSURF_BEOS_BIN=netsurf/ NETSURF_BEOS_RESOURCES=netsurf/res/ install - addAppDeskbarSymlink $appsDir/netsurf/NetSurf NetSurf + addAppDeskbarSymlink $appsDir/NetSurf NetSurf }