Sat May 11 23:33:14 2013 UTC ()
Fix following DragonFly build problem as PR pkg/47722
/usr/pkgsrc/devel/xulrunner/work/mozilla-release/
xpcom/io/nsMultiplexInputStream.cpp:532:83:
error: no matching function for call to
'NS_MIN(int64_t&,__gnu_cxx::__enable_if<true, double>::__type)'
(mef)
diff -r1.102 -r1.103 pkgsrc/devel/xulrunner/distinfo
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-xpcom_io_nsMultiplexInputStream_cpp
--- pkgsrc/devel/xulrunner/Attic/distinfo 2013/04/13 12:44:36 1.102
+++ pkgsrc/devel/xulrunner/Attic/distinfo 2013/05/11 23:33:14 1.103
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.102 2013/04/13 12:44:36 ryoon Exp $
+$NetBSD: distinfo,v 1.103 2013/05/11 23:33:14 mef Exp $
SHA1 (firefox-20.0.1.source.tar.bz2) = 8d8f775293982f2526bb2da5dc743cd20a47af47
RMD160 (firefox-20.0.1.source.tar.bz2) = a09371db65b3fd052197039a1e0f6c1f4e37823a
@@ -62,3 +62,4 @@
SHA1 (patch-xo) = aae6107dcfaf731bd3e9962d953fb8701fc5f163
SHA1 (patch-xpcom_Makefile.in) = e5f77ed56ed4ad26a08a67085e3dfec0e7af3fa6
SHA1 (patch-xpcom_ds_TimeStamp.h) = a1fb060f91720eb330f102b28d9373bbdbe96e30
+SHA1 (patch-xpcom_io_nsMultiplexInputStream_cpp) = 0e52d36de427d15cfb7df8f5c7ff4695f627cc6c
$NetBSD: patch-xpcom_io_nsMultiplexInputStream_cpp,v 1.1 2013/05/11 23:33:14 mef Exp $
Fix PR/47722, dragonfly (gcc 4.7) build problem:
error: no matching function for call to
'NS_MIN(int64_t&, __gnu_cxx::__enable_if<true, double>::__type)'
devel/xulrunner/work/mozilla-release/xpcom/io/nsMultiplexInputStream.cpp:532:83
--- xpcom/io/nsMultiplexInputStream.cpp.orig 2013-04-10 12:03:01.000000000 +0900
+++ xpcom/io/nsMultiplexInputStream.cpp 2013-04-16 08:01:29.000000000 +0900
@@ -529,7 +529,7 @@ nsMultiplexInputStream::Seek(int32_t aWh
rv = stream->Tell(&avail);
NS_ENSURE_SUCCESS(rv, rv);
- int64_t newPos = streamPos + NS_MIN(avail, std::abs(remaining));
+ int64_t newPos = streamPos + NS_MIN(avail, (int64_t)std::abs(remaining));
rv = stream->Seek(NS_SEEK_END, -newPos);
NS_ENSURE_SUCCESS(rv, rv);