Fri Jul 25 14:21:18 2014 UTC ()
Fix (one?) build problem with GCC 4.5.3.


(tron)
diff -r1.157 -r1.158 pkgsrc/www/firefox/distinfo
diff -r0 -r1.1 pkgsrc/www/firefox/patches/patch-content_media_fmp4_demuxer_bit_reader.cc
cvs diff -r1.157 -r1.158 pkgsrc/www/firefox/distinfo (expand / switch to unified diff)

--- pkgsrc/www/firefox/distinfo 2014/07/24 14:57:12 1.157
+++ pkgsrc/www/firefox/distinfo 2014/07/25 14:21:18 1.158
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.157 2014/07/24 14:57:12 ryoon Exp $ 1$NetBSD: distinfo,v 1.158 2014/07/25 14:21:18 tron Exp $
2 2
3SHA1 (firefox-31.0.source.tar.bz2) = a6c3e25ee3aeb7da42db2aaeb50a385d63532beb 3SHA1 (firefox-31.0.source.tar.bz2) = a6c3e25ee3aeb7da42db2aaeb50a385d63532beb
4RMD160 (firefox-31.0.source.tar.bz2) = 8512ed164920c9fdad492ba2b47b46aae4894564 4RMD160 (firefox-31.0.source.tar.bz2) = 8512ed164920c9fdad492ba2b47b46aae4894564
5Size (firefox-31.0.source.tar.bz2) = 147507120 bytes 5Size (firefox-31.0.source.tar.bz2) = 147507120 bytes
6SHA1 (patch-aa) = b58a026dda6b32421f23e206894dfc28dbb9fb86 6SHA1 (patch-aa) = b58a026dda6b32421f23e206894dfc28dbb9fb86
7SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be 7SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be
8SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5 8SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5
9SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9 9SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
10SHA1 (patch-as) = c197e5bf9ef2f325add320f59c81525b1162a2d3 10SHA1 (patch-as) = c197e5bf9ef2f325add320f59c81525b1162a2d3
11SHA1 (patch-b2g_installer_Makefile.in) = 7b3cca1da34c444c1055deec21723db909ec3d94 11SHA1 (patch-b2g_installer_Makefile.in) = 7b3cca1da34c444c1055deec21723db909ec3d94
12SHA1 (patch-b2g_installer_package-manifest.in) = 56d73f510fb807ad11f40b0ceec50961049549da 12SHA1 (patch-b2g_installer_package-manifest.in) = 56d73f510fb807ad11f40b0ceec50961049549da
13SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756 13SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
14SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25 14SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25
@@ -25,26 +25,27 @@ SHA1 (patch-build_gyp.mozbuild) = 2842da @@ -25,26 +25,27 @@ SHA1 (patch-build_gyp.mozbuild) = 2842da
25SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f6c 25SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f6c
26SHA1 (patch-config_Makefile.in) = 296bd3bc33346cfcfa658fe641c2ee2ac67549f1 26SHA1 (patch-config_Makefile.in) = 296bd3bc33346cfcfa658fe641c2ee2ac67549f1
27SHA1 (patch-config_baseconfig.mk) = 07c295fbfbaeb969b336def32d8924729e332075 27SHA1 (patch-config_baseconfig.mk) = 07c295fbfbaeb969b336def32d8924729e332075
28SHA1 (patch-config_external_moz.build) = f437c4802de266caf512dc470879c8ed0961559b 28SHA1 (patch-config_external_moz.build) = f437c4802de266caf512dc470879c8ed0961559b
29SHA1 (patch-config_rules.mk) = ec74e2e385e95252a1325c8c9c859a0b2dcee693 29SHA1 (patch-config_rules.mk) = ec74e2e385e95252a1325c8c9c859a0b2dcee693
30SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1 30SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
31SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b 31SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
32SHA1 (patch-config_system-headers) = c586c07d96ba3bd6ac35247ed50eab0978ccc949 32SHA1 (patch-config_system-headers) = c586c07d96ba3bd6ac35247ed50eab0978ccc949
33SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491 33SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
34SHA1 (patch-content_base_src_moz.build) = fc2660dcc82f11c89d6d5a5772f27c9827f58f44 34SHA1 (patch-content_base_src_moz.build) = fc2660dcc82f11c89d6d5a5772f27c9827f58f44
35SHA1 (patch-content_media_AudioStream.cpp) = 70021dfd1cc86e8999f144b49a23bfb27dd24157 35SHA1 (patch-content_media_AudioStream.cpp) = 70021dfd1cc86e8999f144b49a23bfb27dd24157
36SHA1 (patch-content_media_AudioStream.h) = 5cda5329db7bef4c45f3a05a33a5ee7043ec3c2e 36SHA1 (patch-content_media_AudioStream.h) = 5cda5329db7bef4c45f3a05a33a5ee7043ec3c2e
37SHA1 (patch-content_media_Makefile.in) = 54c8c5e41eb36bae0ce544360ded9f75ba3acc13 37SHA1 (patch-content_media_Makefile.in) = 54c8c5e41eb36bae0ce544360ded9f75ba3acc13
 38SHA1 (patch-content_media_fmp4_demuxer_bit_reader.cc) = 6d87cd7231e61a12396d15dd2fa3d1a51051e8ee
38SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = 524a669e411189926e142912b6d94d3d8dbdb0eb 39SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = 524a669e411189926e142912b6d94d3d8dbdb0eb
39SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1 40SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1
40SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e 41SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e
41SHA1 (patch-dom_plugins_ipc_PluginProcessChild.cpp) = 5ab28cc0398b72cb5e1b0586406845495b9f87e4 42SHA1 (patch-dom_plugins_ipc_PluginProcessChild.cpp) = 5ab28cc0398b72cb5e1b0586406845495b9f87e4
42SHA1 (patch-dom_system_OSFileConstants.cpp) = fec01c3c2c1b7e1c57abe9ec269067ee98eede3d 43SHA1 (patch-dom_system_OSFileConstants.cpp) = fec01c3c2c1b7e1c57abe9ec269067ee98eede3d
43SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = a2a0652d0eac018fda06e729bf5ba786dd8a3866 44SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = a2a0652d0eac018fda06e729bf5ba786dd8a3866
44SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce 45SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce
45SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9 46SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9
46SHA1 (patch-gfx_skia_Makefile.in) = 03349db0ff9b14c2012c36d746adf2ee6cb87e62 47SHA1 (patch-gfx_skia_Makefile.in) = 03349db0ff9b14c2012c36d746adf2ee6cb87e62
47SHA1 (patch-gfx_thebes_Makefile.in) = 16b63bc42870aa8c042416c6e04b3513981ca6f0 48SHA1 (patch-gfx_thebes_Makefile.in) = 16b63bc42870aa8c042416c6e04b3513981ca6f0
48SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e5df11499b1ec14e1d4c9a1408c0611d1c4e0574 49SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e5df11499b1ec14e1d4c9a1408c0611d1c4e0574
49SHA1 (patch-intl_hyphenation_src_hnjalloc.h) = 7fcc7b0fcf5a33486214197e925fbc8e6e22e2ee 50SHA1 (patch-intl_hyphenation_src_hnjalloc.h) = 7fcc7b0fcf5a33486214197e925fbc8e6e22e2ee
50SHA1 (patch-intl_unicharutil_util_Makefile.in) = c8f37cc420ba26b63c66fbbf69b13a8b4fea43fc 51SHA1 (patch-intl_unicharutil_util_Makefile.in) = c8f37cc420ba26b63c66fbbf69b13a8b4fea43fc
File Added: pkgsrc/www/firefox/patches/Attic/patch-content_media_fmp4_demuxer_bit_reader.cc
$NetBSD: patch-content_media_fmp4_demuxer_bit_reader.cc,v 1.1 2014/07/25 14:21:18 tron Exp $

Fix build with pre-C++11 compilers like G++ 4.5.3.

--- content/media/fmp4/demuxer/bit_reader.cc.orig	2014-07-17 02:45:09.000000000 +0100
+++ content/media/fmp4/demuxer/bit_reader.cc	2014-07-25 13:00:34.000000000 +0100
@@ -9,7 +9,7 @@
 
 BitReader::BitReader(const uint8_t* data, off_t size)
     : data_(data), bytes_left_(size), num_remaining_bits_in_curr_byte_(0) {
-  DCHECK(data_ != nullptr && bytes_left_ > 0);
+  DCHECK(data_ != 0 && bytes_left_ > 0);
 
   UpdateCurrByte();
 }