Explicitly use local array type. Fix deletes on arrays. Bump revision.diff -r1.27 -r1.28 pkgsrc/lang/basic256/Makefile
(joerg)
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | # $NetBSD: Makefile,v 1.27 2015/04/25 14:23:26 tnn Exp $ | 1 | # $NetBSD: Makefile,v 1.28 2015/06/10 14:58:50 joerg Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= basic256_0.9.6.71 | 4 | DISTNAME= basic256_0.9.6.71 | |
5 | PKGNAME= ${DISTNAME:S/_/-/} | 5 | PKGNAME= ${DISTNAME:S/_/-/} | |
6 | PKGREVISION= 17 | 6 | PKGREVISION= 18 | |
7 | CATEGORIES= lang | 7 | CATEGORIES= lang | |
8 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kidbasic/} | 8 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kidbasic/} | |
9 | EXTRACT_SUFX= .tgz | 9 | EXTRACT_SUFX= .tgz | |
10 | 10 | |||
11 | MAINTAINER= pkgsrc-users@NetBSD.org | 11 | MAINTAINER= pkgsrc-users@NetBSD.org | |
12 | HOMEPAGE= http://www.basic256.org/ | 12 | HOMEPAGE= http://www.basic256.org/ | |
13 | COMMENT= BASIC language with traditional control structures | 13 | COMMENT= BASIC language with traditional control structures | |
14 | LICENSE= gnu-gpl-v2 | 14 | LICENSE= gnu-gpl-v2 | |
15 | 15 | |||
16 | MAKE_JOBS_SAFE= no | 16 | MAKE_JOBS_SAFE= no | |
17 | 17 | |||
18 | WRKSRC= ${WRKDIR} | 18 | WRKSRC= ${WRKDIR} | |
19 | USE_LANGUAGES= c c++ | 19 | USE_LANGUAGES= c c++ |
@@ -1,7 +1,8 @@ | @@ -1,7 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.3 2013/05/04 12:48:33 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.4 2015/06/10 14:58:50 joerg Exp $ | |
2 | 2 | |||
3 | SHA1 (basic256_0.9.6.71.tgz) = 3a8ee26230d5b14b5f325c3b6e0db511534d785f | 3 | SHA1 (basic256_0.9.6.71.tgz) = 3a8ee26230d5b14b5f325c3b6e0db511534d785f | |
4 | RMD160 (basic256_0.9.6.71.tgz) = 1edd4a2eb153eb9712f8b33e1ff2a64ebf1ba883 | 4 | RMD160 (basic256_0.9.6.71.tgz) = 1edd4a2eb153eb9712f8b33e1ff2a64ebf1ba883 | |
5 | Size (basic256_0.9.6.71.tgz) = 7924162 bytes | 5 | Size (basic256_0.9.6.71.tgz) = 7924162 bytes | |
6 | SHA1 (patch-Interpreter.cpp) = 01800b5cd85f7c947b20ad803e04730839007ef0 | 6 | SHA1 (patch-Interpreter.cpp) = 23e0c4d7b611dff4366dbd6859d8c4eddf9d31ad | |
7 | SHA1 (patch-RunController.cpp) = 7716844575a393900b9cab1e61abd6b18cf5b138 | 7 | SHA1 (patch-RunController.cpp) = 7716844575a393900b9cab1e61abd6b18cf5b138 | |
8 | SHA1 (patch-Variables.h) = a350770e86e8b6913c92785b893e72d6a641f0eb |
@@ -1,15 +1,51 @@ | @@ -1,15 +1,51 @@ | |||
1 | $NetBSD: patch-Interpreter.cpp,v 1.1 2013/05/04 12:48:33 joerg Exp $ | 1 | $NetBSD: patch-Interpreter.cpp,v 1.2 2015/06/10 14:58:50 joerg Exp $ | |
2 | 2 | |||
3 | Avoid overlap with std::mutex. | 3 | Avoid overlap with std::mutex. | |
4 | 4 | |||
5 | --- Interpreter.cpp.orig 2013-05-04 00:26:28.000000000 +0000 | 5 | --- Interpreter.cpp.orig 2012-08-06 14:57:58.000000000 +0000 | |
6 | +++ Interpreter.cpp | 6 | +++ Interpreter.cpp | |
7 | @@ -69,6 +69,8 @@ using namespace std; | 7 | @@ -69,6 +69,8 @@ using namespace std; | |
8 | QMutex keymutex; | 8 | QMutex keymutex; | |
9 | int currentKey; | 9 | int currentKey; | |
10 | 10 | |||
11 | +#define mutex my_mutex | 11 | +#define mutex my_mutex | |
12 | + | 12 | + | |
13 | extern QMutex mutex; | 13 | extern QMutex mutex; | |
14 | extern QMutex debugmutex; | 14 | extern QMutex debugmutex; | |
15 | extern QWaitCondition waitCond; | 15 | extern QWaitCondition waitCond; | |
16 | @@ -2446,7 +2448,7 @@ Interpreter::execByteCode() | |||
17 | poly.drawPolygon(points, pairs); | |||
18 | poly.end(); | |||
19 | if (!fastgraphics) waitForGraphics(); | |||
20 | - delete points; | |||
21 | + delete[] points; | |||
22 | } | |||
23 | } else { | |||
24 | errornum = ERROR_POLYARRAY; | |||
25 | @@ -2487,7 +2489,7 @@ Interpreter::execByteCode() | |||
26 | poly.end(); | |||
27 | ||||
28 | if (!fastgraphics) waitForGraphics(); | |||
29 | - delete points; | |||
30 | + delete[] points; | |||
31 | } | |||
32 | } | |||
33 | break; | |||
34 | @@ -2538,7 +2540,7 @@ Interpreter::execByteCode() | |||
35 | poly.end(); | |||
36 | if (!fastgraphics) waitForGraphics(); | |||
37 | ||||
38 | - delete points; | |||
39 | + delete[] points; | |||
40 | } | |||
41 | } | |||
42 | } else { | |||
43 | @@ -2608,7 +2610,7 @@ Interpreter::execByteCode() | |||
44 | poly.end(); | |||
45 | ||||
46 | if (!fastgraphics) waitForGraphics(); | |||
47 | - delete points; | |||
48 | + delete[] points; | |||
49 | } | |||
50 | } | |||
51 | } |