summaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authordholland <dholland>2016-10-09 21:35:18 +0000
committerdholland <dholland>2016-10-09 21:35:18 +0000
commite9ed213ef651e0320c9ae96b9d582875e94fbd37 (patch)
tree1aad054cd3e1e9f9a80176a54dd737e341655919 /cad
parent17fa625556d3dcb894ca1ecd697fa947ddb52010 (diff)
downloadpkgsrc-e9ed213ef651e0320c9ae96b9d582875e94fbd37.tar.gz
Add patch from John D. Baker in PR 51509 to fix 32-bit build.
Diffstat (limited to 'cad')
-rw-r--r--cad/qcad/distinfo3
-rw-r--r--cad/qcad/patches/patch-src_core_RMetaTypes.h16
2 files changed, 18 insertions, 1 deletions
diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo
index 3452af607f4..dce5facf8c3 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2016/08/30 11:01:12 plunky Exp $
+$NetBSD: distinfo,v 1.23 2016/10/09 21:35:18 dholland Exp $
SHA1 (qcad-3.15.5.3.zip) = 76d88b865cc446ccb4b8cf045b93a8873c571139
RMD160 (qcad-3.15.5.3.zip) = 40ffbf8aa7232e476520d4acc5657b391f818d20
@@ -18,6 +18,7 @@ SHA1 (patch-src_3rdparty_qtscript.pro) = c4ea2ca8884a24e0abc4e7231b4a474d2103528
SHA1 (patch-src_3rdparty_quazip_quazip.pro) = b59c24acc4171c7ef9ab21a5220dd57bf870b38b
SHA1 (patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro) = 64bf1fb27be358e707fe5476d7deaa9bf2d09230
SHA1 (patch-src_3rdparty_stemmer_stemmer.pro) = aae5dbeba3f0d3abf2f9bb536817138ce9089f58
+SHA1 (patch-src_core_RMetaTypes.h) = 8e3a2c7c7fc08a8608dcb64c9521c5449dd13fe8
SHA1 (patch-src_core_RS.cpp) = 6cb504d409737058c9eb7ab8058ce0ec889a71c4
SHA1 (patch-src_core_RSPlatform.cpp) = e61695b3f364b0c5d28d070a075f9d7cd0081757
SHA1 (patch-src_core_RSettings.cpp) = 1f5073db53feba80bf8312ce41436627e80f500b
diff --git a/cad/qcad/patches/patch-src_core_RMetaTypes.h b/cad/qcad/patches/patch-src_core_RMetaTypes.h
new file mode 100644
index 00000000000..a5b94a328fe
--- /dev/null
+++ b/cad/qcad/patches/patch-src_core_RMetaTypes.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_core_RMetaTypes.h,v 1.1 2016/10/09 21:35:18 dholland Exp $
+
+Fix 32-bit build, where some of the integer types overlap. PR 51509.
+
+--- src/core/RMetaTypes.h~ 2016-08-29 06:49:22.000000000 +0000
++++ src/core/RMetaTypes.h
+@@ -140,7 +140,9 @@
+ #include "RSingleApplication.h"
+
+ Q_DECLARE_METATYPE(int*)
++#ifdef _LP64
+ Q_DECLARE_METATYPE(unsigned int*)
++#endif
+ Q_DECLARE_METATYPE(qint64*)
+
+ #if !defined Q_OS_WIN && !defined Q_OS_LINUX && !defined Q_OS_FREEBSD