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 (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,64 +1,65 @@ @@ -1,64 +1,65 @@
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
15SHA1 (patch-ao) = ebf95a9abf76439cdd890ea34f75f0d8d1114fe0 15SHA1 (patch-ao) = ebf95a9abf76439cdd890ea34f75f0d8d1114fe0
16SHA1 (patch-as) = 1cd7a9c7e1cf7603f2d72111f3abc9d3747a9c32 16SHA1 (patch-as) = 1cd7a9c7e1cf7603f2d72111f3abc9d3747a9c32
17SHA1 (patch-at) = c5cb543ab423657d546559de0603356c9bc2f2f3 17SHA1 (patch-at) = c5cb543ab423657d546559de0603356c9bc2f2f3
18SHA1 (patch-au) = d577fc9a0091915e36d67a6ad82f0e7bfc107e7b 18SHA1 (patch-au) = d577fc9a0091915e36d67a6ad82f0e7bfc107e7b
19SHA1 (patch-av) = 20dcf216808667d71e527a6126b1a9b76130a13b 19SHA1 (patch-av) = 20dcf216808667d71e527a6126b1a9b76130a13b
20SHA1 (patch-aw) = 237be5fa18846b51b67ef2c2ea5f4fb427c529aa 20SHA1 (patch-aw) = 237be5fa18846b51b67ef2c2ea5f4fb427c529aa
21SHA1 (patch-az) = 2012a7fef2eac59f48ff21fea0e205e89b313e46 21SHA1 (patch-az) = 2012a7fef2eac59f48ff21fea0e205e89b313e46
22SHA1 (patch-ba) = 1692053c1b0e65dd38bcf37cc1a80390cce081eb 22SHA1 (patch-ba) = 1692053c1b0e65dd38bcf37cc1a80390cce081eb
23SHA1 (patch-bd) = 1a24cb9e4dc312725d0a6ffdf202b6f3e98d17fb 23SHA1 (patch-bd) = 1a24cb9e4dc312725d0a6ffdf202b6f3e98d17fb
24SHA1 (patch-bf) = 6a052e8c83967e9054a81eb11f1501eb50e88782 24SHA1 (patch-bf) = 6a052e8c83967e9054a81eb11f1501eb50e88782
25SHA1 (patch-bg) = e5af56b3dca81ad67149c09942580ebd9062b38d 25SHA1 (patch-bg) = e5af56b3dca81ad67149c09942580ebd9062b38d
26SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85 26SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85
27SHA1 (patch-build_autoconf_nss.m4) = 4731f46a41f6d4ff31a6da07c9badb328a0f676f 27SHA1 (patch-build_autoconf_nss.m4) = 4731f46a41f6d4ff31a6da07c9badb328a0f676f
28SHA1 (patch-config_baseconfig.mk) = 4f8e966e5e9684c165929d02f82099fb4befcc75 28SHA1 (patch-config_baseconfig.mk) = 4f8e966e5e9684c165929d02f82099fb4befcc75
29SHA1 (patch-gfx_skia_Makefile.in) = ddc7e4a375f4cfd7dd76c5b37835bbcd3ad13cf1 29SHA1 (patch-gfx_skia_Makefile.in) = ddc7e4a375f4cfd7dd76c5b37835bbcd3ad13cf1
30SHA1 (patch-gfx_skia_src_sfnt_SkOTTable__head.h) = 493fced792610ea1ce5ab6b1e043ef36b33f8279 30SHA1 (patch-gfx_skia_src_sfnt_SkOTTable__head.h) = 493fced792610ea1ce5ab6b1e043ef36b33f8279
31SHA1 (patch-gfx_skia_src_sfnt_SkOTTable__name.h) = 61a6611b3dd08f5bd56681244eefbfa3f209f6a1 31SHA1 (patch-gfx_skia_src_sfnt_SkOTTable__name.h) = 61a6611b3dd08f5bd56681244eefbfa3f209f6a1
32SHA1 (patch-gfx_skia_src_sfnt_SkSFNTHeader.h) = 9d997d23ed80370e5b36648b9b35d80c5db88be8 32SHA1 (patch-gfx_skia_src_sfnt_SkSFNTHeader.h) = 9d997d23ed80370e5b36648b9b35d80c5db88be8
33SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = 1ebc8e894e9d63961f49ba0798ad3eed100d95a6 33SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = 1ebc8e894e9d63961f49ba0798ad3eed100d95a6
34SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = a6175d1e97966944f14cb96ed3527e879412534b 34SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = a6175d1e97966944f14cb96ed3527e879412534b
35SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = faed34d94646453cd01acbdec1da2d9ec0f3d05f 35SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = faed34d94646453cd01acbdec1da2d9ec0f3d05f
36SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 4025c0a4e149d9b2087331e10b342734fa77a905 36SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 4025c0a4e149d9b2087331e10b342734fa77a905
37SHA1 (patch-js_src_jsgc.cpp) = c514b7fb84002a1909638cd7f3386931cb0f2551 37SHA1 (patch-js_src_jsgc.cpp) = c514b7fb84002a1909638cd7f3386931cb0f2551
38SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = f9b13d9e7910613c82f6b1ee4131a6c4eb1d4580 38SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = f9b13d9e7910613c82f6b1ee4131a6c4eb1d4580
39SHA1 (patch-mb) = d6f624296ac83bebfdb4ad5e06e64d6d0c2541a3 39SHA1 (patch-mb) = d6f624296ac83bebfdb4ad5e06e64d6d0c2541a3
40SHA1 (patch-md) = 7fd607a3edd2ea5f7a5671fc6d06fba69c46c36f 40SHA1 (patch-md) = 7fd607a3edd2ea5f7a5671fc6d06fba69c46c36f
41SHA1 (patch-me) = 2ff755782bd35caded8934000d039976dad44103 41SHA1 (patch-me) = 2ff755782bd35caded8934000d039976dad44103
42SHA1 (patch-mp) = 2d426af76011d1caaddf347941fcdaae6b524524 42SHA1 (patch-mp) = 2d426af76011d1caaddf347941fcdaae6b524524
43SHA1 (patch-pa) = 8045cf02d83e87684b497dd30e890107f76a3bdf 43SHA1 (patch-pa) = 8045cf02d83e87684b497dd30e890107f76a3bdf
44SHA1 (patch-pb) = 7665d8156fa734cdc2e1746558cc08b7eefce98e 44SHA1 (patch-pb) = 7665d8156fa734cdc2e1746558cc08b7eefce98e
45SHA1 (patch-pc) = 099a4f6ac32fd2f45c91eb525750bde96684693a 45SHA1 (patch-pc) = 099a4f6ac32fd2f45c91eb525750bde96684693a
46SHA1 (patch-pd) = 9750259906ee270f6898e3c77288aa5260d6e9a7 46SHA1 (patch-pd) = 9750259906ee270f6898e3c77288aa5260d6e9a7
47SHA1 (patch-pg) = d6d6071cbe8a771873e1537034c0bb9186f8e245 47SHA1 (patch-pg) = d6d6071cbe8a771873e1537034c0bb9186f8e245
48SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121 48SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121
49SHA1 (patch-toolkit_toolkit-tiers.mk) = 59e5174edd04f3c4e5d6ebb450a42e4e1dee0801 49SHA1 (patch-toolkit_toolkit-tiers.mk) = 59e5174edd04f3c4e5d6ebb450a42e4e1dee0801
50SHA1 (patch-xa) = 9182485283599a96663358bdc680c5cdb1d94a78 50SHA1 (patch-xa) = 9182485283599a96663358bdc680c5cdb1d94a78
51SHA1 (patch-xb) = 30eea880b40cee45d1235d3292fead4b5a54bbaa 51SHA1 (patch-xb) = 30eea880b40cee45d1235d3292fead4b5a54bbaa
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);