Add patch to adapt for qore api change.

Revbump because of lang/qore version update.

4 files changed, 252 insertions, 10 deletions

diff --git a/graphics/qore-glut-module/Makefile b/graphics/qore-glut-module/Makefile
index f080f40374a..1de35d3f820 100644
--- a/graphics/qore-glut-module/Makefile
+++ b/graphics/qore-glut-module/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2016/03/05 11:27:49 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2016/07/22 13:16:39 nros Exp $
 
 DISTNAME=	qore-glut-module-0.0.3
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qore/}
 
-MAINTAINER=	nros@users.sourceforge.net
+MAINTAINER=	nros@netbsd.org
 HOMEPAGE=	http://www.qore.org/
 COMMENT=	GLUT Qore bindings
 LICENSE=	gnu-lgpl-v2.1
diff --git a/graphics/qore-glut-module/buildlink3.mk b/graphics/qore-glut-module/buildlink3.mk
index fb2720c0f72..eebbe925cc4 100644
--- a/graphics/qore-glut-module/buildlink3.mk
+++ b/graphics/qore-glut-module/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2016/03/05 11:27:49 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2016/07/22 13:16:39 nros Exp $
 #
 
 BUILDLINK_TREE+=	qore-glut-module
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=	qore-glut-module
 QORE_GLUT_MODULE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qore-glut-module+=	qore-glut-module>=0.0.3
-BUILDLINK_ABI_DEPENDS.qore-glut-module?=	qore-glut-module>=0.0.3nb5
+BUILDLINK_ABI_DEPENDS.qore-glut-module?=	qore-glut-module>=0.0.3nb6
 BUILDLINK_PKGSRCDIR.qore-glut-module?=	../../graphics/qore-glut-module
 
 .include "../../graphics/qore-opengl-module/buildlink3.mk"
diff --git a/graphics/qore-glut-module/distinfo b/graphics/qore-glut-module/distinfo
index ca032f042c9..1229de67e9b 100644
--- a/graphics/qore-glut-module/distinfo
+++ b/graphics/qore-glut-module/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 21:34:18 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/07/22 13:16:39 nros Exp $
 
 SHA1 (qore-glut-module-0.0.3.tar.gz) = 59c5ba422fedff6cc53bf518c975a81cfbcd5e85
 RMD160 (qore-glut-module-0.0.3.tar.gz) = 63130c9996b4312c1d135b408848f357cdfeb686
 SHA512 (qore-glut-module-0.0.3.tar.gz) = 86cb6cdec5afc94cf27039e1f9839bc9dcc35c25f80f84424419b5edb4805ce1057e68003306f052853618aa21c22ffcfbedfe207e26bb692ccbe5b7698565d5
 Size (qore-glut-module-0.0.3.tar.gz) = 383235 bytes
 SHA1 (patch-configure) = 5258dda7b25c3a19542553baf96f9952c24db413
-SHA1 (patch-src_glut.cc) = 5025bf224159c68144d7954ce6b6a6a8a330f56c
+SHA1 (patch-src_glut.cc) = 31162925c458a01f165f101d6b8433733111a106
diff --git a/graphics/qore-glut-module/patches/patch-src_glut.cc b/graphics/qore-glut-module/patches/patch-src_glut.cc
index 204b6bcf4b3..89aceec9db3 100644
--- a/graphics/qore-glut-module/patches/patch-src_glut.cc
+++ b/graphics/qore-glut-module/patches/patch-src_glut.cc
@@ -1,9 +1,251 @@
-$NetBSD: patch-src_glut.cc,v 1.1 2014/12/30 15:58:21 wiz Exp $
+$NetBSD: patch-src_glut.cc,v 1.2 2016/07/22 13:16:39 nros Exp $
+Adapt for the QoreValue api.
 Remove duplicate function additions.
-This is fixed in the svn version of this packege 
-so remove this patch on the next update.
 --- src/glut.cc.orig	2009-01-23 15:34:09.000000000 +0000
 +++ src/glut.cc
+@@ -127,7 +127,7 @@ static void qore_glut_menu_callback(int 
+    ExceptionSink xsink;
+    ReferenceHolder<QoreListNode> args(new QoreListNode(), &xsink);
+    args->push(new QoreBigIntNode(value));
+-   discard(i->second->exec(*args, &xsink), &xsink);
++   i->second->execValue(*args, &xsink).discard(&xsink);
+ }
+ 
+ static void qore_glut_reshape_func(int width, int height)
+@@ -139,7 +139,7 @@ static void qore_glut_reshape_func(int w
+       ReferenceHolder<QoreListNode> args(new QoreListNode(), &xsink);
+       args->push(new QoreBigIntNode(width));
+       args->push(new QoreBigIntNode(height));
+-      discard(reshape_ref->exec(*args, &xsink), &xsink);
++      reshape_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -149,7 +149,7 @@ static void qore_glut_display_func()
+    AutoLocker al(&display_lock);
+    if (display_ref) {
+       ExceptionSink xsink;
+-      discard(display_ref->exec(0, &xsink), &xsink);
++      display_ref->execValue(0, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -163,7 +163,7 @@ static void qore_glut_keyboard_func(unsi
+       args->push(new QoreBigIntNode(key));
+       args->push(new QoreBigIntNode(x));
+       args->push(new QoreBigIntNode(y));
+-      discard(keyboard_ref->exec(*args, &xsink), &xsink);
++      keyboard_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -175,7 +175,7 @@ static void qore_glut_visibility_func(in
+       ExceptionSink xsink;
+       ReferenceHolder<QoreListNode> args(new QoreListNode(), &xsink);
+       args->push(new QoreBigIntNode(state));
+-      discard(visibility_ref->exec(*args, &xsink), &xsink);
++      visibility_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -185,7 +185,7 @@ static void qore_glut_idle_func()
+    AutoLocker al(&idle_lock);
+    if (idle_ref) {
+       ExceptionSink xsink;
+-      discard(idle_ref->exec(0, &xsink), &xsink);
++      idle_ref->execValue(0, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -199,7 +199,7 @@ static void qore_glut_special_func(int k
+       args->push(new QoreBigIntNode(key));
+       args->push(new QoreBigIntNode(x));
+       args->push(new QoreBigIntNode(y));
+-      discard(special_ref->exec(*args, &xsink), &xsink);
++      special_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -209,7 +209,7 @@ static void qore_glut_wmclose_func()
+    AutoLocker al(&wmclose_lock);
+    if (wmclose_ref) {
+       ExceptionSink xsink;
+-      discard(wmclose_ref->exec(0, &xsink), &xsink);
++      wmclose_ref->execValue(0, &xsink).discard(&xsink);
+    }
+ }
+ #endif
+@@ -224,7 +224,7 @@ static void qore_glut_mouse_func(int but
+       args->push(new QoreBigIntNode(state));
+       args->push(new QoreBigIntNode(x));
+       args->push(new QoreBigIntNode(y));
+-      discard(mouse_ref->exec(*args, &xsink), &xsink);
++      mouse_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -236,7 +236,7 @@ static void qore_glut_motion_func(int x,
+       ReferenceHolder<QoreListNode> args(new QoreListNode(), &xsink);
+       args->push(new QoreBigIntNode(x));
+       args->push(new QoreBigIntNode(y));
+-      discard(motion_ref->exec(*args, &xsink), &xsink);
++      motion_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -248,7 +248,7 @@ static void qore_glut_passivemotion_func
+       ReferenceHolder<QoreListNode> args(new QoreListNode(), &xsink);
+       args->push(new QoreBigIntNode(x));
+       args->push(new QoreBigIntNode(y));
+-      discard(passivemotion_ref->exec(*args, &xsink), &xsink);
++      passivemotion_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -259,7 +259,7 @@ static void qore_glut_entry_func(int sta
+       ExceptionSink xsink;
+       ReferenceHolder<QoreListNode> args(new QoreListNode(), &xsink);
+       args->push(new QoreBigIntNode(state));
+-      discard(entry_ref->exec(*args, &xsink), &xsink);
++      entry_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -270,7 +270,7 @@ static void qore_glut_timer_func(int val
+       ExceptionSink xsink;
+       ReferenceHolder<QoreListNode> args(new QoreListNode(), &xsink);
+       args->push(new QoreBigIntNode(value));
+-      discard(timer_ref->exec(*args, &xsink), &xsink);
++      timer_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -281,7 +281,7 @@ static void qore_glut_menustate_func(int
+       ExceptionSink xsink;
+       ReferenceHolder<QoreListNode> args(new QoreListNode(), &xsink);
+       args->push(new QoreBigIntNode(state));
+-      discard(menustate_ref->exec(*args, &xsink), &xsink);
++      menustate_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -294,7 +294,7 @@ static void qore_glut_spaceballmotion_fu
+       args->push(new QoreBigIntNode(x));
+       args->push(new QoreBigIntNode(y));
+       args->push(new QoreBigIntNode(z));
+-      discard(spaceballmotion_ref->exec(*args, &xsink), &xsink);
++      spaceballmotion_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -307,7 +307,7 @@ static void qore_glut_spaceballrotate_fu
+       args->push(new QoreBigIntNode(x));
+       args->push(new QoreBigIntNode(y));
+       args->push(new QoreBigIntNode(z));
+-      discard(spaceballrotate_ref->exec(*args, &xsink), &xsink);
++      spaceballrotate_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -319,7 +319,7 @@ static void qore_glut_spaceballbutton_fu
+       ReferenceHolder<QoreListNode> args(new QoreListNode(), &xsink);
+       args->push(new QoreBigIntNode(button));
+       args->push(new QoreBigIntNode(state));
+-      discard(spaceballbutton_ref->exec(*args, &xsink), &xsink);
++      spaceballbutton_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -331,7 +331,7 @@ static void qore_glut_buttonbox_func(int
+       ReferenceHolder<QoreListNode> args(new QoreListNode(), &xsink);
+       args->push(new QoreBigIntNode(button));
+       args->push(new QoreBigIntNode(state));
+-      discard(buttonbox_ref->exec(*args, &xsink), &xsink);
++      buttonbox_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -343,7 +343,7 @@ static void qore_glut_dials_func(int dia
+       ReferenceHolder<QoreListNode> args(new QoreListNode(), &xsink);
+       args->push(new QoreBigIntNode(dial));
+       args->push(new QoreBigIntNode(value));
+-      discard(dials_ref->exec(*args, &xsink), &xsink);
++      dials_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -355,7 +355,7 @@ static void qore_glut_tabletmotion_func(
+       ReferenceHolder<QoreListNode> args(new QoreListNode(), &xsink);
+       args->push(new QoreBigIntNode(x));
+       args->push(new QoreBigIntNode(y));
+-      discard(tabletmotion_ref->exec(*args, &xsink), &xsink);
++      tabletmotion_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -369,7 +369,7 @@ static void qore_glut_tabletbutton_func(
+       args->push(new QoreBigIntNode(state));
+       args->push(new QoreBigIntNode(x));
+       args->push(new QoreBigIntNode(y));
+-      discard(tabletbutton_ref->exec(*args, &xsink), &xsink);
++      tabletbutton_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -382,7 +382,7 @@ static void qore_glut_menustatus_func(in
+       args->push(new QoreBigIntNode(status));
+       args->push(new QoreBigIntNode(x));
+       args->push(new QoreBigIntNode(y));
+-      discard(menustatus_ref->exec(*args, &xsink), &xsink);
++      menustatus_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -391,7 +391,7 @@ static void qore_glut_overlaydisplay_fun
+    AutoLocker al(&overlaydisplay_lock);
+    if (overlaydisplay_ref) {
+       ExceptionSink xsink;
+-      discard(overlaydisplay_ref->exec(0, &xsink), &xsink);
++      overlaydisplay_ref->execValue(0, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -402,7 +402,7 @@ static void qore_glut_windowstatus_func(
+       ExceptionSink xsink;
+       ReferenceHolder<QoreListNode> args(new QoreListNode(), &xsink);
+       args->push(new QoreBigIntNode(state));
+-      discard(windowstatus_ref->exec(*args, &xsink), &xsink);
++      windowstatus_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -415,7 +415,7 @@ static void qore_glut_keyboardup_func(un
+       args->push(new QoreBigIntNode(key));
+       args->push(new QoreBigIntNode(x));
+       args->push(new QoreBigIntNode(y));
+-      discard(keyboardup_ref->exec(*args, &xsink), &xsink);
++      keyboardup_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -428,7 +428,7 @@ static void qore_glut_specialup_func(int
+       args->push(new QoreBigIntNode(key));
+       args->push(new QoreBigIntNode(x));
+       args->push(new QoreBigIntNode(y));
+-      discard(specialup_ref->exec(*args, &xsink), &xsink);
++      specialup_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
+@@ -442,7 +442,7 @@ static void qore_glut_joystick_func(unsi
+       args->push(new QoreBigIntNode(x));
+       args->push(new QoreBigIntNode(y));
+       args->push(new QoreBigIntNode(z));
+-      discard(joystick_ref->exec(*args, &xsink), &xsink);
++      joystick_ref->execValue(*args, &xsink).discard(&xsink);
+    }
+ }
+ 
 @@ -1961,18 +1961,12 @@ static QoreStringNode *glut_module_init(
     builtinFunctions.add("glutRemoveMenuItem",           f_glutRemoveMenuItem, QDOM_GUI);
     builtinFunctions.add("glutAttachMenu",               f_glutAttachMenu, QDOM_GUI);