summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bug784776
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2012-08-30 14:54:17 +0000
committerFlorian Smeets <flo@FreeBSD.org>2012-08-30 14:54:17 +0000
commit2f4c3550c50b8b9afa1652eff05e983b4e0d3f51 (patch)
tree2e5e88926978106511a58859840701a45059d65c /www/firefox/files/patch-bug784776
parent- Use more clear and consistent description for OGG (diff)
- update firefox and thunderbird to 15.0
- update firefox-esr, thunderbird-esr, linux-thunderbird and linux-firefox to 10.0.7 - update seamonkey and linux-seamonkey to 2.12 - update nss to 3.13.6 - update bsdipc code (posix_spawn, SysV shared memory) - rename patches to easily track those not (yet) submitted upstream - reduce package size, except for www/libxul[1] - restore default objdir to what it was in 13.0 - fix mail/enigmail after thunderbird build changes - don't accidentally pick up headers from installed ports[3] - add support for PREFIX != LOCALBASE to Makefile.webplugins [4] - document vulnerabilities in vuln.xml - *miscellaneous cleanups and fixups* Obtained from: OpenBSD ports[1] PR: ports/159831, ports/160933, ports/170467[3], ports/170236 [4] Submitted by: avilla [4] In collaboration with: Jan Beich <jbeich@tormail.net> Who did most of the hard work.
Notes
Notes: svn path=/head/; revision=303378
Diffstat (limited to 'www/firefox/files/patch-bug784776')
-rw-r--r--www/firefox/files/patch-bug78477650
1 files changed, 50 insertions, 0 deletions
diff --git a/www/firefox/files/patch-bug784776 b/www/firefox/files/patch-bug784776
new file mode 100644
index 000000000000..417043931ee2
--- /dev/null
+++ b/www/firefox/files/patch-bug784776
@@ -0,0 +1,50 @@
+--- content/media/MediaEngineDefault.cpp~
++++ content/media/MediaEngineDefault.cpp
+@@ -232,12 +232,12 @@ nsresult
+ MediaEngineDefaultAudioSource::Start(SourceMediaStream* aStream, TrackID aID)
+ {
+ if (mState != kAllocated) {
+- return NULL;
++ return 0;
+ }
+
+ mTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
+ if (!mTimer) {
+- return NULL;
++ return 0;
+ }
+
+ mSource = aStream;
+--- gfx/layers/opengl/ImageLayerOGL.cpp~
++++ gfx/layers/opengl/ImageLayerOGL.cpp
+@@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources()
+ {
+ if (mSharedHandle) {
+ gl()->ReleaseSharedHandle(mShareType, mSharedHandle);
+- mSharedHandle = NULL;
++ mSharedHandle = 0;
+ }
+
+ mYUVTexture[0].Release();
+--- intl/locale/src/unix/nsDateTimeFormatUnix.cpp~
++++ intl/locale/src/unix/nsDateTimeFormatUnix.cpp
+@@ -100,7 +100,7 @@ void nsDateTimeFormatUnix::LocalePreferr
+ struct tm *tmc;
+ int i;
+
+- tt = time((time_t)NULL);
++ tt = time(NULL);
+ tmc = localtime(&tt);
+
+ tmc->tm_hour=22; // put the test sample hour to 22:00 which is 10PM
+--- ipc/glue/CrossProcessMutex_unimplemented.cpp~
++++ ipc/glue/CrossProcessMutex_unimplemented.cpp
+@@ -40,7 +40,7 @@ CrossProcessMutexHandle
+ CrossProcessMutex::ShareToProcess(base::ProcessHandle aHandle)
+ {
+ NS_RUNTIMEABORT("Cross-process mutices not allowed on this platform - woah! We should've aborted by now!");
+- return NULL;
++ return 0;
+ }
+
+ }