commit 03b6e3256656200a7cc523061f0a18308d477ad8 Author: Mike Perry <mikeperry-git@fscked.org> Date: Fri Jun 8 10:34:41 2012 -0700 Fix Windows build by moving idl to public dir. --- ...Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch | 131 ++++++++++---------- 1 files changed, 65 insertions(+), 66 deletions(-) diff --git a/src/current-patches/firefox/0019-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch b/src/current-patches/firefox/0019-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch index 783a28f..a127b01 100644 --- a/src/current-patches/firefox/0019-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch +++ b/src/current-patches/firefox/0019-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch @@ -1,4 +1,4 @@ -From c8d4524b43bf9afaf0ab2be0639d3de4d0204070 Mon Sep 17 00:00:00 2001 +From 831843e282a56b988eda1f1230b93cbd6b3ad7a3 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git@torproject.org> Date: Thu, 7 Jun 2012 16:25:48 -0700 Subject: [PATCH 19/19] Adapt Steven Michaud's Mac crashfix patch @@ -8,34 +8,35 @@ Source is: https://bugzilla.mozilla.org/show_bug.cgi?id=715885#c35 Some minor tweaks were needed to get it to apply and to compile on MacOS. --- - widget/public/Makefile.in | 1 + + widget/public/Makefile.in | 2 + widget/public/nsIDragService.idl | 1 - widget/public/nsPIDragService.idl | 48 ++++++++++++++++++++++++++++ + widget/public/nsPIDragServiceWindows.idl | 46 ++++++++++++++++++++++++++ widget/src/cocoa/nsChildView.mm | 35 +++++++++++++------- widget/src/gtk2/nsDragService.cpp | 2 +- widget/src/gtk2/nsWindow.cpp | 2 +- widget/src/qt/nsDragService.h | 2 + - widget/src/windows/Makefile.in | 3 ++ + widget/src/windows/Makefile.in | 1 - widget/src/windows/nsDragService.cpp | 13 +++++--- widget/src/windows/nsDragService.h | 12 +++--- widget/src/windows/nsNativeDragSource.cpp | 7 ++-- widget/src/windows/nsNativeDragTarget.cpp | 28 ++++++++++------ widget/src/xpwidgets/nsBaseDragService.cpp | 16 +++++++++- widget/src/xpwidgets/nsBaseDragService.h | 9 ++--- - widget/windows/nsPIDragServiceWindows.idl | 46 ++++++++++++++++++++++++++ - 15 files changed, 178 insertions(+), 47 deletions(-) + 15 files changed, 176 insertions(+), 48 deletions(-) create mode 100644 widget/public/nsPIDragService.idl - create mode 100644 widget/windows/nsPIDragServiceWindows.idl + create mode 100644 widget/public/nsPIDragServiceWindows.idl diff --git a/widget/public/Makefile.in b/widget/public/Makefile.in -index a70e65a..a425623 100644 +index a70e65a..8a9b73d 100644 --- a/widget/public/Makefile.in +++ b/widget/public/Makefile.in -@@ -110,6 +110,7 @@ XPIDLSRCS = \ +@@ -110,6 +110,8 @@ XPIDLSRCS = \ nsIClipboardDragDropHooks.idl \ nsIClipboardDragDropHookList.idl \ nsIDragSession.idl \ + nsPIDragService.idl \ ++ nsPIDragServiceWindows.idl \ nsIDragService.idl \ nsIFormatConverter.idl \ nsIClipboard.idl \ @@ -105,6 +106,58 @@ index 0000000..93a144d + + void setDragEndPoint(in long aX, in long aY); +}; +diff --git a/widget/public/nsPIDragServiceWindows.idl b/widget/public/nsPIDragServiceWindows.idl +new file mode 100644 +index 0000000..c8a46dd +--- /dev/null ++++ b/widget/public/nsPIDragServiceWindows.idl +@@ -0,0 +1,46 @@ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * The Mozilla Foundation. ++ * Portions created by the Initial Developer are Copyright (C) 2012 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Steven Michaud <smichaud@pobox.com> ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#include "nsISupports.idl" ++ ++[scriptable, uuid(6FC2117D-5EB4-441A-9C12-62A783BEBC0C)] ++interface nsPIDragServiceWindows : nsISupports ++{ ++ void setIDataObject(in nsISupports aDataObj); ++ ++ void setDroppedLocal(); ++}; diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm index 64336e3..b2ab6bc 100644 --- a/widget/src/cocoa/nsChildView.mm @@ -209,19 +262,17 @@ index 5a3e5bb..50dcfac 100644 private: diff --git a/widget/src/windows/Makefile.in b/widget/src/windows/Makefile.in -index 53277ea..d110a42 100644 +index 53277ea..d7ff7ce 100644 --- a/widget/src/windows/Makefile.in +++ b/widget/src/windows/Makefile.in -@@ -115,6 +115,9 @@ ifdef MOZ_ENABLE_D3D10_LAYER +@@ -115,7 +115,6 @@ ifdef MOZ_ENABLE_D3D10_LAYER DEFINES += -DMOZ_ENABLE_D3D10_LAYER endif -+XPIDLSRCS += \ -+ nsPIDragServiceWindows.idl \ -+ $(NULL) - +- EXPORTS = nsdefs.h WindowHook.h EXPORTS_NAMESPACES = mozilla/widget + EXPORTS_mozilla/widget = AudioSession.h diff --git a/widget/src/windows/nsDragService.cpp b/widget/src/windows/nsDragService.cpp index 2dcede3..3d8af21 100644 --- a/widget/src/windows/nsDragService.cpp @@ -476,58 +527,6 @@ index 290c0cb..2ceac2b 100644 protected: /** -diff --git a/widget/windows/nsPIDragServiceWindows.idl b/widget/windows/nsPIDragServiceWindows.idl -new file mode 100644 -index 0000000..c8a46dd ---- /dev/null -+++ b/widget/windows/nsPIDragServiceWindows.idl -@@ -0,0 +1,46 @@ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * The Mozilla Foundation. -+ * Portions created by the Initial Developer are Copyright (C) 2012 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * Steven Michaud <smichaud@pobox.com> -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the MPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the MPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+#include "nsISupports.idl" -+ -+[scriptable, uuid(6FC2117D-5EB4-441A-9C12-62A783BEBC0C)] -+interface nsPIDragServiceWindows : nsISupports -+{ -+ void setIDataObject(in nsISupports aDataObj); -+ -+ void setDroppedLocal(); -+}; -- 1.7.5.4