From 9cc7654e5e919585cb147fa63f17d4c41387c549 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Mon, 23 Apr 2012 08:31:55 +0200
Subject: [PATCH 1/3] Bug 747322 - Fix jemalloc mmap wrapper for s390x.
 r=jlebar,a=npotb

---
 memory/jemalloc/jemalloc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
index f351bcd2fef8..d175864578e0 100644
--- a/memory/jemalloc/jemalloc.c
+++ b/memory/jemalloc/jemalloc.c
@@ -405,9 +405,9 @@ void *_mmap(void *addr, size_t length, int prot, int flags,
 	struct {
 		void *addr;
 		size_t length;
-		int prot;
-		int flags;
-		int fd;
+		long prot;
+		long flags;
+		long fd;
 		off_t offset;
 	} args = { addr, length, prot, flags, fd, offset };
 	return (void *) syscall(SYS_mmap, &args);

From a121da351d4d27f887f9a78f85f427c09fe6733f Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Mon, 23 Apr 2012 10:30:58 +0200
Subject: [PATCH 2/3] Bug 747442 - Unlock orientation only if the received
 mozfullscreenchange is for fullscreen being disabled. r=smaug a=mfinkle

---
 dom/base/nsScreen.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/dom/base/nsScreen.cpp b/dom/base/nsScreen.cpp
index 7c1f7716554d..cb6cfc5b8509 100644
--- a/dom/base/nsScreen.cpp
+++ b/dom/base/nsScreen.cpp
@@ -426,6 +426,24 @@ nsScreen::FullScreenEventListener::HandleEvent(nsIDOMEvent* aEvent)
   nsCOMPtr<nsIDOMEventTarget> target;
   aEvent->GetCurrentTarget(getter_AddRefs(target));
 
+  // We have to make sure that the event we got is the event sent when
+  // fullscreen is disabled because we could get one when fullscreen
+  // got enabled if the lock call is done at the same moment.
+  nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(target);
+  MOZ_ASSERT(window);
+
+  nsCOMPtr<nsIDOMDocument> doc;
+  window->GetDocument(getter_AddRefs(doc));
+  // If we have no doc, we will just continue, remove the event and unlock.
+  // This is an edge case were orientation lock and fullscreen is meaningless.
+  if (doc) {
+    bool fullscreen;
+    doc->GetMozFullScreen(&fullscreen);
+    if (fullscreen) {
+      return NS_OK;
+    }
+  }
+
   target->RemoveSystemEventListener(NS_LITERAL_STRING("mozfullscreenchange"),
                                     this, true);
 

From e395118233c07076ae2fe7868be5f738a4f88fe9 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Mon, 23 Apr 2012 07:11:19 -0700
Subject: [PATCH 3/3] Bug 747005: OSX XULRunner SDKs aren't getting named
 propertl. r=bsmedberg, a=lsblakk

---
 toolkit/mozapps/installer/packager.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index 414a87c375bf..4c63f18e8b0c 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -95,6 +95,9 @@ MOZ_INTERNAL_SIGNING_FORMAT =
 endif
 SDK_SUFFIX    = $(PKG_SUFFIX)
 SDK           = $(SDK_PATH)$(PKG_BASENAME).sdk$(SDK_SUFFIX)
+ifdef UNIVERSAL_BINARY
+SDK           = $(SDK_PATH)$(PKG_BASENAME)-$(TARGET_CPU).sdk$(SDK_SUFFIX)
+endif
 
 # JavaScript Shell packaging
 ifndef LIBXUL_SDK