summaryrefslogtreecommitdiff
path: root/x11/qt4-libs
diff options
context:
space:
mode:
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-tools-mocmain.cpp-QTBUG-2282913
3 files changed, 17 insertions, 3 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 8d36be8df23..db9589350a1 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2012/02/06 12:42:23 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2012/02/27 12:41:22 reinoud 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 c0b7acd15fe..1a293e508a3 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.71 2012/02/26 22:16:16 adam Exp $
+$NetBSD: distinfo,v 1.72 2012/02/27 12:41:22 reinoud Exp $
SHA1 (qt-everywhere-opensource-src-4.8.0.tar.gz) = 2ba35adca8fb9c66a58eca61a15b21df6213f22e
RMD160 (qt-everywhere-opensource-src-4.8.0.tar.gz) = 7506dce7743215481fd9fe56920b8a47f07a112e
@@ -39,6 +39,7 @@ SHA1 (patch-cg) = 2519fe525237167f10dffb9294c861f4d7063f31
SHA1 (patch-ci) = bc85adf9ea17be24f92897b960517941f5b28ab7
SHA1 (patch-cj) = 4f6d3546e3bc04ca2034af21645fc6f27bc82eef
SHA1 (patch-qmake_generators_makefile.cpp) = 54184d85fd06c86a62640add6c8334ca323ea863
+SHA1 (patch-src-tools-mocmain.cpp-QTBUG-22829) = 79ffa61f856d657be054d1ea2fcab3a90740621e
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 5b5ed1512adcde18ef86044986f36d0bb87e1666
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp) = bfe38ea1e26fef02dd78e40c95c000cb0cc32a04
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h) = 384bfccabae5e3a4ea6dea39b912a941133c5632
diff --git a/x11/qt4-libs/patches/patch-src-tools-mocmain.cpp-QTBUG-22829 b/x11/qt4-libs/patches/patch-src-tools-mocmain.cpp-QTBUG-22829
new file mode 100644
index 00000000000..cdb94b25a73
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-src-tools-mocmain.cpp-QTBUG-22829
@@ -0,0 +1,13 @@
+$NetBSD: patch-src-tools-mocmain.cpp-QTBUG-22829,v 1.1 2012/02/27 12:41:22 reinoud Exp $
+
+--- src/tools/moc/main.cpp.orig 2011-12-08 05:06:03.000000000 +0000
++++ src/tools/moc/main.cpp
+@@ -187,6 +187,8 @@ int runMoc(int _argc, char **_argv)
+ Moc moc;
+ pp.macros["Q_MOC_RUN"];
+ pp.macros["__cplusplus"];
++ // rh#756395, https://bugreports.qt-project.org/browse/QTBUG-22829
++ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
+ QByteArray filename;
+ QByteArray output;
+ FILE *in = 0;