diff options
| author | joerg <joerg> | 2014-10-13 20:53:46 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2014-10-13 20:53:46 +0000 |
| commit | 858b47cfd38af3221447d68cdd5284109e9a70ed (patch) | |
| tree | a27b4639293e2354f29bc695e3a2e75d3edb26ba /www | |
| parent | 7fe0005ab5b81fb804560f5b09cb3d10c88bc4da (diff) | |
| download | pkgsrc-858b47cfd38af3221447d68cdd5284109e9a70ed.tar.gz | |
No conflicting forward declaration of SoundTouch.
Diffstat (limited to 'www')
| -rw-r--r-- | www/firefox/distinfo | 4 | ||||
| -rw-r--r-- | www/firefox/patches/patch-content_media_AudioStream.h | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 02194e852d4..be6c789bc70 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.160 2014/10/05 01:59:08 ryoon Exp $ +$NetBSD: distinfo,v 1.161 2014/10/13 20:53:46 joerg Exp $ SHA1 (firefox-32.0.3.source.tar.bz2) = 1f831147365478e353212714038e812ca3e9fe42 RMD160 (firefox-32.0.3.source.tar.bz2) = f09e2cc92a35f0f3e88079d063c22bf16215327a @@ -33,7 +33,7 @@ SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598 SHA1 (patch-config_system-headers) = c586c07d96ba3bd6ac35247ed50eab0978ccc949 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491 SHA1 (patch-content_base_src_moz.build) = fc2660dcc82f11c89d6d5a5772f27c9827f58f44 -SHA1 (patch-content_media_AudioStream.h) = 95270817c8d2efd794f440f985fd0da6ef7ed333 +SHA1 (patch-content_media_AudioStream.h) = 84e7c5457baf01da37468c3536d30a9003a2bbb6 SHA1 (patch-content_media_Makefile.in) = 54c8c5e41eb36bae0ce544360ded9f75ba3acc13 SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = 524a669e411189926e142912b6d94d3d8dbdb0eb SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1 diff --git a/www/firefox/patches/patch-content_media_AudioStream.h b/www/firefox/patches/patch-content_media_AudioStream.h index 5ae162d0a86..71f2d58467c 100644 --- a/www/firefox/patches/patch-content_media_AudioStream.h +++ b/www/firefox/patches/patch-content_media_AudioStream.h @@ -1,4 +1,4 @@ -$NetBSD: patch-content_media_AudioStream.h,v 1.6 2014/10/05 01:59:08 ryoon Exp $ +$NetBSD: patch-content_media_AudioStream.h,v 1.7 2014/10/13 20:53:46 joerg Exp $ --- content/media/AudioStream.h.orig 2014-09-24 01:05:11.000000000 +0000 +++ content/media/AudioStream.h @@ -10,12 +10,14 @@ $NetBSD: patch-content_media_AudioStream.h,v 1.6 2014/10/05 01:59:08 ryoon Exp $ template <> class nsAutoRefTraits<cubeb_stream> : public nsPointerRefTraits<cubeb_stream> -@@ -26,7 +27,7 @@ public: +@@ -25,10 +26,6 @@ public: + static void Release(cubeb_stream* aStream) { cubeb_stream_destroy(aStream); } }; - namespace soundtouch { +-namespace soundtouch { -class SoundTouch; -+class MOZ_IMPORT_API SoundTouch; - } - +-} +- namespace mozilla { + + class AudioStream; |