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 unified 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,27 +1,28 @@ @@ -1,27 +1,28 @@
1# $NetBSD: Makefile,v 1.29 2013/10/09 17:39:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.30 2014/08/21 16:37:51 jperkin Exp $
2# 2#
3 3
4DISTNAME= lprof-1.10.1 4DISTNAME= lprof-1.10.1
5PKGREVISION= 20 5PKGREVISION= 20
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lprof/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lprof/}
8 8
9MAINTAINER= gdt@NetBSD.org 9MAINTAINER= gdt@NetBSD.org
10HOMEPAGE= http://lprof.sourceforge.net/ 10HOMEPAGE= http://lprof.sourceforge.net/
11COMMENT= ICC Profile generation tool (for IT8.7 targets) 11COMMENT= ICC Profile generation tool (for IT8.7 targets)
12 12
13MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
14LDFLAGS.DragonFly= -lstdc++ 14LDFLAGS.DragonFly= -lstdc++
 15LDFLAGS.SunOS+= -lstdc++
15 16
16USE_TOOLS+= gmake 17USE_TOOLS+= gmake
17 18
18MAKE_ENV+= BASEDIR=${PREFIX:Q} 19MAKE_ENV+= BASEDIR=${PREFIX:Q}
19MAKE_ENV+= LDFLAGS=${LDFLAGS:M*:Q} 20MAKE_ENV+= LDFLAGS=${LDFLAGS:M*:Q}
20 21
21# mis-usage of ${DESTDIR} 22# mis-usage of ${DESTDIR}
22DESTDIR_VARNAME= #empty 23DESTDIR_VARNAME= #empty
23INSTALL_MAKE_FLAGS+= BASEDIR=${DESTDIR}${PREFIX} 24INSTALL_MAKE_FLAGS+= BASEDIR=${DESTDIR}${PREFIX}
24 25
25PTHREAD_AUTO_VARS= yes 26PTHREAD_AUTO_VARS= yes
26 27
27.include "../../x11/qt3-libs/buildlink3.mk" 28.include "../../x11/qt3-libs/buildlink3.mk"
cvs diff -r1.5 -r1.6 pkgsrc/graphics/lprof/Attic/distinfo (expand / switch to unified 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,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: distinfo,v 1.5 2012/12/24 21:11:17 joerg Exp $ 1$NetBSD: distinfo,v 1.6 2014/08/21 16:37:51 jperkin Exp $
2 2
3SHA1 (lprof-1.10.1.tar.gz) = ad7cc5fff5d6dfff9d0993d201232d7bb71a46aa 3SHA1 (lprof-1.10.1.tar.gz) = ad7cc5fff5d6dfff9d0993d201232d7bb71a46aa
4RMD160 (lprof-1.10.1.tar.gz) = d4a20cffe42a2ca12a1321a2e6013756e447300f 4RMD160 (lprof-1.10.1.tar.gz) = d4a20cffe42a2ca12a1321a2e6013756e447300f
5Size (lprof-1.10.1.tar.gz) = 1244587 bytes 5Size (lprof-1.10.1.tar.gz) = 1244587 bytes
6SHA1 (patch-aa) = 5ee77dffc9d5f30fe72dca7262903fc88988a8f9 6SHA1 (patch-aa) = 5ee77dffc9d5f30fe72dca7262903fc88988a8f9
7SHA1 (patch-ab) = 727da3358b8595c49b4e470a60808685a9b84ac9 7SHA1 (patch-ab) = 727da3358b8595c49b4e470a60808685a9b84ac9
8SHA1 (patch-ac) = cffb4deaf8073ea3b12531c6ab0b8de655cad07e 8SHA1 (patch-ac) = cffb4deaf8073ea3b12531c6ab0b8de655cad07e
9SHA1 (patch-ad) = 711c753f811fdf598b1ec6cb103e7404099847c8 9SHA1 (patch-ad) = 711c753f811fdf598b1ec6cb103e7404099847c8
10SHA1 (patch-ae) = d7631e2f1ca3c206ca604fc71c6706a767f01a42 10SHA1 (patch-ae) = d7631e2f1ca3c206ca604fc71c6706a767f01a42
11SHA1 (patch-af) = 1e8c4dbe4650bfffb892d831ed94b2317e83ae1d 11SHA1 (patch-af) = 1e8c4dbe4650bfffb892d831ed94b2317e83ae1d
12SHA1 (patch-ag) = b6fcbffc42a5d2621c48b3f42c7b9da99294ce41 12SHA1 (patch-ag) = b6fcbffc42a5d2621c48b3f42c7b9da99294ce41
13SHA1 (patch-src_liblprof_lcmsprf.h) = c87f25db911674f5939844dc0f56fe70bd1cd12a 13SHA1 (patch-src_liblprof_lcmsprf.h) = c87f25db911674f5939844dc0f56fe70bd1cd12a
14SHA1 (patch-src_libqtlcmswidgets_Makefile) = 48631cf675443692845f23c60e614d87186905ca 14SHA1 (patch-src_libqtlcmswidgets_Makefile) = 48631cf675443692845f23c60e614d87186905ca
 15SHA1 (patch-src_qtMonitorProfiler_qtmonitorprofilerdialog.cpp) = 28314b038e294936606635e15f27962339fab1c8
 16SHA1 (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);
 
 }