summaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authorplunky <plunky@pkgsrc.org>2018-01-07 21:23:39 +0000
committerplunky <plunky@pkgsrc.org>2018-01-07 21:23:39 +0000
commitf54e17430f4a17622606b2c50d5d8628e938b331 (patch)
treec8bac2a9ede08ddc3759893f604c228ac9837616 /cad
parent2b52ef46cda0ed88690776e88350d314bdcc9380 (diff)
downloadpkgsrc-f54e17430f4a17622606b2c50d5d8628e938b331.tar.gz
force use of builtin for alloca(3).
This fixes warnings on NetBSD, maybe also build on SmartOS
Diffstat (limited to 'cad')
-rw-r--r--cad/qcad/distinfo4
-rw-r--r--cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro11
2 files changed, 9 insertions, 6 deletions
diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo
index aaaa9687531..436d66015b2 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2017/12/18 21:21:44 plunky Exp $
+$NetBSD: distinfo,v 1.29 2018/01/07 21:23:39 plunky Exp $
SHA1 (qcad-3.19.1.0.zip) = df550d3b2347b5426efc12d01328a0721c129c3d
RMD160 (qcad-3.19.1.0.zip) = 9a4f26aebe5b12ebe70ea9e66dc3cece71bd8612
@@ -15,7 +15,7 @@ SHA1 (patch-src_3rdparty_dxflib_src_dl__writer.h) = 28d515063c5d410083a2ab582e9d
SHA1 (patch-src_3rdparty_opennurbs_opennurbs.pro) = d96e1ce129d32703fc474aea71afdae1d4b537ed
SHA1 (patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp) = 26385c45b2132909470aba79181c242c785614a7
SHA1 (patch-src_3rdparty_opennurbs_opennurbs__zlib.h) = 333fe1510cc5ea2457eefd7d07ccaf034ee5d22f
-SHA1 (patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro) = ee026d1c6124a8a01fdbb483446f18ce35191295
+SHA1 (patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro) = 7120c49027d4a50c23b1e9e60c44a1e0a239d6ac
SHA1 (patch-src_3rdparty_qtscript.pro) = c4ea2ca8884a24e0abc4e7231b4a474d21035280
SHA1 (patch-src_3rdparty_quazip_quazip.pro) = b59c24acc4171c7ef9ab21a5220dd57bf870b38b
SHA1 (patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro) = 64bf1fb27be358e707fe5476d7deaa9bf2d09230
diff --git a/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro b/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro
index 168bd87a4f9..337e811798a 100644
--- a/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro
+++ b/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro
@@ -1,14 +1,16 @@
-$NetBSD: patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro,v 1.2 2017/12/18 21:21:44 plunky Exp $
+$NetBSD: patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro,v 1.3 2018/01/07 21:23:39 plunky Exp $
fix build for pkgsrc, by allowing qmake to link binaries in situ
and create an install target
don't provide own zlib
---- src/3rdparty/opennurbs/opennurbs/opennurbs.pro.orig 2016-07-01 07:13:14.000000000 +0000
-+++ src/3rdparty/opennurbs/opennurbs/opennurbs.pro
-@@ -218,14 +218,8 @@ HEADERS += \
+force use of builtin alloca(3)
+--- src/3rdparty/opennurbs/opennurbs/opennurbs.pro.orig 2017-12-19 14:26:30.000000000 +0000
++++ src/3rdparty/opennurbs/opennurbs/opennurbs.pro
+@@ -218,14 +218,9 @@ HEADERS += \
+
TARGET = opennurbs
TEMPLATE = lib
-CONFIG += staticlib
@@ -21,6 +23,7 @@ don't provide own zlib
-LIBS += -lzlib
+CONFIG += plugin
+INSTALLS += target
++DEFINES += \"alloca(size)=__builtin_alloca(size)\"
win32 {
#DEFINES += ON_DLL_EXPORTS ON_COMPILING_OPENNURBS NDEBUG
DEFINES += ON_COMPILING_OPENNURBS NDEBUG