Hi,
This updates the NetSurf browser to 3.7.
As always, I'm interested in test reports on as many architectures
as possible, particularly sparc64, powerpc, loongson.
ok?
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/www/netsurf/Makefile.inc,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile.inc
--- Makefile.inc 20 Apr 2017 04:27:58 -0000 1.17
+++ Makefile.inc 24 Oct 2017 07:35:21 -0000
@@ -28,7 +28,7 @@ MAKE_FLAGS += COMPONENT_TYPE=lib-shared
.endfor
.if ${NETSURF_PROJECT} != "buildsystem"
-BUILD_DEPENDS += www/netsurf/buildsystem>=1.5
+BUILD_DEPENDS += www/netsurf/buildsystem>=1.6
MAKE_FLAGS += Q= \
VQ= \
CC="${CC}" \
Index: browser/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/browser/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- browser/Makefile 20 Apr 2017 04:27:58 -0000 1.30
+++ browser/Makefile 24 Oct 2017 07:35:21 -0000
@@ -3,24 +3,23 @@
COMMENT = lightweight web browser, with GTK interface
NETSURF_PROJECT = netsurf
-NETSURF_VERSION = 3.6
-REVISION = 1
+NETSURF_VERSION = 3.7
HOMEPAGE= http://www.netsurf-browser.org/
MASTER_SITES =
http://download.netsurf-browser.org/netsurf/releases/source/
MODULES = devel/gettext
-BUILD_DEPENDS = www/netsurf/nsgenbind>=0.4 \
+BUILD_DEPENDS = www/netsurf/nsgenbind>=0.5 \
www/p5-HTML-Parser
-LIB_DEPENDS = www/netsurf/hubbub>=0.3.3 \
- www/netsurf/libcss>=0.6.1 \
- www/netsurf/libnsgif>=0.1.4 \
+LIB_DEPENDS = www/netsurf/hubbub>=0.3.4 \
+ www/netsurf/libcss>=0.7.0 \
+ www/netsurf/libnsgif>=0.2.0 \
www/netsurf/libnsbmp>=0.1.4 \
- www/netsurf/libdom>=0.3.1 \
- www/netsurf/libnspsl>=0.1.0 \
+ www/netsurf/libdom>=0.3.2 \
+ www/netsurf/libnspsl>=0.1.2 \
www/netsurf/libnsutils>=0.0.3 \
- www/netsurf/libutf8proc>=1.3.1 \
+ www/netsurf/libutf8proc>=1.3.1p0 \
x11/gtk+2 \
x11/gnome/librsvg \
net/curl
@@ -53,7 +52,7 @@ post-patch:
v=$$(egrep ^en\..*$$c: ${WRKSRC}/resources/FatMessages | cut -d
: -f2 | sed -e 's/</\</g') ; \
perl -pi -e "s#>$$c<#>$$v<#"
${WRKSRC}/frontends/gtk/res/options.gtk2.ui ; done
post-install:
- ${INSTALL_MAN} ${WRKSRC}/Docs/netsurf-gtk.1 \
+ ${INSTALL_MAN} ${WRKSRC}/docs/netsurf-gtk.1 \
${PREFIX}/man/man1/netsurf-gtk.1
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/netsurf-gtk.desktop \
Index: browser/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/browser/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- browser/distinfo 30 Nov 2016 07:35:00 -0000 1.12
+++ browser/distinfo 24 Oct 2017 07:35:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (netsurf-3.6-src.tar.gz) = Wa5LUO/54qAKCpdC71RsfeFyIxOcSFr5ZE8ZU0CXmpw=
-SIZE (netsurf-3.6-src.tar.gz) = 4129091
+SHA256 (netsurf-3.7-src.tar.gz) = 78IKhqI7oalm3IcPArMX0/YC4buy4bUHYI40/r+zfhY=
+SIZE (netsurf-3.7-src.tar.gz) = 3911738
Index: browser/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/netsurf/browser/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- browser/pkg/PLIST 30 Nov 2016 07:35:00 -0000 1.13
+++ browser/pkg/PLIST 24 Oct 2017 07:35:21 -0000
@@ -26,7 +26,7 @@ share/netsurf/en/welcome.html
share/netsurf/favicon.png
share/netsurf/fr/
share/netsurf/fr/Messages
-share/netsurf/history.gtk2.ui
+share/netsurf/globalhistory.gtk2.ui
share/netsurf/hotlist.gtk2.ui
share/netsurf/icons/
share/netsurf/icons/arrow-l.png
@@ -46,6 +46,7 @@ share/netsurf/ja/
share/netsurf/ja/welcome.html
share/netsurf/languages
share/netsurf/licence.html
+share/netsurf/localhistory.gtk2.ui
share/netsurf/login.gtk2.ui
share/netsurf/maps.html
share/netsurf/netsurf-16x16.xpm
Index: buildsystem/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/buildsystem/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- buildsystem/Makefile 6 Mar 2016 20:27:24 -0000 1.9
+++ buildsystem/Makefile 24 Oct 2017 07:35:21 -0000
@@ -3,7 +3,7 @@
COMMENT = makefiles for building NetSurf
NETSURF_PROJECT = buildsystem
-NETSURF_VERSION = 1.5
+NETSURF_VERSION = 1.6
DISTNAME = ${NETSURF_PROJECT}-${NETSURF_VERSION}
PKGNAME = netsurf-${NETSURF_PROJECT}-${NETSURF_VERSION}
Index: buildsystem/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/buildsystem/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- buildsystem/distinfo 6 Mar 2016 20:27:24 -0000 1.6
+++ buildsystem/distinfo 24 Oct 2017 07:35:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (buildsystem-1.5.tar.gz) = 28avxjn2mHtwTm/0QnZoeH7n77p34bv3a2FGmbXar3E=
-SIZE (buildsystem-1.5.tar.gz) = 38196
+SHA256 (buildsystem-1.6.tar.gz) = PZyKL2Datq3XEqLme6NfWS4xaIVmst7TjQ1hRhE4s1w=
+SIZE (buildsystem-1.6.tar.gz) = 38204
Index: hubbub/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/hubbub/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- hubbub/Makefile 13 Sep 2016 19:15:03 -0000 1.17
+++ hubbub/Makefile 24 Oct 2017 07:35:21 -0000
@@ -3,11 +3,11 @@
COMMENT = HTML parser
NETSURF_PROJECT = libhubbub
-NETSURF_VERSION = 0.3.3
+NETSURF_VERSION = 0.3.4
PKGNAME = hubbub-${NETSURF_VERSION}
HOMEPAGE = http://www.netsurf-browser.org/projects/hubbub/
-SHARED_LIBS = hubbub 2.0 #0.3.1
+SHARED_LIBS = hubbub 3.0 #0.3.4
LIB_DEPENDS = converters/libiconv \
www/netsurf/libparserutils>=0.2.1
Index: hubbub/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/hubbub/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- hubbub/distinfo 6 Mar 2016 20:27:24 -0000 1.8
+++ hubbub/distinfo 24 Oct 2017 07:35:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (libhubbub-0.3.3-src.tar.gz) =
Bm3/0Sfq0S2mAFCqE7gIkfuZbQAZd2fQOOSKwWNAJ4A=
-SIZE (libhubbub-0.3.3-src.tar.gz) = 783945
+SHA256 (libhubbub-0.3.4-src.tar.gz) =
4/flysChS/feh3gvP2V51+ImvoXeOOGQ/8nmhjYkEeo=
+SIZE (libhubbub-0.3.4-src.tar.gz) = 784522
Index: libcss/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libcss/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- libcss/Makefile 30 Nov 2016 07:35:00 -0000 1.18
+++ libcss/Makefile 24 Oct 2017 07:35:21 -0000
@@ -3,9 +3,9 @@
COMMENT = CSS parser and selection engine
NETSURF_PROJECT = libcss
-NETSURF_VERSION = 0.6.1
+NETSURF_VERSION = 0.7.0
-SHARED_LIBS = css 4.1 #0.5.0
+SHARED_LIBS = css 5.0 #0.7.0
LIB_DEPENDS = converters/libiconv \
www/netsurf/libparserutils>=0.2.1 \
Index: libcss/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libcss/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- libcss/distinfo 30 Nov 2016 07:35:00 -0000 1.11
+++ libcss/distinfo 24 Oct 2017 07:35:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (libcss-0.6.1-src.tar.gz) = CnHsa+8k7BvDOnUFtJCb776ekWXKE/YVmjqkO8QT3k8=
-SIZE (libcss-0.6.1-src.tar.gz) = 487329
+SHA256 (libcss-0.7.0-src.tar.gz) = 37Kj1JZzOcNbRbBPt6lcO0eCMCrcvu0r4vHIjeDQtpo=
+SIZE (libcss-0.7.0-src.tar.gz) = 493022
Index: libdom/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libdom/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- libdom/Makefile 30 Nov 2016 07:35:00 -0000 1.10
+++ libdom/Makefile 24 Oct 2017 07:35:21 -0000
@@ -3,12 +3,12 @@
COMMENT = W3C DOM implementation
NETSURF_PROJECT = libdom
-NETSURF_VERSION = 0.3.1
+NETSURF_VERSION = 0.3.2
-SHARED_LIBS = dom 0.2 #0.1.2
+SHARED_LIBS = dom 1.0 #0.3.2
LIB_DEPENDS = converters/libiconv \
- www/netsurf/hubbub>=0.3.3 \
+ www/netsurf/hubbub>=0.3.4 \
www/netsurf/libwapcaplet>=0.4.0
WANTLIB += expat hubbub iconv parserutils wapcaplet
Index: libdom/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libdom/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- libdom/distinfo 30 Nov 2016 07:35:00 -0000 1.6
+++ libdom/distinfo 24 Oct 2017 07:35:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (libdom-0.3.1-src.tar.gz) = Gx6KlAVHzt/nGLMljeh1g30qQzX3SYx9VVElIRZix2M=
-SIZE (libdom-0.3.1-src.tar.gz) = 868959
+SHA256 (libdom-0.3.2-src.tar.gz) = 8Wx2/6cVk7XLtDTiSWeISAFFrmdbSAMvDeGayrHoZ/0=
+SIZE (libdom-0.3.2-src.tar.gz) = 869599
Index: libnsfb/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsfb/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- libnsfb/Makefile 4 Jun 2017 22:29:32 -0000 1.4
+++ libnsfb/Makefile 24 Oct 2017 07:35:21 -0000
@@ -3,8 +3,7 @@
COMMENT = framebuffer abstraction library for netsurf
NETSURF_PROJECT = libnsfb
-NETSURF_VERSION = 0.1.5
-REVISION = 0
+NETSURF_VERSION = 0.1.6
CATEGORIES = graphics
SHARED_LIBS = nsfb 0.0 #0.1.4
Index: libnsfb/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsfb/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- libnsfb/distinfo 30 Nov 2016 07:35:00 -0000 1.2
+++ libnsfb/distinfo 24 Oct 2017 07:35:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (libnsfb-0.1.5-src.tar.gz) =
zpANGJY1JE1SzA0s+3RXHmvwMQq30G2YBY4J5eXMYWI=
-SIZE (libnsfb-0.1.5-src.tar.gz) = 82897
+SHA256 (libnsfb-0.1.6-src.tar.gz) =
A75qcCeTS04T1MI77VqFw9whq9z2WIHt8SyAvq9vCqI=
+SIZE (libnsfb-0.1.6-src.tar.gz) = 83510
Index: libnsgif/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsgif/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- libnsgif/Makefile 30 Nov 2016 07:35:00 -0000 1.10
+++ libnsgif/Makefile 24 Oct 2017 07:35:21 -0000
@@ -3,9 +3,9 @@
COMMENT = GIF decoding library
NETSURF_PROJECT = libnsgif
-NETSURF_VERSION = 0.1.4
+NETSURF_VERSION = 0.2.0
CATEGORIES = graphics
-SHARED_LIBS = nsgif 0.0 #0.1.3
+SHARED_LIBS = nsgif 1.0 #0.2.0
.include <bsd.port.mk>
Index: libnsgif/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsgif/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- libnsgif/distinfo 30 Nov 2016 07:35:00 -0000 1.7
+++ libnsgif/distinfo 24 Oct 2017 07:35:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (libnsgif-0.1.4-src.tar.gz) =
EzwjVMYVZAgK0brCU+4N9+bIK7YJBkTKQ4zjp5n2utE=
-SIZE (libnsgif-0.1.4-src.tar.gz) = 242078
+SHA256 (libnsgif-0.2.0-src.tar.gz) =
Co3ZnyJgxkXJQPFetlJ+yBFqFSSBO5PAadZUIipwHN4=
+SIZE (libnsgif-0.2.0-src.tar.gz) = 268300
Index: libnspsl/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libnspsl/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- libnspsl/Makefile 2 Dec 2016 06:22:53 -0000 1.1.1.1
+++ libnspsl/Makefile 24 Oct 2017 07:35:21 -0000
@@ -3,7 +3,7 @@
COMMENT = public suffix list library for netsurf
NETSURF_PROJECT = libnspsl
-NETSURF_VERSION = 0.1.0
+NETSURF_VERSION = 0.1.2
CATEGORIES = www
SHARED_LIBS = nspsl 0.0 #0.1.0
Index: libnspsl/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libnspsl/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- libnspsl/distinfo 2 Dec 2016 06:22:53 -0000 1.1.1.1
+++ libnspsl/distinfo 24 Oct 2017 07:35:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (libnspsl-0.1.0-src.tar.gz) =
vpAwvf+kE16VhhRlIB5D8Y8su6JFVZUq7X+lm5nObnQ=
-SIZE (libnspsl-0.1.0-src.tar.gz) = 299718
+SHA256 (libnspsl-0.1.2-src.tar.gz) =
yQMeVk+opcgGgBRDvHZ0toqajoPcJHDV3tll/jksNXI=
+SIZE (libnspsl-0.1.2-src.tar.gz) = 305693
Index: libsvgtiny/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libsvgtiny/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- libsvgtiny/Makefile 21 Apr 2017 20:34:19 -0000 1.4
+++ libsvgtiny/Makefile 24 Oct 2017 07:35:21 -0000
@@ -3,14 +3,13 @@
COMMENT = SVG Tiny implementation
NETSURF_PROJECT = libsvgtiny
-NETSURF_VERSION = 0.1.5
-REVISION = 0
+NETSURF_VERSION = 0.1.6
CATEGORIES = graphics
SHARED_LIBS = svgtiny 0.0 #0.1.4
BUILD_DEPENDS += devel/gperf
-LIB_DEPENDS = www/netsurf/libdom>=0.3.1
+LIB_DEPENDS = www/netsurf/libdom>=0.3.2
WANTLIB += dom expat hubbub iconv m parserutils wapcaplet
Index: libsvgtiny/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libsvgtiny/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- libsvgtiny/distinfo 30 Nov 2016 07:35:00 -0000 1.2
+++ libsvgtiny/distinfo 24 Oct 2017 07:35:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (libsvgtiny-0.1.5-src.tar.gz) =
CrmxMTK4JZbglW2vQjX7yxGTQz+EJy0wJV/p0NNSsHA=
-SIZE (libsvgtiny-0.1.5-src.tar.gz) = 760663
+SHA256 (libsvgtiny-0.1.6-src.tar.gz) =
BirgR2CN0E5MPYvEI6dDxDYTHzsGuPVknj6IerLw94o=
+SIZE (libsvgtiny-0.1.6-src.tar.gz) = 760475
Index: libsvgtiny/patches/patch-src_Makefile
===================================================================
RCS file: libsvgtiny/patches/patch-src_Makefile
diff -N libsvgtiny/patches/patch-src_Makefile
--- libsvgtiny/patches/patch-src_Makefile 21 Apr 2017 20:34:19 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_Makefile,v 1.1 2017/04/21 20:34:19 bentley Exp $
-Fix build with multiple versions of gperf.
-
-From upstream 4390f1c84e8fee51fc22468821e6fc158e783053.
---- src/Makefile.orig Thu Apr 20 09:06:18 2017
-+++ src/Makefile Thu Apr 20 09:07:08 2017
-@@ -1,13 +1,17 @@
- # Sources
- DIR_SOURCES := svgtiny.c svgtiny_gradient.c svgtiny_list.c
-
--SOURCES := $(SOURCES) $(BUILDDIR)/src_colors.c
-+SOURCES := $(SOURCES)
-
--$(BUILDDIR)/src_colors.c: src/colors.gperf
-+$(DIR)autogenerated_colors.c: src/colors.gperf
- $(VQ)$(ECHO) " GPERF: $<"
- $(Q)gperf [email protected] $<
--# Hack for GCC 4.2 compatibility (gperf 3.0.4 solves this properly)
-- $(Q)$(SED) -e 's/#ifdef __GNUC_STDC_INLINE__/#if defined
__GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__/' [email protected] >$@
-+# Squash "error: no previous declaration for 'svgtiny_color_lookup'"
-+ $(Q)$(SED) -e 's/^\(const struct svgtiny_named_color\)/static \1/'
[email protected] >$@
- $(Q)$(RM) [email protected]
-+
-+PRE_TARGETS := $(DIR)autogenerated_colors.c
-+
-+CLEAN_ITEMS := $(DIR)autogenerated_colors.c
-
- include $(NSBUILD)/Makefile.subdir
Index: libsvgtiny/patches/patch-src_colors_gperf
===================================================================
RCS file: libsvgtiny/patches/patch-src_colors_gperf
diff -N libsvgtiny/patches/patch-src_colors_gperf
--- libsvgtiny/patches/patch-src_colors_gperf 21 Apr 2017 20:34:19 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_colors_gperf,v 1.1 2017/04/21 20:34:19 bentley Exp $
-Fix build with multiple versions of gperf.
-
-From upstream 4390f1c84e8fee51fc22468821e6fc158e783053.
---- src/colors.gperf.orig Thu Apr 20 09:10:27 2017
-+++ src/colors.gperf Thu Apr 20 09:10:45 2017
-@@ -17,14 +17,6 @@
- #include "svgtiny.h"
- #include "svgtiny_internal.h"
-
--/* This unusual define shennanigan is to try and prevent the gperf
-- * generated function from being inlined. This is pointless given
-- * it (a) is in a separate .c file and (b) has external linkage.
-- */
--#ifdef __inline
--#undef __inline
--#define __inline
--#endif
- %}
-
- struct svgtiny_named_color;
Index: libsvgtiny/patches/patch-src_svgtiny_c
===================================================================
RCS file: libsvgtiny/patches/patch-src_svgtiny_c
diff -N libsvgtiny/patches/patch-src_svgtiny_c
--- libsvgtiny/patches/patch-src_svgtiny_c 21 Apr 2017 20:34:19 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_svgtiny_c,v 1.1 2017/04/21 20:34:19 bentley Exp $
-Fix build with multiple versions of gperf.
-
-From upstream 4390f1c84e8fee51fc22468821e6fc158e783053.
---- src/svgtiny.c.orig Thu Apr 20 09:06:24 2017
-+++ src/svgtiny.c Thu Apr 20 09:07:19 2017
-@@ -20,6 +20,9 @@
- #include "svgtiny.h"
- #include "svgtiny_internal.h"
-
-+/* Source file generated by `gperf`. */
-+#include "autogenerated_colors.c"
-+
- #ifndef M_PI
- #define M_PI 3.14159265358979323846
- #endif
Index: libsvgtiny/patches/patch-src_svgtiny_internal_h
===================================================================
RCS file: libsvgtiny/patches/patch-src_svgtiny_internal_h
diff -N libsvgtiny/patches/patch-src_svgtiny_internal_h
--- libsvgtiny/patches/patch-src_svgtiny_internal_h 21 Apr 2017 20:34:19
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_svgtiny_internal_h,v 1.1 2017/04/21 20:34:19 bentley Exp $
-Fix build with multiple versions of gperf.
-
-From upstream 4390f1c84e8fee51fc22468821e6fc158e783053.
---- src/svgtiny_internal.h.orig Thu Apr 20 09:09:27 2017
-+++ src/svgtiny_internal.h Thu Apr 20 09:09:56 2017
-@@ -102,9 +102,4 @@ void *svgtiny_list_get(struct svgtiny_list *list,
- void *svgtiny_list_push(struct svgtiny_list *list);
- void svgtiny_list_free(struct svgtiny_list *list);
-
--/* colors.gperf */
--const struct svgtiny_named_color *
-- svgtiny_color_lookup(register const char *str,
-- register unsigned int len);
--
- #endif
Index: libutf8proc/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libutf8proc/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- libutf8proc/Makefile 6 Mar 2016 20:27:25 -0000 1.3
+++ libutf8proc/Makefile 24 Oct 2017 07:35:21 -0000
@@ -4,9 +4,11 @@ COMMENT = unicode library
NETSURF_PROJECT = libutf8proc
NETSURF_VERSION = 1.3.1
+REVISION = 0
+DISTNAME = libutf8proc-1.3.1-3-src
CATEGORIES = textproc
-SHARED_LIBS = utf8proc 1.0 #1.3.1
+SHARED_LIBS = utf8proc 2.0 #1.3.1-3
TEST_DEPENDS = devel/check
Index: libutf8proc/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libutf8proc/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- libutf8proc/distinfo 6 Mar 2016 20:27:25 -0000 1.2
+++ libutf8proc/distinfo 24 Oct 2017 07:35:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (libutf8proc-1.3.1-src.tar.gz) =
eOlQv8aRGC07YRCbG04jQ5l0NgcjH3KjlTMaNnwqxnU=
-SIZE (libutf8proc-1.3.1-src.tar.gz) = 144963
+SHA256 (libutf8proc-1.3.1-3-src.tar.gz) =
EiPC3Zxc0HdWT+swpq2LHA5V713+fCddO5/oJ08gfHA=
+SIZE (libutf8proc-1.3.1-3-src.tar.gz) = 144985
Index: netsurf-fb/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/netsurf-fb/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- netsurf-fb/Makefile 20 Apr 2017 04:27:58 -0000 1.5
+++ netsurf-fb/Makefile 24 Oct 2017 07:35:21 -0000
@@ -3,8 +3,7 @@
COMMENT = lightweight web browser, with SDL interface
NETSURF_PROJECT = netsurf-fb
-NETSURF_VERSION = 3.6
-REVISION = 1
+NETSURF_VERSION = 3.7
DISTNAME = netsurf-${NETSURF_VERSION}-src
HOMEPAGE= http://www.netsurf-browser.org/
@@ -17,16 +16,16 @@ BUILD_DEPENDS = www/netsurf/nsgenbind>=
LIB_DEPENDS = devel/sdl \
graphics/jpeg \
graphics/png \
- www/netsurf/hubbub>=0.3.3 \
- www/netsurf/libcss>=0.6.1 \
- www/netsurf/libnsgif>=0.1.4 \
+ www/netsurf/hubbub>=0.3.4 \
+ www/netsurf/libcss>=0.7.0 \
+ www/netsurf/libnsgif>=0.2.0 \
www/netsurf/libnsbmp>=0.1.4 \
- www/netsurf/libnsfb>=0.1.5 \
- www/netsurf/libdom>=0.3.1 \
- www/netsurf/libnspsl>=0.1.0 \
+ www/netsurf/libnsfb>=0.1.6 \
+ www/netsurf/libdom>=0.3.2 \
+ www/netsurf/libnspsl>=0.1.2 \
www/netsurf/libnsutils>=0.0.3 \
- www/netsurf/libsvgtiny>=0.1.5 \
- www/netsurf/libutf8proc>=1.3.1 \
+ www/netsurf/libsvgtiny>=0.1.6 \
+ www/netsurf/libutf8proc>=1.3.1p0 \
net/curl
TEST_DEPENDS = devel/check
@@ -50,6 +49,6 @@ MAKE_FLAGS += NETSURF_USE_HARU_PDF=NO \
TARGET=framebuffer
post-install:
- ${INSTALL_MAN} ${WRKSRC}/Docs/netsurf-fb.1 ${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/docs/netsurf-fb.1 ${PREFIX}/man/man1
.include <bsd.port.mk>
Index: netsurf-fb/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/netsurf-fb/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- netsurf-fb/distinfo 30 Nov 2016 07:35:00 -0000 1.2
+++ netsurf-fb/distinfo 24 Oct 2017 07:35:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (netsurf-3.6-src.tar.gz) = Wa5LUO/54qAKCpdC71RsfeFyIxOcSFr5ZE8ZU0CXmpw=
-SIZE (netsurf-3.6-src.tar.gz) = 4129091
+SHA256 (netsurf-3.7-src.tar.gz) = 78IKhqI7oalm3IcPArMX0/YC4buy4bUHYI40/r+zfhY=
+SIZE (netsurf-3.7-src.tar.gz) = 3911738
Index: nsgenbind/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/nsgenbind/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- nsgenbind/Makefile 30 Nov 2016 07:35:00 -0000 1.2
+++ nsgenbind/Makefile 24 Oct 2017 07:35:21 -0000
@@ -3,7 +3,7 @@
COMMENT = JavaScript bindings generator
NETSURF_PROJECT = nsgenbind
-NETSURF_VERSION = 0.4
+NETSURF_VERSION = 0.5
BUILD_DEPENDS += devel/bison
Index: nsgenbind/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/nsgenbind/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- nsgenbind/distinfo 30 Nov 2016 07:35:00 -0000 1.2
+++ nsgenbind/distinfo 24 Oct 2017 07:35:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (nsgenbind-0.4-src.tar.gz) =
xmgEkug3GKrNRWro4rPJ+MsEL1DweaAWe8skzdy6Dx0=
-SIZE (nsgenbind-0.4-src.tar.gz) = 97489
+SHA256 (nsgenbind-0.5-src.tar.gz) =
W4a2CVmg/Ia/xnbPRh2e1fW7CxbK5JgWpNICq1S7ksc=
+SIZE (nsgenbind-0.5-src.tar.gz) = 106814
Index: nsgenbind/patches/patch-src_nsgenbind-ast_c
===================================================================
RCS file: nsgenbind/patches/patch-src_nsgenbind-ast_c
diff -N nsgenbind/patches/patch-src_nsgenbind-ast_c
--- nsgenbind/patches/patch-src_nsgenbind-ast_c 30 Nov 2016 07:35:00 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-src_nsgenbind-ast_c,v 1.1 2016/11/30 07:35:00 bentley Exp $
-Fix undefined behavior in AST node creation.
-
-From upstream 3b3b926d7fb92361b1e8eed2efb351c32cb7bfaa.
---- src/nsgenbind-ast.c.orig Sat Nov 19 02:44:03 2016
-+++ src/nsgenbind-ast.c Mon Nov 28 18:51:54 2016
-@@ -132,6 +132,19 @@ genbind_new_node(enum genbind_node_type type, struct g
- return nn;
- }
-
-+struct genbind_node *
-+genbind_new_number_node(enum genbind_node_type type,
-+ struct genbind_node *l,
-+ int number)
-+{
-+ struct genbind_node *nn;
-+ nn = calloc(1, sizeof(struct genbind_node));
-+ nn->type = type;
-+ nn->l = l;
-+ nn->r.number = number;
-+ return nn;
-+}
-+
-
- /* exported interface defined in nsgenbind-ast.h */
- int
Index: nsgenbind/patches/patch-src_nsgenbind-ast_h
===================================================================
RCS file: nsgenbind/patches/patch-src_nsgenbind-ast_h
diff -N nsgenbind/patches/patch-src_nsgenbind-ast_h
--- nsgenbind/patches/patch-src_nsgenbind-ast_h 30 Nov 2016 07:35:00 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-src_nsgenbind-ast_h,v 1.1 2016/11/30 07:35:00 bentley Exp $
-Fix undefined behavior in AST node creation.
-
-From upstream 3b3b926d7fb92361b1e8eed2efb351c32cb7bfaa.
---- src/nsgenbind-ast.h.orig Sat Nov 19 02:44:03 2016
-+++ src/nsgenbind-ast.h Mon Nov 28 18:51:54 2016
-@@ -71,7 +71,18 @@ int genbind_parsefile(char *infilename, struct genbind
-
- char *genbind_strapp(char *a, char *b);
-
-+/**
-+ * create a new node with value from pointer
-+ */
- struct genbind_node *genbind_new_node(enum genbind_node_type type, struct
genbind_node *l, void *r);
-+
-+/**
-+ * create a new number node
-+ *
-+ * Create a node with of number type
-+ */
-+struct genbind_node *genbind_new_number_node(enum genbind_node_type type,
struct genbind_node *l, int number);
-+
- struct genbind_node *genbind_node_link(struct genbind_node *tgt, struct
genbind_node *src);
-
- struct genbind_node *genbind_node_prepend(struct genbind_node *list, struct
genbind_node *inst);
Index: nsgenbind/patches/patch-src_nsgenbind-parser_y
===================================================================
RCS file: nsgenbind/patches/patch-src_nsgenbind-parser_y
diff -N nsgenbind/patches/patch-src_nsgenbind-parser_y
--- nsgenbind/patches/patch-src_nsgenbind-parser_y 30 Nov 2016 07:35:00
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,71 +0,0 @@
-$OpenBSD: patch-src_nsgenbind-parser_y,v 1.1 2016/11/30 07:35:00 bentley Exp $
-Fix undefined behavior in AST node creation.
-
-From upstream 3b3b926d7fb92361b1e8eed2efb351c32cb7bfaa.
---- src/nsgenbind-parser.y.orig Sat Nov 19 02:44:03 2016
-+++ src/nsgenbind-parser.y Mon Nov 28 18:51:54 2016
-@@ -138,17 +138,17 @@ add_method(struct genbind_node **genbind_ast,
- }
-
- location_node = genbind_new_node(GENBIND_NODE_TYPE_FILE,
-- genbind_new_node(GENBIND_NODE_TYPE_LINE,
-- cdata_node,
-- (void *)lineno),
-+
genbind_new_number_node(GENBIND_NODE_TYPE_LINE,
-+ cdata_node,
-+ lineno),
- strdup(filename));
-
- /* generate method node */
- method_node = genbind_new_node(GENBIND_NODE_TYPE_METHOD,
- NULL,
--
genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
-+
genbind_new_number_node(GENBIND_NODE_TYPE_METHOD_TYPE,
- location_node,
-- (void *)methodtype));
-+ methodtype));
-
- class_node = genbind_node_find_type_ident(*genbind_ast,
- NULL,
-@@ -304,11 +304,11 @@ BindingArg:
- {
- $$ = genbind_new_node(GENBIND_NODE_TYPE_METHOD,
- NULL,
-- genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
-+ genbind_new_number_node(GENBIND_NODE_TYPE_METHOD_TYPE,
- genbind_new_node(GENBIND_NODE_TYPE_CDATA,
- NULL,
- $2),
-- (void *)$1));
-+ $1));
- }
- ;
-
-@@ -568,11 +568,11 @@ ClassArg:
- TOK_PROPERTY Modifiers TOK_IDENTIFIER ';'
- {
- $$ = genbind_new_node(GENBIND_NODE_TYPE_PROPERTY, NULL,
-- genbind_new_node(GENBIND_NODE_TYPE_MODIFIER,
-+ genbind_new_number_node(GENBIND_NODE_TYPE_MODIFIER,
- genbind_new_node(GENBIND_NODE_TYPE_IDENT,
- NULL,
- $3),
-- (void *)$2));
-+ $2));
- }
- |
- TOK_FLAGS ClassFlags ';'
-@@ -584,11 +584,11 @@ ClassArg:
- {
- $$ = genbind_new_node(GENBIND_NODE_TYPE_METHOD,
- NULL,
-- genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
-+ genbind_new_number_node(GENBIND_NODE_TYPE_METHOD_TYPE,
- genbind_new_node(GENBIND_NODE_TYPE_CDATA,
- NULL,
- $2),
-- (void *)$1));
-+ $1));
- }
- ;
-
Index: nsgenbind/patches/patch-src_webidl-ast_c
===================================================================
RCS file: nsgenbind/patches/patch-src_webidl-ast_c
diff -N nsgenbind/patches/patch-src_webidl-ast_c
--- nsgenbind/patches/patch-src_webidl-ast_c 30 Nov 2016 07:35:00 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-$OpenBSD: patch-src_webidl-ast_c,v 1.1 2016/11/30 07:35:00 bentley Exp $
-Fix undefined behavior in AST node creation.
-
-From upstream 3b3b926d7fb92361b1e8eed2efb351c32cb7bfaa.
---- src/webidl-ast.c.orig Sat Nov 19 02:44:03 2016
-+++ src/webidl-ast.c Mon Nov 28 18:51:54 2016
-@@ -120,6 +120,7 @@ webidl_node_add(struct webidl_node *node, struct webid
-
-
- struct webidl_node *
-+/* exported interface documented in webidl-ast.h */
- webidl_node_new(enum webidl_node_type type,
- struct webidl_node *l,
- void *r)
-@@ -128,7 +129,21 @@ webidl_node_new(enum webidl_node_type type,
- nn = calloc(1, sizeof(struct webidl_node));
- nn->type = type;
- nn->l = l;
-- nn->r.text = r;
-+ nn->r.value = r;
-+ return nn;
-+}
-+
-+/* exported interface documented in webidl-ast.h */
-+struct webidl_node *
-+webidl_new_number_node(enum webidl_node_type type,
-+ struct webidl_node *l,
-+ int number)
-+{
-+ struct webidl_node *nn;
-+ nn = calloc(1, sizeof(struct webidl_node));
-+ nn->type = type;
-+ nn->l = l;
-+ nn->r.number = number;
- return nn;
- }
-
Index: nsgenbind/patches/patch-src_webidl-ast_h
===================================================================
RCS file: nsgenbind/patches/patch-src_webidl-ast_h
diff -N nsgenbind/patches/patch-src_webidl-ast_h
--- nsgenbind/patches/patch-src_webidl-ast_h 30 Nov 2016 07:35:00 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_webidl-ast_h,v 1.1 2016/11/30 07:35:00 bentley Exp $
-Fix undefined behavior in AST node creation.
-
-From upstream 3b3b926d7fb92361b1e8eed2efb351c32cb7bfaa.
---- src/webidl-ast.h.orig Sat Nov 19 02:44:03 2016
-+++ src/webidl-ast.h Mon Nov 28 18:51:54 2016
-@@ -92,7 +92,16 @@ typedef int (webidl_callback_t)(struct webidl_node *no
-
- int webidl_cmp_node_type(struct webidl_node *node, void *ctx);
-
-+/**
-+ * create a new node with a pointer value
-+ */
- struct webidl_node *webidl_node_new(enum webidl_node_type, struct webidl_node
*l, void *r);
-+
-+/**
-+ * create a new node with an integer value
-+ */
-+struct webidl_node *webidl_new_number_node(enum webidl_node_type type, struct
webidl_node *l, int number);
-+
-
- void webidl_node_set(struct webidl_node *node, enum webidl_node_type type,
void *r);
-
Index: nsgenbind/patches/patch-src_webidl-parser_y
===================================================================
RCS file: nsgenbind/patches/patch-src_webidl-parser_y
diff -N nsgenbind/patches/patch-src_webidl-parser_y
--- nsgenbind/patches/patch-src_webidl-parser_y 30 Nov 2016 07:35:00 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,330 +0,0 @@
-$OpenBSD: patch-src_webidl-parser_y,v 1.1 2016/11/30 07:35:00 bentley Exp $
-Fix undefined behavior in AST node creation.
-
-From upstream 3b3b926d7fb92361b1e8eed2efb351c32cb7bfaa.
---- src/webidl-parser.y.orig Sat Nov 19 02:44:03 2016
-+++ src/webidl-parser.y Mon Nov 28 18:51:54 2016
-@@ -735,9 +735,9 @@ ConstValue:
- |
- TOK_INT_LITERAL
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_LITERAL_INT,
-- NULL,
-- (void *)$1);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_LITERAL_INT,
-+ NULL,
-+ $1);
- }
- |
- TOK_NULL_LITERAL
-@@ -750,16 +750,16 @@ ConstValue:
- BooleanLiteral:
- TOK_TRUE
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_LITERAL_BOOL,
-- NULL,
-- (void *)true);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_LITERAL_BOOL,
-+ NULL,
-+ (int)true);
- }
- |
- TOK_FALSE
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_LITERAL_BOOL,
-- NULL,
-- (void *)false);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_LITERAL_BOOL,
-+ NULL,
-+ (int)false);
- }
- ;
-
-@@ -846,16 +846,18 @@ Attribute:
-
- /* deal with inherit modifier */
- if ($1) {
-- attribute = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
-+ attribute = webidl_new_number_node(
-+ WEBIDL_NODE_TYPE_MODIFIER,
- attribute,
-- (void
*)WEBIDL_TYPE_MODIFIER_INHERIT);
-+ WEBIDL_TYPE_MODIFIER_INHERIT);
- }
-
- /* deal with readonly modifier */
- if ($2) {
-- attribute = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
-+ attribute = webidl_new_number_node(
-+ WEBIDL_NODE_TYPE_MODIFIER,
- attribute,
-- (void
*)WEBIDL_TYPE_MODIFIER_READONLY);
-+ WEBIDL_TYPE_MODIFIER_READONLY);
- }
-
- $$ = webidl_node_new(WEBIDL_NODE_TYPE_ATTRIBUTE,
-@@ -880,14 +882,16 @@ StaticMemberRest:
- {
- struct webidl_node *attribute;
-
-- attribute = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
-- $2, (void
*)WEBIDL_TYPE_MODIFIER_STATIC);
-+ attribute = webidl_new_number_node(WEBIDL_NODE_TYPE_MODIFIER,
-+ $2,
-+
WEBIDL_TYPE_MODIFIER_STATIC);
-
- /* deal with readonly modifier */
- if ($1) {
-- attribute = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
-+ attribute = webidl_new_number_node(
-+ WEBIDL_NODE_TYPE_MODIFIER,
- attribute,
-- (void
*)WEBIDL_TYPE_MODIFIER_READONLY);
-+ WEBIDL_TYPE_MODIFIER_READONLY);
- }
-
- $$ = webidl_node_new(WEBIDL_NODE_TYPE_ATTRIBUTE,
-@@ -900,8 +904,9 @@ StaticMemberRest:
- struct webidl_node *operation;
-
- /* add static modifier */
-- operation = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
-- $2, (void
*)WEBIDL_TYPE_MODIFIER_STATIC);
-+ operation = webidl_new_number_node(WEBIDL_NODE_TYPE_MODIFIER,
-+ $2,
-+
WEBIDL_TYPE_MODIFIER_STATIC);
-
- /* put return type on the operation */
- operation = webidl_node_prepend($1, operation);
-@@ -1015,16 +1020,16 @@ Specials:
- Special:
- TOK_GETTER
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL,
-- NULL,
-- (void *)WEBIDL_TYPE_SPECIAL_GETTER);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL,
-+ NULL,
-+ WEBIDL_TYPE_SPECIAL_GETTER);
- }
- |
- TOK_SETTER
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL,
-- NULL,
-- (void *)WEBIDL_TYPE_SPECIAL_SETTER);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL,
-+ NULL,
-+ WEBIDL_TYPE_SPECIAL_SETTER);
- }
- |
- TOK_CREATOR
-@@ -1032,23 +1037,23 @@ Special:
- /* second edition removed this special but the
- * specifications still use it!
- */
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL,
-- NULL,
-- (void *)WEBIDL_TYPE_SPECIAL_CREATOR);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL,
-+ NULL,
-+ WEBIDL_TYPE_SPECIAL_CREATOR);
- }
- |
- TOK_DELETER
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL,
-- NULL,
-- (void *)WEBIDL_TYPE_SPECIAL_DELETER);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL,
-+ NULL,
-+ WEBIDL_TYPE_SPECIAL_DELETER);
- }
- |
- TOK_LEGACYCALLER
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL,
-- NULL,
-- (void
*)WEBIDL_TYPE_SPECIAL_LEGACYCALLER);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL,
-+ NULL,
-+ WEBIDL_TYPE_SPECIAL_LEGACYCALLER);
- }
- ;
-
-@@ -1679,8 +1684,9 @@ SingleType:
- TOK_ANY TypeSuffixStartingWithArray
- {
- /* todo deal with TypeSuffixStartingWithArray */
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE,
-- NULL, (void *)WEBIDL_TYPE_ANY);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+ NULL,
-+ WEBIDL_TYPE_ANY);
- }
- ;
-
-@@ -1742,29 +1748,39 @@ NonAnyType:
- |
- TOK_STRING TypeSuffix
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void
*)WEBIDL_TYPE_STRING);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+ $2,
-+ WEBIDL_TYPE_STRING);
- }
- |
- TOK_IDENTIFIER TypeSuffix
- {
- struct webidl_node *type;
-- type = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void
*)WEBIDL_TYPE_USER);
-+ type = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+ $2,
-+ WEBIDL_TYPE_USER);
- $$ = webidl_node_new(WEBIDL_NODE_TYPE_IDENT, type, $1);
- }
- |
- TOK_SEQUENCE '<' Type '>' Null
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $3, (void
*)WEBIDL_TYPE_SEQUENCE);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+ $3,
-+ WEBIDL_TYPE_SEQUENCE);
- }
- |
- TOK_OBJECT TypeSuffix
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void
*)WEBIDL_TYPE_OBJECT);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+ $2,
-+ WEBIDL_TYPE_OBJECT);
- }
- |
- TOK_DATE TypeSuffix
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void
*)WEBIDL_TYPE_DATE);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+ $2,
-+ WEBIDL_TYPE_DATE);
- }
- ;
-
-@@ -1778,7 +1794,9 @@ ConstType:
- TOK_IDENTIFIER Null
- {
- struct webidl_node *type;
-- type = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void
*)WEBIDL_TYPE_USER);
-+ type = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+ NULL,
-+ WEBIDL_TYPE_USER);
- type = webidl_node_new(WEBIDL_NODE_TYPE_IDENT, type, $1);
- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE, NULL, type);
- }
-@@ -1793,17 +1811,23 @@ PrimitiveType:
- |
- TOK_BOOLEAN
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void
*)WEBIDL_TYPE_BOOL);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+ NULL,
-+ WEBIDL_TYPE_BOOL);
- }
- |
- TOK_BYTE
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void
*)WEBIDL_TYPE_BYTE);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+ NULL,
-+ WEBIDL_TYPE_BYTE);
- }
- |
- TOK_OCTET
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void
*)WEBIDL_TYPE_OCTET);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+ NULL,
-+ WEBIDL_TYPE_OCTET);
- }
- ;
-
-@@ -1811,9 +1835,9 @@ PrimitiveType:
- UnrestrictedFloatType:
- TOK_UNRESTRICTED FloatType
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
-- $2,
-- (void *)WEBIDL_TYPE_MODIFIER_UNRESTRICTED);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_MODIFIER,
-+ $2,
-+ WEBIDL_TYPE_MODIFIER_UNRESTRICTED);
- }
- |
- FloatType
-@@ -1823,12 +1847,16 @@ UnrestrictedFloatType:
- FloatType:
- TOK_FLOAT
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void
*)WEBIDL_TYPE_FLOAT);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+ NULL,
-+ WEBIDL_TYPE_FLOAT);
- }
- |
- TOK_DOUBLE
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void
*)WEBIDL_TYPE_DOUBLE);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+ NULL,
-+ WEBIDL_TYPE_DOUBLE);
- }
- ;
-
-@@ -1836,9 +1864,9 @@ FloatType:
- UnsignedIntegerType:
- TOK_UNSIGNED IntegerType
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
-- $2,
-- (void *)WEBIDL_TYPE_MODIFIER_UNSIGNED);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_MODIFIER,
-+ $2,
-+ WEBIDL_TYPE_MODIFIER_UNSIGNED);
- }
- |
- IntegerType
-@@ -1848,15 +1876,21 @@ UnsignedIntegerType:
- IntegerType:
- TOK_SHORT
- {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void
*)WEBIDL_TYPE_SHORT);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+ NULL,
-+ WEBIDL_TYPE_SHORT);
- }
- |
- TOK_LONG OptionalLong
- {
- if ($2) {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void
*)WEBIDL_TYPE_LONGLONG);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+ NULL,
-+ WEBIDL_TYPE_LONGLONG);
- } else {
-- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void
*)WEBIDL_TYPE_LONG);
-+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+ NULL,
-+ WEBIDL_TYPE_LONG);
- }
- }
- ;
-@@ -1927,7 +1961,9 @@ ReturnType:
- TOK_VOID
- {
- struct webidl_node *type;
-- type = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void
*)WEBIDL_TYPE_VOID);
-+ type = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+ NULL,
-+ WEBIDL_TYPE_VOID);
- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE, NULL, type);
- }
-
