CVS commit: [pkgsrc-2016Q3] pkgsrc/cad/qcad

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Oct 15 18:02:14 UTC 2016

Modified Files:
        pkgsrc/cad/qcad [pkgsrc-2016Q3]: distinfo
Added Files:
        pkgsrc/cad/qcad/patches [pkgsrc-2016Q3]: patch-src_core_RMetaTypes.h

Log Message:
Pullup ticket #5129 - requested by dholland
cad/qcad: build fix

Revisions pulled up:
- cad/qcad/distinfo                                             1.23
- cad/qcad/patches/patch-src_core_RMetaTypes.h                  1.1

---
   Module Name: pkgsrc
   Committed By:        dholland
   Date:                Sun Oct  9 21:35:18 UTC 2016

   Modified Files:
        pkgsrc/cad/qcad: distinfo
   Added Files:
        pkgsrc/cad/qcad/patches: patch-src_core_RMetaTypes.h

   Log Message:
   Add patch from John D. Baker in PR 51509 to fix 32-bit build.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.2.1 pkgsrc/cad/qcad/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/cad/qcad/patches/patch-src_core_RMetaTypes.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cad/qcad/distinfo
diff -u pkgsrc/cad/qcad/distinfo:1.22 pkgsrc/cad/qcad/distinfo:1.22.2.1
--- pkgsrc/cad/qcad/distinfo:1.22       Tue Aug 30 11:01:12 2016
+++ pkgsrc/cad/qcad/distinfo    Sat Oct 15 18:02:14 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2016/08/30 11:01:12 plunky Exp $
+$NetBSD: distinfo,v 1.22.2.1 2016/10/15 18:02:14 bsiegert 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) =
 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

Added files:

Index: pkgsrc/cad/qcad/patches/patch-src_core_RMetaTypes.h
diff -u /dev/null pkgsrc/cad/qcad/patches/patch-src_core_RMetaTypes.h:1.1.2.2
--- /dev/null   Sat Oct 15 18:02:14 2016
+++ pkgsrc/cad/qcad/patches/patch-src_core_RMetaTypes.h Sat Oct 15 18:02:14 2016
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_core_RMetaTypes.h,v 1.1.2.2 2016/10/15 18:02:14 bsiegert 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