diff options
author | jperkin <jperkin@pkgsrc.org> | 2014-08-21 16:37:51 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2014-08-21 16:37:51 +0000 |
commit | 98b412f9714ebecf5ac4b93500401c3d904083f6 (patch) | |
tree | 897e995877b5edb326a13cba719b8519721c012c /graphics | |
parent | 07e1fd1383125d2ed160de76a72977b59d25d194 (diff) | |
download | pkgsrc-98b412f9714ebecf5ac4b93500401c3d904083f6.tar.gz |
Fix build on SunOS (needs explicit -lstdc++, avoid overloaded functions).
Diffstat (limited to 'graphics')
4 files changed, 39 insertions, 2 deletions
diff --git a/graphics/lprof/Makefile b/graphics/lprof/Makefile index f153b1ced71..e1bf0ed4331 100644 --- a/graphics/lprof/Makefile +++ b/graphics/lprof/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2013/10/09 17:39:11 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2014/08/21 16:37:51 jperkin Exp $ # DISTNAME= lprof-1.10.1 @@ -12,6 +12,7 @@ COMMENT= ICC Profile generation tool (for IT8.7 targets) MAKE_JOBS_SAFE= no LDFLAGS.DragonFly= -lstdc++ +LDFLAGS.SunOS+= -lstdc++ USE_TOOLS+= gmake diff --git a/graphics/lprof/distinfo b/graphics/lprof/distinfo index f4ad6ae4b77..641e4797f66 100644 --- a/graphics/lprof/distinfo +++ b/graphics/lprof/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2012/12/24 21:11:17 joerg Exp $ +$NetBSD: distinfo,v 1.6 2014/08/21 16:37:51 jperkin Exp $ SHA1 (lprof-1.10.1.tar.gz) = ad7cc5fff5d6dfff9d0993d201232d7bb71a46aa RMD160 (lprof-1.10.1.tar.gz) = d4a20cffe42a2ca12a1321a2e6013756e447300f @@ -12,3 +12,5 @@ SHA1 (patch-af) = 1e8c4dbe4650bfffb892d831ed94b2317e83ae1d SHA1 (patch-ag) = b6fcbffc42a5d2621c48b3f42c7b9da99294ce41 SHA1 (patch-src_liblprof_lcmsprf.h) = c87f25db911674f5939844dc0f56fe70bd1cd12a SHA1 (patch-src_libqtlcmswidgets_Makefile) = 48631cf675443692845f23c60e614d87186905ca +SHA1 (patch-src_qtMonitorProfiler_qtmonitorprofilerdialog.cpp) = 28314b038e294936606635e15f27962339fab1c8 +SHA1 (patch-src_qtScannerProfiler_qtscannerprofilerdialog.cpp) = 3d01c38a008db08c2976b5534aee6fbe2a8a946c diff --git a/graphics/lprof/patches/patch-src_qtMonitorProfiler_qtmonitorprofilerdialog.cpp b/graphics/lprof/patches/patch-src_qtMonitorProfiler_qtmonitorprofilerdialog.cpp new file mode 100644 index 00000000000..7f08cb23273 --- /dev/null +++ b/graphics/lprof/patches/patch-src_qtMonitorProfiler_qtmonitorprofilerdialog.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-src_qtMonitorProfiler_qtmonitorprofilerdialog.cpp,v 1.1 2014/08/21 16:37:51 jperkin Exp $ + +Fix "error: call of overloaded 'floor(int)' is ambiguous". + +--- src/qtMonitorProfiler/qtmonitorprofilerdialog.cpp.orig 2005-08-22 03:36:58.000000000 +0000 ++++ src/qtMonitorProfiler/qtmonitorprofilerdialog.cpp +@@ -271,8 +271,8 @@ void qtMonitorProfilerDialog::ValuesToCo + + void qtMonitorProfilerDialog::SlidersToValues() + { +- sys.hdr.device.La = floor(LaScroll -> value() / 10); +- sys.hdr.device.Yb = floor(YbScroll -> value() / 10); ++ sys.hdr.device.La = floor((float)LaScroll -> value() / 10); ++ sys.hdr.device.Yb = floor((float)YbScroll -> value() / 10); + + } + diff --git a/graphics/lprof/patches/patch-src_qtScannerProfiler_qtscannerprofilerdialog.cpp b/graphics/lprof/patches/patch-src_qtScannerProfiler_qtscannerprofilerdialog.cpp new file mode 100644 index 00000000000..df292e72a4f --- /dev/null +++ b/graphics/lprof/patches/patch-src_qtScannerProfiler_qtscannerprofilerdialog.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-src_qtScannerProfiler_qtscannerprofilerdialog.cpp,v 1.1 2014/08/21 16:37:51 jperkin Exp $ + +Fix "error: call of overloaded 'floor(int)' is ambiguous". + +--- src/qtScannerProfiler/qtscannerprofilerdialog.cpp.orig 2005-08-20 01:11:41.000000000 +0000 ++++ src/qtScannerProfiler/qtscannerprofilerdialog.cpp +@@ -179,8 +179,8 @@ void qtScannerProfilerDialog::ValuesToCo + + void qtScannerProfilerDialog::SlidersToValues() + { +- sys.hdr.device.La = floor(LaScroll -> value() / 10); +- sys.hdr.device.Yb = floor(YbScroll -> value() / 10); ++ sys.hdr.device.La = floor((float)LaScroll -> value() / 10); ++ sys.hdr.device.Yb = floor((float)YbScroll -> value() / 10); + + } + |