summaryrefslogtreecommitdiff
path: root/x11/qt4-libs
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2012-11-02 22:30:30 +0000
committerjoerg <joerg@pkgsrc.org>2012-11-02 22:30:30 +0000
commitd831996aabef7827c4d66c8239df7dc359799961 (patch)
tree52694c43cd055a1d3781ba1ba68edaf825308494 /x11/qt4-libs
parent7ac17b6dd8e4b3450f20c0cf9adc5cb46d5be68e (diff)
downloadpkgsrc-d831996aabef7827c4d66c8239df7dc359799961.tar.gz
Fix destructor leak by goto usage. Bump revision.
Diffstat (limited to 'x11/qt4-libs')
-rw-r--r--x11/qt4-libs/Makefile4
-rw-r--r--x11/qt4-libs/distinfo3
-rw-r--r--x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_Interpreter.cpp15
3 files changed, 19 insertions, 3 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index ca9021e9fdd..5df9c80d507 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2012/10/08 23:00:42 adam Exp $
+# $NetBSD: Makefile,v 1.80 2012/11/02 22:30:30 joerg Exp $
PKGNAME= qt4-libs-${QTVERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= C++ X GUI toolkit
.include "../../x11/qt4-libs/Makefile.common"
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 2d535aa8dd8..f1db85c08c4 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.78 2012/09/15 08:18:49 drochner Exp $
+$NetBSD: distinfo,v 1.79 2012/11/02 22:30:31 joerg Exp $
SHA1 (qt-everywhere-opensource-src-4.8.3.tar.gz) = bc352a283610e0cd2fe0dbedbc45613844090fcb
RMD160 (qt-everywhere-opensource-src-4.8.3.tar.gz) = fe56e5da874503a79d6f84a1e15460eba5a6feae
@@ -38,6 +38,7 @@ SHA1 (patch-cb) = 13e1b0ffb171637e1ff84a548ef83cf4e006c207
SHA1 (patch-cg) = 2519fe525237167f10dffb9294c861f4d7063f31
SHA1 (patch-qmake_generators_makefile.cpp) = d163cfbf8e598123dd1ed2f9bb5e6935b4e5bf64
SHA1 (patch-src-tools-mocmain.cpp-QTBUG-22829) = 79ffa61f856d657be054d1ea2fcab3a90740621e
+SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_Interpreter.cpp) = a9e94ed9becb0d5a88b30f721048509cd0d6b5a5
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = cbce2e10307d26163a76266c0ceee315a609d63d
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp) = bfe38ea1e26fef02dd78e40c95c000cb0cc32a04
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h) = 68152f0077ec5bcce1b3774aaac64af5fd9e491e
diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_Interpreter.cpp b/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_Interpreter.cpp
new file mode 100644
index 00000000000..b2b93646d9a
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_Interpreter.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_Interpreter.cpp,v 1.1 2012/11/02 22:30:31 joerg Exp $
+
+--- src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp.orig 2012-11-02 10:51:13.000000000 +0000
++++ src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp
+@@ -2493,8 +2493,10 @@ JSValue Interpreter::privateExecute(Exec
+ vPC += OPCODE_LENGTH(op_get_by_pname);
+ NEXT_INSTRUCTION();
+ }
++ {
+ Identifier propertyName(callFrame, subscript.toString(callFrame));
+ result = baseValue.get(callFrame, propertyName);
++ }
+ CHECK_FOR_EXCEPTION();
+ callFrame->r(dst) = result;
+ vPC += OPCODE_LENGTH(op_get_by_pname);