Fri Oct 17 16:49:09 2014 UTC ()
Do not provide conflicing forward defines, take three.


(joerg)
diff -r1.162 -r1.163 pkgsrc/www/firefox/distinfo
diff -r1.8 -r1.9 pkgsrc/www/firefox/patches/patch-content_media_AudioStream.h
cvs diff -r1.162 -r1.163 pkgsrc/www/firefox/distinfo (expand / switch to unified diff)

--- pkgsrc/www/firefox/distinfo 2014/10/15 13:07:07 1.162
+++ pkgsrc/www/firefox/distinfo 2014/10/17 16:49:09 1.163
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.162 2014/10/15 13:07:07 ryoon Exp $ 1$NetBSD: distinfo,v 1.163 2014/10/17 16:49:09 joerg Exp $
2 2
3SHA1 (firefox-33.0.source.tar.bz2) = ad10e8fefcd9687d2b67bacafa4ecb5f5ca4af66 3SHA1 (firefox-33.0.source.tar.bz2) = ad10e8fefcd9687d2b67bacafa4ecb5f5ca4af66
4RMD160 (firefox-33.0.source.tar.bz2) = f1f961927e12563db73cda811fe9557d5bc27f17 4RMD160 (firefox-33.0.source.tar.bz2) = f1f961927e12563db73cda811fe9557d5bc27f17
5Size (firefox-33.0.source.tar.bz2) = 155177527 bytes 5Size (firefox-33.0.source.tar.bz2) = 155177527 bytes
6SHA1 (patch-aa) = 9975c507837d3894ca4915e5c5fd65264f1cd526 6SHA1 (patch-aa) = 9975c507837d3894ca4915e5c5fd65264f1cd526
7SHA1 (patch-ak) = ebbb0c0c6e7923acc056f15ebd11307726ec65dc 7SHA1 (patch-ak) = ebbb0c0c6e7923acc056f15ebd11307726ec65dc
8SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5 8SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5
9SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9 9SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
10SHA1 (patch-as) = e20234ba1ce89035132c436fd3f77d0170cb3b42 10SHA1 (patch-as) = e20234ba1ce89035132c436fd3f77d0170cb3b42
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
@@ -22,27 +22,27 @@ SHA1 (patch-build_autoconf_compiler-opts @@ -22,27 +22,27 @@ SHA1 (patch-build_autoconf_compiler-opts
22SHA1 (patch-build_autoconf_nss.m4) = bf65db126705a3a1ba294418b9380683ea401fc7 22SHA1 (patch-build_autoconf_nss.m4) = bf65db126705a3a1ba294418b9380683ea401fc7
23SHA1 (patch-build_clang-plugin_configure) = eb5bf7774a938766bffd7636811801b96afd2280 23SHA1 (patch-build_clang-plugin_configure) = eb5bf7774a938766bffd7636811801b96afd2280
24SHA1 (patch-build_gyp.mozbuild) = 2842da0783d344dd12e86adde447f7cda6191518 24SHA1 (patch-build_gyp.mozbuild) = 2842da0783d344dd12e86adde447f7cda6191518
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) = 99b10ed0e04f78f97678bd81cbc5da09aecf88e4 28SHA1 (patch-config_external_moz.build) = 99b10ed0e04f78f97678bd81cbc5da09aecf88e4
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.h) = 4a1ef292295623815bc56afd36bb86ab68d2b567 35SHA1 (patch-content_media_AudioStream.h) = 255cf76824d96fe907f30414e4ba15ae841d304f
36SHA1 (patch-content_media_Makefile.in) = 54c8c5e41eb36bae0ce544360ded9f75ba3acc13 36SHA1 (patch-content_media_Makefile.in) = 54c8c5e41eb36bae0ce544360ded9f75ba3acc13
37SHA1 (patch-content_media_gmp_GMPChild.cpp) = 45ef3a46c624c38dbb5b81deb6409277997c7239 37SHA1 (patch-content_media_gmp_GMPChild.cpp) = 45ef3a46c624c38dbb5b81deb6409277997c7239
38SHA1 (patch-content_media_gmp_GMPParent.cpp) = ff5ff0d044874ea9cf5cbe27aebc91b24d30c803 38SHA1 (patch-content_media_gmp_GMPParent.cpp) = ff5ff0d044874ea9cf5cbe27aebc91b24d30c803
39SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = 524a669e411189926e142912b6d94d3d8dbdb0eb 39SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = 524a669e411189926e142912b6d94d3d8dbdb0eb
40SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1 40SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1
41SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e 41SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e
42SHA1 (patch-dom_plugins_ipc_PluginProcessChild.cpp) = 5ab28cc0398b72cb5e1b0586406845495b9f87e4 42SHA1 (patch-dom_plugins_ipc_PluginProcessChild.cpp) = 5ab28cc0398b72cb5e1b0586406845495b9f87e4
43SHA1 (patch-dom_system_OSFileConstants.cpp) = fec01c3c2c1b7e1c57abe9ec269067ee98eede3d 43SHA1 (patch-dom_system_OSFileConstants.cpp) = fec01c3c2c1b7e1c57abe9ec269067ee98eede3d
44SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = a2a0652d0eac018fda06e729bf5ba786dd8a3866 44SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = a2a0652d0eac018fda06e729bf5ba786dd8a3866
45SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce 45SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce
46SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9 46SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9
47SHA1 (patch-gfx_skia_Makefile.in) = 03349db0ff9b14c2012c36d746adf2ee6cb87e62 47SHA1 (patch-gfx_skia_Makefile.in) = 03349db0ff9b14c2012c36d746adf2ee6cb87e62
48SHA1 (patch-gfx_thebes_Makefile.in) = 16b63bc42870aa8c042416c6e04b3513981ca6f0 48SHA1 (patch-gfx_thebes_Makefile.in) = 16b63bc42870aa8c042416c6e04b3513981ca6f0
cvs diff -r1.8 -r1.9 pkgsrc/www/firefox/patches/Attic/patch-content_media_AudioStream.h (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-content_media_AudioStream.h 2014/10/15 13:07:07 1.8
+++ pkgsrc/www/firefox/patches/Attic/patch-content_media_AudioStream.h 2014/10/17 16:49:09 1.9
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1$NetBSD: patch-content_media_AudioStream.h,v 1.8 2014/10/15 13:07:07 ryoon Exp $ 1$NetBSD: patch-content_media_AudioStream.h,v 1.9 2014/10/17 16:49:09 joerg Exp $
2 2
3--- content/media/AudioStream.h.orig 2014-10-11 09:06:20.000000000 +0000 3--- content/media/AudioStream.h.orig 2014-10-11 09:06:20.000000000 +0000
4+++ content/media/AudioStream.h 4+++ content/media/AudioStream.h
5@@ -17,6 +17,7 @@ 5@@ -17,6 +17,7 @@
6 #include "mozilla/RefPtr.h" 6 #include "mozilla/RefPtr.h"
7  7
8 #include "cubeb/cubeb.h" 8 #include "cubeb/cubeb.h"
9+#include "soundtouch/SoundTouch.h" 9+#include "soundtouch/SoundTouch.h"
10  10
11 template <> 11 template <>
12 class nsAutoRefTraits<cubeb_stream> : public nsPointerRefTraits<cubeb_stream> 12 class nsAutoRefTraits<cubeb_stream> : public nsPointerRefTraits<cubeb_stream>
13@@ -26,7 +27,7 @@ public: 13@@ -26,7 +27,6 @@ public:
14 }; 14 };
15  15
16 namespace soundtouch { 16 namespace soundtouch {
17-class SoundTouch; 17-class SoundTouch;
18+class MOZ_IMPORT_API SoundTouch; 
19 } 18 }
20  19
21 namespace mozilla { 20 namespace mozilla {