commit 89f86459ebcbad70f6ef2cadb25b18904e0d6c7c Author: Mike Perry mikeperry-git@fscked.org Date: Fri Jun 15 14:08:35 2012 -0700
Fix MacOS FF13 build issue. --- ...Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch | 16 ++++++---------- .../alpha/0019-Fix-Firefox-13-build-process.patch | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/current-patches/firefox/alpha/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch b/src/current-patches/firefox/alpha/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch index 16b57cf..ebcef85 100644 --- a/src/current-patches/firefox/alpha/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch +++ b/src/current-patches/firefox/alpha/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch @@ -1,4 +1,4 @@ -From e4cb4ddd38033c3a5779b61bfc5d33427ff92d14 Mon Sep 17 00:00:00 2001 +From 7c321c4d75c7c80d899db962804d288ed7db162e Mon Sep 17 00:00:00 2001 From: Mike Perry mikeperry-git@torproject.org Date: Thu, 7 Jun 2012 15:26:13 -0700 Subject: [PATCH 18/19] Adapt Steven Michaud's Mac crashfix patch @@ -9,7 +9,7 @@ Some minor tweaks were needed to get it to apply and to compile on MacOS. --- widget/Makefile.in | 1 + - widget/cocoa/nsChildView.mm | 32 +++++++++++++------ + widget/cocoa/nsChildView.mm | 28 +++++++++++------ widget/gtk2/nsDragService.cpp | 2 +- widget/gtk2/nsWindow.cpp | 2 +- widget/nsIDragService.idl | 4 +-- @@ -23,7 +23,7 @@ MacOS. widget/windows/nsPIDragServiceWindows.idl | 46 +++++++++++++++++++++++++++ widget/xpwidgets/nsBaseDragService.cpp | 16 +++++++++- widget/xpwidgets/nsBaseDragService.h | 9 ++--- - 15 files changed, 180 insertions(+), 46 deletions(-) + 15 files changed, 176 insertions(+), 46 deletions(-) create mode 100644 widget/nsPIDragService.idl create mode 100644 widget/windows/nsPIDragServiceWindows.idl
@@ -40,7 +40,7 @@ index 4a3405b..4c105a4 100644 nsIFormatConverter.idl \ nsIClipboard.idl \ diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm -index 0db6b1c..e88302b 100644 +index 0db6b1c..8d59716 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -4555,11 +4555,12 @@ NSEvent* gLastDragMouseDownEvent = nil; @@ -76,7 +76,7 @@ index 0db6b1c..e88302b 100644
// XXX: dropEffect should be updated per |operation|. // As things stand though, |operation| isn't well handled within "our" -@@ -4595,10 +4598,19 @@ NSEvent* gLastDragMouseDownEvent = nil; +@@ -4595,10 +4598,15 @@ NSEvent* gLastDragMouseDownEvent = nil; // value for NSDragOperationGeneric that is passed by other applications. // All that said, NSDragOperationNone is still reliable. if (operation == NSDragOperationNone) { @@ -90,11 +90,7 @@ index 0db6b1c..e88302b 100644 + nsCOMPtr<nsIDOMDataTransfer> dataTransfer; + dragSession->GetDataTransfer(getter_AddRefs(dataTransfer)); + if (dataTransfer) { -+ nsCOMPtr<nsIDOMNSDataTransfer> dataTransferNS = -+ do_QueryInterface(dataTransfer); -+ if (dataTransferNS) { -+ dataTransferNS->SetDropEffectInt(nsIDragService::DRAGDROP_ACTION_NONE); -+ } ++ dataTransfer->SetDropEffectInt(nsIDragService::DRAGDROP_ACTION_NONE); + } + } } diff --git a/src/current-patches/firefox/alpha/0019-Fix-Firefox-13-build-process.patch b/src/current-patches/firefox/alpha/0019-Fix-Firefox-13-build-process.patch index 196f6a4..9b0aab3 100644 --- a/src/current-patches/firefox/alpha/0019-Fix-Firefox-13-build-process.patch +++ b/src/current-patches/firefox/alpha/0019-Fix-Firefox-13-build-process.patch @@ -1,4 +1,4 @@ -From 9a3ebc94f8b48a89f2b9c3365eaea8bdb8043b2e Mon Sep 17 00:00:00 2001 +From 41f44964edbee300c098d110be3f029ebb711081 Mon Sep 17 00:00:00 2001 From: Mike Perry mikeperry-git@torproject.org Date: Fri, 8 Jun 2012 12:42:25 -0700 Subject: [PATCH 19/19] Fix Firefox 13 build process.