Thu Aug 21 16:37:51 2014 UTC ()
Fix build on SunOS (needs explicit -lstdc++, avoid overloaded functions).


(jperkin)
diff -r1.29 -r1.30 pkgsrc/graphics/lprof/Makefile
diff -r1.5 -r1.6 pkgsrc/graphics/lprof/distinfo
diff -r0 -r1.1 pkgsrc/graphics/lprof/patches/patch-src_qtMonitorProfiler_qtmonitorprofilerdialog.cpp
diff -r0 -r1.1 pkgsrc/graphics/lprof/patches/patch-src_qtScannerProfiler_qtscannerprofilerdialog.cpp

cvs diff -r1.29 -r1.30 pkgsrc/graphics/lprof/Attic/Makefile (expand / switch to context diff)
--- pkgsrc/graphics/lprof/Attic/Makefile 2013/10/09 17:39:11 1.29
+++ pkgsrc/graphics/lprof/Attic/Makefile 2014/08/21 16:37:51 1.30
@@ -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 @@
 
 MAKE_JOBS_SAFE=		no
 LDFLAGS.DragonFly=	-lstdc++
+LDFLAGS.SunOS+=		-lstdc++
 
 USE_TOOLS+=	gmake
 

cvs diff -r1.5 -r1.6 pkgsrc/graphics/lprof/Attic/distinfo (expand / switch to context diff)
--- pkgsrc/graphics/lprof/Attic/distinfo 2012/12/24 21:11:17 1.5
+++ pkgsrc/graphics/lprof/Attic/distinfo 2014/08/21 16:37:51 1.6
@@ -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-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

File Added: pkgsrc/graphics/lprof/patches/Attic/patch-src_qtMonitorProfiler_qtmonitorprofilerdialog.cpp
$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);
 
 }
 

File Added: pkgsrc/graphics/lprof/patches/Attic/patch-src_qtScannerProfiler_qtscannerprofilerdialog.cpp
$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);
 
 }