diff -Nru firefox-35.0+build3/debian/changelog firefox-1000~35.0+build3/debian/changelog --- firefox-35.0+build3/debian/changelog 2015-01-16 05:54:58.000000000 +0000 +++ firefox-1000~35.0+build3/debian/changelog 2015-01-19 15:39:57.000000000 +0000 @@ -1,8 +1,8 @@ -firefox (35.0+build3-0ubuntu2~20150116.0550) vivid; urgency=medium +firefox (1000~35.0+build3-0ubuntu1~20150119.1522) vivid; urgency=medium * Firefox with KDE integration [CI Build] - -- Debian CI Fri, 16 Jan 2015 05:54:58 +0000 + -- Debian CI Mon, 19 Jan 2015 15:39:57 +0000 firefox (35.0+build3-0ubuntu1) vivid; urgency=medium diff -Nru firefox-35.0+build3/debian/patches/unity-menubar.patch firefox-1000~35.0+build3/debian/patches/unity-menubar.patch --- firefox-35.0+build3/debian/patches/unity-menubar.patch 2015-01-16 05:50:58.000000000 +0000 +++ firefox-1000~35.0+build3/debian/patches/unity-menubar.patch 2015-01-19 15:22:33.000000000 +0000 @@ -1,7 +1,7 @@ -Index: firefox-35.0+build3/browser/base/content/browser-menubar.inc +Index: firefox-1000~35.0+build3/browser/base/content/browser-menubar.inc =================================================================== ---- firefox-35.0+build3.orig/browser/base/content/browser-menubar.inc -+++ firefox-35.0+build3/browser/base/content/browser-menubar.inc +--- firefox-1000~35.0+build3.orig/browser/base/content/browser-menubar.inc ++++ firefox-1000~35.0+build3/browser/base/content/browser-menubar.inc @@ -5,7 +5,11 @@ -Index: firefox-35.0+build3/browser/components/places/content/places.xul +Index: firefox-1000~35.0+build3/browser/components/places/content/places.xul =================================================================== ---- firefox-35.0+build3.orig/browser/components/places/content/places.xul -+++ firefox-35.0+build3/browser/components/places/content/places.xul +--- firefox-1000~35.0+build3.orig/browser/components/places/content/places.xul ++++ firefox-1000~35.0+build3/browser/components/places/content/places.xul @@ -157,7 +157,7 @@ @@ -62,10 +62,10 @@ -Index: firefox-35.0+build3/toolkit/content/xul.css +Index: firefox-1000~35.0+build3/toolkit/content/xul.css =================================================================== ---- firefox-35.0+build3.orig/toolkit/content/xul.css -+++ firefox-35.0+build3/toolkit/content/xul.css +--- firefox-1000~35.0+build3.orig/toolkit/content/xul.css ++++ firefox-1000~35.0+build3/toolkit/content/xul.css @@ -284,6 +284,18 @@ toolbar[type="menubar"][autohide="true"] } %endif @@ -85,10 +85,10 @@ toolbarseparator { -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration"); } -Index: firefox-35.0+build3/widget/gtk/nsDbusmenu.cpp +Index: firefox-1000~35.0+build3/widget/gtk/nsDbusmenu.cpp =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsDbusmenu.cpp ++++ firefox-1000~35.0+build3/widget/gtk/nsDbusmenu.cpp @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -149,10 +149,10 @@ + + return NS_OK; +} -Index: firefox-35.0+build3/widget/gtk/nsDbusmenu.h +Index: firefox-1000~35.0+build3/widget/gtk/nsDbusmenu.h =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsDbusmenu.h ++++ firefox-1000~35.0+build3/widget/gtk/nsDbusmenu.h @@ -0,0 +1,99 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -253,10 +253,10 @@ +#define dbusmenu_menuitem_property_set_shortcut nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_shortcut + +#endif /* __nsDbusmenu_h__ */ -Index: firefox-35.0+build3/widget/gtk/nsMenu.cpp +Index: firefox-1000~35.0+build3/widget/gtk/nsMenu.cpp =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsMenu.cpp ++++ firefox-1000~35.0+build3/widget/gtk/nsMenu.cpp @@ -0,0 +1,866 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -1124,10 +1124,10 @@ + + MaybeAddPlaceholderItem(); +} -Index: firefox-35.0+build3/widget/gtk/nsMenu.h +Index: firefox-1000~35.0+build3/widget/gtk/nsMenu.h =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsMenu.h ++++ firefox-1000~35.0+build3/widget/gtk/nsMenu.h @@ -0,0 +1,166 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -1295,10 +1295,10 @@ +}; + +#endif /* __nsMenu_h__ */ -Index: firefox-35.0+build3/widget/gtk/nsMenuBar.cpp +Index: firefox-1000~35.0+build3/widget/gtk/nsMenuBar.cpp =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsMenuBar.cpp ++++ firefox-1000~35.0+build3/widget/gtk/nsMenuBar.cpp @@ -0,0 +1,545 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -1845,10 +1845,10 @@ + DebugOnly rv = RemoveChild(aChild); + NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to remove item from menubar"); +} -Index: firefox-35.0+build3/widget/gtk/nsMenuBar.h +Index: firefox-1000~35.0+build3/widget/gtk/nsMenuBar.h =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsMenuBar.h ++++ firefox-1000~35.0+build3/widget/gtk/nsMenuBar.h @@ -0,0 +1,112 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -1962,10 +1962,10 @@ +}; + +#endif /* __nsMenuBar_h__ */ -Index: firefox-35.0+build3/widget/gtk/nsMenuContainer.cpp +Index: firefox-1000~35.0+build3/widget/gtk/nsMenuContainer.cpp =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsMenuContainer.cpp ++++ firefox-1000~35.0+build3/widget/gtk/nsMenuContainer.cpp @@ -0,0 +1,179 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -2146,10 +2146,10 @@ + + return aContent; +} -Index: firefox-35.0+build3/widget/gtk/nsMenuContainer.h +Index: firefox-1000~35.0+build3/widget/gtk/nsMenuContainer.h =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsMenuContainer.h ++++ firefox-1000~35.0+build3/widget/gtk/nsMenuContainer.h @@ -0,0 +1,66 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -2217,10 +2217,10 @@ +}; + +#endif /* __nsMenuContainer_h__ */ -Index: firefox-35.0+build3/widget/gtk/nsMenuItem.cpp +Index: firefox-1000~35.0+build3/widget/gtk/nsMenuItem.cpp =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsMenuItem.cpp ++++ firefox-1000~35.0+build3/widget/gtk/nsMenuItem.cpp @@ -0,0 +1,739 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -2961,10 +2961,10 @@ + UpdateIcon(sc); + } +} -Index: firefox-35.0+build3/widget/gtk/nsMenuItem.h +Index: firefox-1000~35.0+build3/widget/gtk/nsMenuItem.h =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsMenuItem.h ++++ firefox-1000~35.0+build3/widget/gtk/nsMenuItem.h @@ -0,0 +1,107 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -3073,10 +3073,10 @@ +}; + +#endif /* __nsMenuItem_h__ */ -Index: firefox-35.0+build3/widget/gtk/nsMenuObject.cpp +Index: firefox-1000~35.0+build3/widget/gtk/nsMenuObject.cpp =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsMenuObject.cpp ++++ firefox-1000~35.0+build3/widget/gtk/nsMenuObject.cpp @@ -0,0 +1,705 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -3783,10 +3783,10 @@ + weak = weak->GetPrevious(); + } +} -Index: firefox-35.0+build3/widget/gtk/nsMenuObject.h +Index: firefox-1000~35.0+build3/widget/gtk/nsMenuObject.h =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsMenuObject.h ++++ firefox-1000~35.0+build3/widget/gtk/nsMenuObject.h @@ -0,0 +1,242 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4030,10 +4030,10 @@ +}; + +#endif /* __nsMenuObject_h__ */ -Index: firefox-35.0+build3/widget/gtk/nsMenuSeparator.cpp +Index: firefox-1000~35.0+build3/widget/gtk/nsMenuSeparator.cpp =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsMenuSeparator.cpp ++++ firefox-1000~35.0+build3/widget/gtk/nsMenuSeparator.cpp @@ -0,0 +1,90 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4125,10 +4125,10 @@ + UpdateVisibility(sc); + } +} -Index: firefox-35.0+build3/widget/gtk/nsMenuSeparator.h +Index: firefox-1000~35.0+build3/widget/gtk/nsMenuSeparator.h =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsMenuSeparator.h ++++ firefox-1000~35.0+build3/widget/gtk/nsMenuSeparator.h @@ -0,0 +1,41 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4171,10 +4171,10 @@ +}; + +#endif /* __nsMenuSeparator_h__ */ -Index: firefox-35.0+build3/widget/gtk/nsNativeMenuAtomList.h +Index: firefox-1000~35.0+build3/widget/gtk/nsNativeMenuAtomList.h =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsNativeMenuAtomList.h ++++ firefox-1000~35.0+build3/widget/gtk/nsNativeMenuAtomList.h @@ -0,0 +1,11 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4187,10 +4187,10 @@ +WIDGET_ATOM2(_moz_menupopupstate, "_moz-menupopupstate") +WIDGET_ATOM(openedwithkey) +WIDGET_ATOM(shellshowingmenubar) -Index: firefox-35.0+build3/widget/gtk/nsNativeMenuAtoms.cpp +Index: firefox-1000~35.0+build3/widget/gtk/nsNativeMenuAtoms.cpp =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsNativeMenuAtoms.cpp ++++ firefox-1000~35.0+build3/widget/gtk/nsNativeMenuAtoms.cpp @@ -0,0 +1,39 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4231,10 +4231,10 @@ +{ + NS_RegisterStaticAtoms(gAtoms); +} -Index: firefox-35.0+build3/widget/gtk/nsNativeMenuAtoms.h +Index: firefox-1000~35.0+build3/widget/gtk/nsNativeMenuAtoms.h =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsNativeMenuAtoms.h ++++ firefox-1000~35.0+build3/widget/gtk/nsNativeMenuAtoms.h @@ -0,0 +1,25 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4261,10 +4261,10 @@ +}; + +#endif /* __nsNativeMenuAtoms_h__ */ -Index: firefox-35.0+build3/widget/gtk/nsNativeMenuDocListener.cpp +Index: firefox-1000~35.0+build3/widget/gtk/nsNativeMenuDocListener.cpp =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsNativeMenuDocListener.cpp ++++ firefox-1000~35.0+build3/widget/gtk/nsNativeMenuDocListener.cpp @@ -0,0 +1,369 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4635,10 +4635,10 @@ + CancelFlush(this); + mPendingMutations.Clear(); +} -Index: firefox-35.0+build3/widget/gtk/nsNativeMenuDocListener.h +Index: firefox-1000~35.0+build3/widget/gtk/nsNativeMenuDocListener.h =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsNativeMenuDocListener.h ++++ firefox-1000~35.0+build3/widget/gtk/nsNativeMenuDocListener.h @@ -0,0 +1,152 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4792,10 +4792,10 @@ +}; + +#endif /* __nsNativeMenuDocListener_h__ */ -Index: firefox-35.0+build3/widget/gtk/nsNativeMenuService.cpp +Index: firefox-1000~35.0+build3/widget/gtk/nsNativeMenuService.cpp =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsNativeMenuService.cpp ++++ firefox-1000~35.0+build3/widget/gtk/nsNativeMenuService.cpp @@ -0,0 +1,506 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -5303,10 +5303,10 @@ + + return NS_OK; +} -Index: firefox-35.0+build3/widget/gtk/nsNativeMenuService.h +Index: firefox-1000~35.0+build3/widget/gtk/nsNativeMenuService.h =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsNativeMenuService.h ++++ firefox-1000~35.0+build3/widget/gtk/nsNativeMenuService.h @@ -0,0 +1,88 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -5396,10 +5396,10 @@ +}; + +#endif /* __nsNativeMenuService_h__ */ -Index: firefox-35.0+build3/widget/gtk/nsNativeMenuUtils.h +Index: firefox-1000~35.0+build3/widget/gtk/nsNativeMenuUtils.h =================================================================== --- /dev/null -+++ firefox-35.0+build3/widget/gtk/nsNativeMenuUtils.h ++++ firefox-1000~35.0+build3/widget/gtk/nsNativeMenuUtils.h @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -5460,10 +5460,10 @@ +}; + +#endif /* __nsNativeMenuUtils_h__ */ -Index: firefox-35.0+build3/widget/gtk/nsWidgetFactory.cpp +Index: firefox-1000~35.0+build3/widget/gtk/nsWidgetFactory.cpp =================================================================== ---- firefox-35.0+build3.orig/widget/gtk/nsWidgetFactory.cpp -+++ firefox-35.0+build3/widget/gtk/nsWidgetFactory.cpp +--- firefox-1000~35.0+build3.orig/widget/gtk/nsWidgetFactory.cpp ++++ firefox-1000~35.0+build3/widget/gtk/nsWidgetFactory.cpp @@ -44,6 +44,9 @@ #include "GfxInfoX11.h" #endif @@ -5532,10 +5532,10 @@ nsWidgetGtk2ModuleDtor }; -Index: firefox-35.0+build3/widget/gtk/nsWindow.cpp +Index: firefox-1000~35.0+build3/widget/gtk/nsWindow.cpp =================================================================== ---- firefox-35.0+build3.orig/widget/gtk/nsWindow.cpp -+++ firefox-35.0+build3/widget/gtk/nsWindow.cpp +--- firefox-1000~35.0+build3.orig/widget/gtk/nsWindow.cpp ++++ firefox-1000~35.0+build3/widget/gtk/nsWindow.cpp @@ -4777,6 +4777,11 @@ nsWindow::HideWindowChrome(bool aShouldH return NS_OK; } @@ -5548,10 +5548,10 @@ bool nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY, bool aIsWheel, bool aAlwaysRollup) -Index: firefox-35.0+build3/widget/gtk/nsWindow.h +Index: firefox-1000~35.0+build3/widget/gtk/nsWindow.h =================================================================== ---- firefox-35.0+build3.orig/widget/gtk/nsWindow.h -+++ firefox-35.0+build3/widget/gtk/nsWindow.h +--- firefox-1000~35.0+build3.orig/widget/gtk/nsWindow.h ++++ firefox-1000~35.0+build3/widget/gtk/nsWindow.h @@ -34,6 +34,8 @@ #include "nsGtkIMModule.h" @@ -5579,10 +5579,10 @@ }; class nsChildWindow : public nsWindow { -Index: firefox-35.0+build3/xpfe/appshell/nsWebShellWindow.cpp +Index: firefox-1000~35.0+build3/xpfe/appshell/nsWebShellWindow.cpp =================================================================== ---- firefox-35.0+build3.orig/xpfe/appshell/nsWebShellWindow.cpp -+++ firefox-35.0+build3/xpfe/appshell/nsWebShellWindow.cpp +--- firefox-1000~35.0+build3.orig/xpfe/appshell/nsWebShellWindow.cpp ++++ firefox-1000~35.0+build3/xpfe/appshell/nsWebShellWindow.cpp @@ -58,6 +58,7 @@ #include "nsIScreen.h" @@ -5615,10 +5615,10 @@ if (nms && menubarContent) nms->CreateNativeMenuBar(aParentWindow, menubarContent); } -Index: firefox-35.0+build3/widget/gtk/moz.build +Index: firefox-1000~35.0+build3/widget/gtk/moz.build =================================================================== ---- firefox-35.0+build3.orig/widget/gtk/moz.build -+++ firefox-35.0+build3/widget/gtk/moz.build +--- firefox-1000~35.0+build3.orig/widget/gtk/moz.build ++++ firefox-1000~35.0+build3/widget/gtk/moz.build @@ -19,11 +19,20 @@ UNIFIED_SOURCES += [ 'nsAppShell.cpp', 'nsBidiKeyboard.cpp', @@ -5656,10 +5656,10 @@ '/layout/xul', '/other-licenses/atk-1.0', '/toolkit/xre' -Index: firefox-35.0+build3/browser/base/content/browser.js +Index: firefox-1000~35.0+build3/browser/base/content/browser.js =================================================================== ---- firefox-35.0+build3.orig/browser/base/content/browser.js -+++ firefox-35.0+build3/browser/base/content/browser.js +--- firefox-1000~35.0+build3.orig/browser/base/content/browser.js ++++ firefox-1000~35.0+build3/browser/base/content/browser.js @@ -4635,6 +4635,8 @@ function getTogglableToolbars() { let toolbarNodes = Array.slice(gNavToolbox.childNodes); toolbarNodes = toolbarNodes.concat(gNavToolbox.externalToolbars); @@ -5669,10 +5669,10 @@ return toolbarNodes; } -Index: firefox-35.0+build3/widget/moz.build +Index: firefox-1000~35.0+build3/widget/moz.build =================================================================== ---- firefox-35.0+build3.orig/widget/moz.build -+++ firefox-35.0+build3/widget/moz.build +--- firefox-1000~35.0+build3.orig/widget/moz.build ++++ firefox-1000~35.0+build3/widget/moz.build @@ -39,10 +39,12 @@ elif toolkit == 'cocoa': 'nsITaskbarProgress.idl', ]