  
  NS_IMETHODIMP
  PuppetScreenManager::ScreenForRect(int32_t inLeft,
+diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
+--- a/widget/cocoa/nsChildView.mm
++++ b/widget/cocoa/nsChildView.mm
+@@ -6394,17 +6394,17 @@ HandleEvent(CGEventTapProxy aProxy, CGEv
+   CFRunLoopStop(CFRunLoopGetCurrent());
+ }
+ 
+ - (void)shutdownAndReleaseCalledOnAnyThread
+ {
+   [self performSelector:@selector(shutdownAndReleaseCalledOnEventThread) onThread:mThread withObject:nil waitUntilDone:NO];
+ }
+ 
+-static const CGEventField kCGWindowNumberField = 51;
++static const CGEventField kCGWindowNumberField = (const CGEventField) 51;
+ 
+ // Called on scroll thread
+ - (void)handleEvent:(CGEventRef)cgEvent type:(CGEventType)type
+ {
+   if (type != kCGEventScrollWheel) {
+     return;
+   }
+ 
 diff --git a/widget/cocoa/nsMenuItemX.mm b/widget/cocoa/nsMenuItemX.mm
 --- a/widget/cocoa/nsMenuItemX.mm
 +++ b/widget/cocoa/nsMenuItemX.mm

 
   <binding id="menulist-description" display="xul:menu"
            extends="chrome://global/content/bindings/menulist.xml#menulist">
diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css

diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -160,23 +160,22 @@ DIRS += [
 
 if CONFIG['MOZ_ENABLE_GNOME_COMPONENT']:
     DIRS += ['/toolkit/system/gnome']
 
 # if QtNetwork is present, it will do its own network monitoring
 if not CONFIG['MOZ_ENABLE_QTNETWORK'] and CONFIG['MOZ_ENABLE_DBUS']:
     DIRS += ['/toolkit/system/dbus']
 
-DIRS += ['/addon-sdk']
+#DIRS += ['/addon-sdk']
 
 if CONFIG['ENABLE_MARIONETTE'] or CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('gonk', 'android'):
     DIRS += ['/testing/marionette']
