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
cvs diff -r1.102 -r1.103 pkgsrc/devel/xulrunner/Attic/distinfo (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.102 2013/04/13 12:44:36 ryoon Exp $ 1$NetBSD: distinfo,v 1.103 2013/05/11 23:33:14 mef Exp $
2 2
3SHA1 (firefox-20.0.1.source.tar.bz2) = 8d8f775293982f2526bb2da5dc743cd20a47af47 3SHA1 (firefox-20.0.1.source.tar.bz2) = 8d8f775293982f2526bb2da5dc743cd20a47af47
4RMD160 (firefox-20.0.1.source.tar.bz2) = a09371db65b3fd052197039a1e0f6c1f4e37823a 4RMD160 (firefox-20.0.1.source.tar.bz2) = a09371db65b3fd052197039a1e0f6c1f4e37823a
5Size (firefox-20.0.1.source.tar.bz2) = 100154949 bytes 5Size (firefox-20.0.1.source.tar.bz2) = 100154949 bytes
6SHA1 (patch-aa) = 41c49c9f8c6447bd42477869005827729bf9a8c9 6SHA1 (patch-aa) = 41c49c9f8c6447bd42477869005827729bf9a8c9
7SHA1 (patch-ab) = b60129618bb0945b65636f99980bdc026ec16fd9 7SHA1 (patch-ab) = b60129618bb0945b65636f99980bdc026ec16fd9
8SHA1 (patch-ac) = 609a094d01878da0bdfb008a0cb30b96bdb4c6ce 8SHA1 (patch-ac) = 609a094d01878da0bdfb008a0cb30b96bdb4c6ce
9SHA1 (patch-ae) = adbf406cf3158ff2ecb847673d9d91edb200f034 9SHA1 (patch-ae) = adbf406cf3158ff2ecb847673d9d91edb200f034
10SHA1 (patch-ag) = 3e6f3e2e9d0c7c498fbc39eabae798d1a7f8fb12 10SHA1 (patch-ag) = 3e6f3e2e9d0c7c498fbc39eabae798d1a7f8fb12
11SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be 11SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be
12SHA1 (patch-al) = 553c6042a98e4b381a46eec50c02cff349d88bd2 12SHA1 (patch-al) = 553c6042a98e4b381a46eec50c02cff349d88bd2
13SHA1 (patch-am) = c5aa36638b666d99d4510f345802de259579e884 13SHA1 (patch-am) = c5aa36638b666d99d4510f345802de259579e884
14SHA1 (patch-an) = 4c8ca17d259f56863d6066f1e3de0d81fefdcd6c 14SHA1 (patch-an) = 4c8ca17d259f56863d6066f1e3de0d81fefdcd6c
@@ -52,13 +52,14 @@ SHA1 (patch-xb) = 30eea880b40cee45d1235d @@ -52,13 +52,14 @@ SHA1 (patch-xb) = 30eea880b40cee45d1235d
52SHA1 (patch-xc) = 8575fdac2b47966ccfb5e1cc7ca8505163e358c9 52SHA1 (patch-xc) = 8575fdac2b47966ccfb5e1cc7ca8505163e358c9
53SHA1 (patch-xd) = 5fcb512091db8193ade345ece8eb2909f0a278e7 53SHA1 (patch-xd) = 5fcb512091db8193ade345ece8eb2909f0a278e7
54SHA1 (patch-xe) = ca4c87dbf9bb09e0e6c270d0fa76fc69a7d6df7f 54SHA1 (patch-xe) = ca4c87dbf9bb09e0e6c270d0fa76fc69a7d6df7f
55SHA1 (patch-xf) = 1720ae5cf3cf0df6f2e9519c83a332585bdd67bf 55SHA1 (patch-xf) = 1720ae5cf3cf0df6f2e9519c83a332585bdd67bf
56SHA1 (patch-xg) = b80e660e85b06e4f71146bd41bd4bc0d2e3b6488 56SHA1 (patch-xg) = b80e660e85b06e4f71146bd41bd4bc0d2e3b6488
57SHA1 (patch-xj) = c373bb0135ef042d07c98e648dce1612a0b47efe 57SHA1 (patch-xj) = c373bb0135ef042d07c98e648dce1612a0b47efe
58SHA1 (patch-xk) = 3accd4080f4576391f06a0a16a8fb477b2d7b3e3 58SHA1 (patch-xk) = 3accd4080f4576391f06a0a16a8fb477b2d7b3e3
59SHA1 (patch-xl) = e7dbe631e8d1fcee48054c0cb8ff01169cfcb744 59SHA1 (patch-xl) = e7dbe631e8d1fcee48054c0cb8ff01169cfcb744
60SHA1 (patch-xm) = 81e02e410c00175cbb98c646dda90c7adf199657 60SHA1 (patch-xm) = 81e02e410c00175cbb98c646dda90c7adf199657
61SHA1 (patch-xn) = c042e39d93706934ec03c78be3dc6e224ac62c0e 61SHA1 (patch-xn) = c042e39d93706934ec03c78be3dc6e224ac62c0e
62SHA1 (patch-xo) = aae6107dcfaf731bd3e9962d953fb8701fc5f163 62SHA1 (patch-xo) = aae6107dcfaf731bd3e9962d953fb8701fc5f163
63SHA1 (patch-xpcom_Makefile.in) = e5f77ed56ed4ad26a08a67085e3dfec0e7af3fa6 63SHA1 (patch-xpcom_Makefile.in) = e5f77ed56ed4ad26a08a67085e3dfec0e7af3fa6
64SHA1 (patch-xpcom_ds_TimeStamp.h) = a1fb060f91720eb330f102b28d9373bbdbe96e30 64SHA1 (patch-xpcom_ds_TimeStamp.h) = a1fb060f91720eb330f102b28d9373bbdbe96e30
 65SHA1 (patch-xpcom_io_nsMultiplexInputStream_cpp) = 0e52d36de427d15cfb7df8f5c7ff4695f627cc6c
File Added: pkgsrc/devel/xulrunner/patches/Attic/patch-xpcom_io_nsMultiplexInputStream_cpp
$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);