diff options
author | Björn Bidar | 2017-08-08 14:33:38 +0200 |
---|---|---|
committer | Björn Bidar | 2017-08-08 14:33:38 +0200 |
commit | 8d22eef899eecb13a5d57f3bfabed0fc5121d1b4 (patch) | |
tree | b63bef519b9ad0d6378791a3bc3dcb4154f941ac | |
parent | e8bda826a5d01408a42745dcfe52cfa774d6fdb8 (diff) | |
download | aur-8d22eef899eecb13a5d57f3bfabed0fc5121d1b4.tar.gz |
upkg, changed the filenames of rosenauers patches to patchrev at the end
-rw-r--r-- | .SRCINFO | 28 | ||||
-rw-r--r-- | PKGBUILD | 36 | ||||
-rw-r--r-- | unity-menubar.patch | 320 |
3 files changed, 191 insertions, 193 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Jul 7 06:00:49 UTC 2017 +# Tue Aug 8 12:32:41 UTC 2017 pkgbase = firefox-kde-opensuse pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE - pkgver = 54.0.1 - pkgrel = 2 + pkgver = 55.0 + pkgrel = 1 url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox arch = i686 arch = x86_64 @@ -45,23 +45,23 @@ pkgbase = firefox-kde-opensuse depends = gtk3 optdepends = networkmanager: Location detection via available WiFi networks optdepends = speech-dispatcher: Text-to-Speech - provides = firefox=54.0.1 + provides = firefox=55.0 conflicts = firefox options = !emptydirs options = strip - source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_54_0_1_RELEASE + source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_55_0_RELEASE source = mozconfig source = firefox.desktop source = firefox-install-dir.patch source = vendor.js source = kde.js source = firefox-fixed-loading-icon.png - source = http://www.rosenauer.org/hg/mozilla/raw-file/53443ffb496a/firefox-branded-icons.patch - source = http://www.rosenauer.org/hg/mozilla/raw-file/53443ffb496a/firefox-kde.patch - source = http://www.rosenauer.org/hg/mozilla/raw-file/53443ffb496a/firefox-no-default-ualocale.patch - source = http://www.rosenauer.org/hg/mozilla/raw-file/53443ffb496a/mozilla-kde.patch - source = http://www.rosenauer.org/hg/mozilla/raw-file/53443ffb496a/mozilla-language.patch - source = http://www.rosenauer.org/hg/mozilla/raw-file/53443ffb496a/mozilla-nongnome-proxies.patch + source = firefox-branded-icons-74bc4d049531.patch::http://www.rosenauer.org/hg/mozilla/raw-file/74bc4d049531/firefox-branded-icons.patch + source = firefox-kde-74bc4d049531.patch::http://www.rosenauer.org/hg/mozilla/raw-file/74bc4d049531/firefox-kde.patch + source = firefox-no-default-ualocale-74bc4d049531.patch::http://www.rosenauer.org/hg/mozilla/raw-file/74bc4d049531/firefox-no-default-ualocale.patch + source = mozilla-kde-74bc4d049531.patch::http://www.rosenauer.org/hg/mozilla/raw-file/74bc4d049531/mozilla-kde.patch + source = mozilla-language-74bc4d049531.patch::http://www.rosenauer.org/hg/mozilla/raw-file/74bc4d049531/mozilla-language.patch + source = mozilla-nongnome-proxies-74bc4d049531.patch::http://www.rosenauer.org/hg/mozilla/raw-file/74bc4d049531/mozilla-nongnome-proxies.patch source = unity-menubar.patch source = add_missing_pgo_rule.patch source = pgo_fix_missing_kdejs.patch @@ -75,12 +75,12 @@ pkgbase = firefox-kde-opensuse md5sums = 05bb69d25fb3572c618e3adf1ee7b670 md5sums = 6e335a517c68488941340ee1c23f97b0 md5sums = 46a4971f26c990a66b913ba700c7f3fa - md5sums = 8f49836b3ad6d40dc490c3bf703f71d6 + md5sums = ec5bf2759be835054e9d1d803e9b5897 md5sums = 1fad9a988826d69fe712ea973e43f6da - md5sums = c09024c0bea0f3224d3e45f74ddc4d6b + md5sums = 1d3a8171492b6e1c672f639fd44d4cf4 md5sums = fa6ac817f576b486419b5f308116a7cd md5sums = 0c684360f1df4536512d51873c1d243d - md5sums = ca0532e1b9e55186496868b0b18b4a98 + md5sums = 730e43106f0a4b19066c9c1e15ff7888 md5sums = fe24f5ea463013bb7f1c12d12dce41b2 md5sums = 3fa8bd22d97248de529780f5797178af md5sums = e2396b9918aa602427f80d48caf319b4 @@ -20,8 +20,8 @@ _gtk3=true _pkgname=firefox pkgname=$_pkgname-kde-opensuse -pkgver=54.0.1 -pkgrel=2 +pkgver=55.0 +pkgrel=1 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') @@ -41,20 +41,20 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'speech-dispatcher: Text-to-Speech') provides=("firefox=${pkgver}") conflicts=('firefox') -_patchrev=53443ffb496a +_patchrev=74bc4d049531 options=('!emptydirs' 'strip') _patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev _repo=https://hg.mozilla.org/mozilla-unified source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" mozconfig firefox.desktop firefox-install-dir.patch vendor.js kde.js firefox-fixed-loading-icon.png # Firefox patchset - $_patchurl/firefox-branded-icons.patch - $_patchurl/firefox-kde.patch - $_patchurl/firefox-no-default-ualocale.patch + firefox-branded-icons-$_patchrev.patch::$_patchurl/firefox-branded-icons.patch + firefox-kde-$_patchrev.patch::$_patchurl/firefox-kde.patch + firefox-no-default-ualocale-$_patchrev.patch::$_patchurl/firefox-no-default-ualocale.patch # Gecko/toolkit patchset - $_patchurl/mozilla-kde.patch - $_patchurl/mozilla-language.patch - $_patchurl/mozilla-nongnome-proxies.patch + mozilla-kde-$_patchrev.patch::$_patchurl/mozilla-kde.patch + mozilla-language-$_patchrev.patch::$_patchurl/mozilla-language.patch + mozilla-nongnome-proxies-$_patchrev.patch::$_patchurl/mozilla-nongnome-proxies.patch unity-menubar.patch add_missing_pgo_rule.patch pgo_fix_missing_kdejs.patch @@ -97,13 +97,13 @@ prepare() { echo "ac_add_options --with-mozilla-api-keyfile=\"$PWD/mozilla-api-key\"" >>.mozconfig msg "Patching for KDE" - patch -Np1 -i "$srcdir/mozilla-nongnome-proxies.patch" - patch -Np1 -i "$srcdir/mozilla-kde.patch" - patch -Np1 -i "$srcdir/mozilla-language.patch" + patch -Np1 -i "$srcdir/mozilla-nongnome-proxies-$_patchrev.patch" + patch -Np1 -i "$srcdir/mozilla-kde-$_patchrev.patch" + patch -Np1 -i "$srcdir/mozilla-language-$_patchrev.patch" - patch -Np1 -i "$srcdir/firefox-kde.patch" - patch -Np1 -i "$srcdir/firefox-no-default-ualocale.patch" - patch -Np1 -i "$srcdir/firefox-branded-icons.patch" + patch -Np1 -i "$srcdir/firefox-kde-$_patchrev.patch" + patch -Np1 -i "$srcdir/firefox-no-default-ualocale-$_patchrev.patch" + patch -Np1 -i "$srcdir/firefox-branded-icons-$_patchrev.patch" # add globalmenu support patch -Np1 -i "$srcdir/unity-menubar.patch" @@ -222,12 +222,12 @@ md5sums=('SKIP' '05bb69d25fb3572c618e3adf1ee7b670' '6e335a517c68488941340ee1c23f97b0' '46a4971f26c990a66b913ba700c7f3fa' - '8f49836b3ad6d40dc490c3bf703f71d6' + 'ec5bf2759be835054e9d1d803e9b5897' '1fad9a988826d69fe712ea973e43f6da' - 'c09024c0bea0f3224d3e45f74ddc4d6b' + '1d3a8171492b6e1c672f639fd44d4cf4' 'fa6ac817f576b486419b5f308116a7cd' '0c684360f1df4536512d51873c1d243d' - 'ca0532e1b9e55186496868b0b18b4a98' + '730e43106f0a4b19066c9c1e15ff7888' 'fe24f5ea463013bb7f1c12d12dce41b2' '3fa8bd22d97248de529780f5797178af' 'e2396b9918aa602427f80d48caf319b4' diff --git a/unity-menubar.patch b/unity-menubar.patch index 681d7d59fa71..19a2725d7ff4 100644 --- a/unity-menubar.patch +++ b/unity-menubar.patch @@ -1,7 +1,15 @@ -Index: firefox-54.0~a2~hg20170403r375673/browser/base/content/browser-menubar.inc +# HG changeset patch +# User Chris Coulson <chrisccoulson@ubuntu.com> +# Date 1493156926 -3600 +# Tue Apr 25 22:48:46 2017 +0100 +# Node ID 1118c162780db83e59e47be621c5360099df1d46 +# Parent 3f0c8da53c5cb015933b10b52ded3f30432b378a +Add Unity menubar support + +Index: firefox-trunk-55.0~a1~hg20170510r357490/browser/base/content/browser-menubar.inc =================================================================== ---- firefox-54.0~a2~hg20170403r375673.orig/browser/base/content/browser-menubar.inc 2017-04-03 12:12:17.000000000 +0200 -+++ firefox-54.0~a2~hg20170403r375673/browser/base/content/browser-menubar.inc 2017-04-04 10:45:58.000000000 +0200 +--- firefox-trunk-55.0~a1~hg20170510r357490.orig/browser/base/content/browser-menubar.inc ++++ firefox-trunk-55.0~a1~hg20170510r357490/browser/base/content/browser-menubar.inc @@ -5,7 +5,11 @@ <menubar id="main-menubar" @@ -14,11 +22,11 @@ Index: firefox-54.0~a2~hg20170403r375673/browser/base/content/browser-menubar.in this.setAttribute('openedwithkey', event.target.parentNode.openedWithKey);" style="border:0px;padding:0px;margin:0px;-moz-appearance:none"> -Index: firefox-54.0~a2~hg20170403r375673/browser/base/content/browser.js +Index: firefox-trunk-55.0~a1~hg20170510r357490/browser/base/content/browser.js =================================================================== ---- firefox-54.0~a2~hg20170403r375673.orig/browser/base/content/browser.js 2017-04-03 12:13:01.000000000 +0200 -+++ firefox-54.0~a2~hg20170403r375673/browser/base/content/browser.js 2017-04-04 10:45:58.000000000 +0200 -@@ -5239,6 +5239,8 @@ +--- firefox-trunk-55.0~a1~hg20170510r357490.orig/browser/base/content/browser.js ++++ firefox-trunk-55.0~a1~hg20170510r357490/browser/base/content/browser.js +@@ -5335,6 +5335,8 @@ let toolbarNodes = Array.slice(gNavToolbox.childNodes); toolbarNodes = toolbarNodes.concat(gNavToolbox.externalToolbars); toolbarNodes = toolbarNodes.filter(node => node.getAttribute("toolbarname")); @@ -27,10 +35,10 @@ Index: firefox-54.0~a2~hg20170403r375673/browser/base/content/browser.js return toolbarNodes; } -Index: firefox-54.0~a2~hg20170403r375673/browser/components/places/content/places.xul +Index: firefox-trunk-55.0~a1~hg20170510r357490/browser/components/places/content/places.xul =================================================================== ---- firefox-54.0~a2~hg20170403r375673.orig/browser/components/places/content/places.xul 2017-04-03 12:16:08.000000000 +0200 -+++ firefox-54.0~a2~hg20170403r375673/browser/components/places/content/places.xul 2017-04-04 10:45:58.000000000 +0200 +--- firefox-trunk-55.0~a1~hg20170510r357490.orig/browser/components/places/content/places.xul ++++ firefox-trunk-55.0~a1~hg20170510r357490/browser/components/places/content/places.xul @@ -155,7 +155,7 @@ <toolbarbutton type="menu" class="tabbable" onpopupshowing="document.getElementById('placeContent').focus()" @@ -40,13 +48,13 @@ Index: firefox-54.0~a2~hg20170403r375673/browser/components/places/content/place <menu accesskey="&organize.accesskey;" class="menu-iconic" #endif id="organizeButton" label="&organize.label;" -Index: firefox-54.0~a2~hg20170403r375673/layout/build/moz.build +Index: firefox-trunk-55.0~a1~hg20170510r357490/layout/build/moz.build =================================================================== ---- firefox-54.0~a2~hg20170403r375673.orig/layout/build/moz.build 2017-04-03 12:44:23.000000000 +0200 -+++ firefox-54.0~a2~hg20170403r375673/layout/build/moz.build 2017-04-04 10:45:58.000000000 +0200 -@@ -78,6 +78,10 @@ - LOCAL_INCLUDES += [ - '/dom/system/gonk', +--- firefox-trunk-55.0~a1~hg20170510r357490.orig/layout/build/moz.build ++++ firefox-trunk-55.0~a1~hg20170510r357490/layout/build/moz.build +@@ -74,6 +74,10 @@ + '/dom/system', + '/dom/system/android', ] +elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: + LOCAL_INCLUDES += [ @@ -55,13 +63,13 @@ Index: firefox-54.0~a2~hg20170403r375673/layout/build/moz.build if CONFIG['MOZ_WEBSPEECH']: LOCAL_INCLUDES += [ -Index: firefox-54.0~a2~hg20170403r375673/layout/build/nsLayoutStatics.cpp +Index: firefox-trunk-55.0~a1~hg20170510r357490/layout/build/nsLayoutStatics.cpp =================================================================== ---- firefox-54.0~a2~hg20170403r375673.orig/layout/build/nsLayoutStatics.cpp 2017-04-03 12:44:23.000000000 +0200 -+++ firefox-54.0~a2~hg20170403r375673/layout/build/nsLayoutStatics.cpp 2017-04-04 10:45:58.000000000 +0200 -@@ -133,6 +133,10 @@ - #include "mozilla/StaticPresData.h" - #include "mozilla/dom/WebIDLGlobalNameHash.h" +--- firefox-trunk-55.0~a1~hg20170510r357490.orig/layout/build/nsLayoutStatics.cpp ++++ firefox-trunk-55.0~a1~hg20170510r357490/layout/build/nsLayoutStatics.cpp +@@ -129,6 +129,10 @@ + #include "mozilla/dom/ipc/IPCBlobInputStreamStorage.h" + #include "mozilla/dom/U2FTokenManager.h" +#ifdef MOZ_WIDGET_GTK +#include "nsNativeMenuAtoms.h" @@ -70,7 +78,7 @@ Index: firefox-54.0~a2~hg20170403r375673/layout/build/nsLayoutStatics.cpp using namespace mozilla; using namespace mozilla::net; using namespace mozilla::dom; -@@ -166,6 +170,9 @@ +@@ -161,6 +165,9 @@ nsTextServicesDocument::RegisterAtoms(); nsHTMLTags::RegisterAtoms(); nsRDFAtoms::RegisterAtoms(); @@ -80,11 +88,11 @@ Index: firefox-54.0~a2~hg20170403r375673/layout/build/nsLayoutStatics.cpp NS_SealStaticAtomTable(); -Index: firefox-54.0~a2~hg20170403r375673/modules/libpref/init/all.js +Index: firefox-trunk-55.0~a1~hg20170510r357490/modules/libpref/init/all.js =================================================================== ---- firefox-54.0~a2~hg20170403r375673.orig/modules/libpref/init/all.js 2017-04-03 12:44:24.000000000 +0200 -+++ firefox-54.0~a2~hg20170403r375673/modules/libpref/init/all.js 2017-04-04 10:45:58.000000000 +0200 -@@ -229,6 +229,9 @@ +--- firefox-trunk-55.0~a1~hg20170510r357490.orig/modules/libpref/init/all.js ++++ firefox-trunk-55.0~a1~hg20170510r357490/modules/libpref/init/all.js +@@ -214,6 +214,9 @@ pref("browser.sessionhistory.max_total_viewers", -1); pref("ui.use_native_colors", true); @@ -94,10 +102,10 @@ Index: firefox-54.0~a2~hg20170403r375673/modules/libpref/init/all.js pref("ui.click_hold_context_menus", false); // Duration of timeout of incremental search in menus (ms). 0 means infinite. pref("ui.menu.incremental_search.timeout", 1000); -Index: firefox-54.0~a2~hg20170403r375673/toolkit/content/widgets/popup.xml +Index: firefox-trunk-55.0~a1~hg20170510r357490/toolkit/content/widgets/popup.xml =================================================================== ---- firefox-54.0~a2~hg20170403r375673.orig/toolkit/content/widgets/popup.xml 2017-04-03 12:47:42.000000000 +0200 -+++ firefox-54.0~a2~hg20170403r375673/toolkit/content/widgets/popup.xml 2017-04-04 10:45:58.000000000 +0200 +--- firefox-trunk-55.0~a1~hg20170510r357490.orig/toolkit/content/widgets/popup.xml ++++ firefox-trunk-55.0~a1~hg20170510r357490/toolkit/content/widgets/popup.xml @@ -27,8 +27,14 @@ </getter> </property> @@ -115,11 +123,11 @@ Index: firefox-54.0~a2~hg20170403r375673/toolkit/content/widgets/popup.xml <property name="triggerNode" readonly="true" onget="return this.popupBoxObject.triggerNode"/> -Index: firefox-54.0~a2~hg20170403r375673/toolkit/content/xul.css +Index: firefox-trunk-55.0~a1~hg20170510r357490/toolkit/content/xul.css =================================================================== ---- firefox-54.0~a2~hg20170403r375673.orig/toolkit/content/xul.css 2017-04-03 12:47:42.000000000 +0200 -+++ firefox-54.0~a2~hg20170403r375673/toolkit/content/xul.css 2017-04-04 10:45:58.000000000 +0200 -@@ -314,6 +314,18 @@ +--- firefox-trunk-55.0~a1~hg20170510r357490.orig/toolkit/content/xul.css ++++ firefox-trunk-55.0~a1~hg20170510r357490/toolkit/content/xul.css +@@ -324,6 +324,18 @@ } %endif @@ -138,11 +146,11 @@ Index: firefox-54.0~a2~hg20170403r375673/toolkit/content/xul.css toolbarseparator { -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration"); } -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/moz.build +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/moz.build =================================================================== ---- firefox-54.0~a2~hg20170403r375673.orig/widget/gtk/moz.build 2017-04-03 12:51:18.000000000 +0200 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/moz.build 2017-04-04 10:45:58.000000000 +0200 -@@ -24,10 +24,18 @@ +--- firefox-trunk-55.0~a1~hg20170510r357490.orig/widget/gtk/moz.build ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/moz.build +@@ -27,10 +27,18 @@ 'nsAppShell.cpp', 'nsBidiKeyboard.cpp', 'nsColorPicker.cpp', @@ -159,9 +167,9 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/moz.build + 'nsNativeMenuAtoms.cpp', + 'nsNativeMenuDocListener.cpp', 'nsNativeThemeGTK.cpp', - 'nsScreenGtk.cpp', - 'nsScreenManagerGtk.cpp', -@@ -40,6 +48,8 @@ + 'nsSound.cpp', + 'nsToolkit.cpp', +@@ -42,6 +50,8 @@ ] SOURCES += [ @@ -170,7 +178,7 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/moz.build 'nsWindow.cpp', # conflicts with X11 headers ] -@@ -104,6 +114,7 @@ +@@ -106,6 +116,7 @@ LOCAL_INCLUDES += [ '/layout/generic', @@ -178,10 +186,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/moz.build '/layout/xul', '/other-licenses/atk-1.0', '/widget', -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsDbusmenu.cpp +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsDbusmenu.cpp =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsDbusmenu.cpp 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsDbusmenu.cpp @@ -0,0 +1,63 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -246,10 +254,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsDbusmenu.cpp + + return NS_OK; +} -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsDbusmenu.h +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsDbusmenu.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsDbusmenu.h 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsDbusmenu.h @@ -0,0 +1,101 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -352,11 +360,11 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsDbusmenu.h +#define dbusmenu_menuitem_property_set_shortcut nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_shortcut + +#endif /* __nsDbusmenu_h__ */ -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenu.cpp +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenu.cpp =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenu.cpp 2017-04-04 10:45:58.000000000 +0200 -@@ -0,0 +1,841 @@ +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenu.cpp +@@ -0,0 +1,842 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -366,6 +374,7 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenu.cpp + +#define _IMPL_NS_LAYOUT + ++#include "mozilla/dom/Element.h" +#include "mozilla/Assertions.h" +#include "mozilla/GuardObjects.h" +#include "mozilla/MouseEvents.h" @@ -501,7 +510,7 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenu.cpp + RefPtr<nsXBLBinding> binding; + bool dummy; + nsresult rv = xbl->LoadBindings(aContent, display->mBinding->GetURI(), -+ display->mBinding->mOriginPrincipal, ++ display->mBinding->mExtraData->GetPrincipal(), + getter_AddRefs(binding), &dummy); + if ((NS_FAILED(rv) && rv != NS_ERROR_XBL_BLOCKED) || !binding) { + return; @@ -1198,10 +1207,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenu.cpp + ContentNode()->UnsetAttr(kNameSpaceID_None, nsGkAtoms::open, true); +} + -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenu.h +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenu.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenu.h 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenu.h @@ -0,0 +1,124 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -1327,10 +1336,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenu.h +}; + +#endif /* __nsMenu_h__ */ -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuBar.cpp +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuBar.cpp =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuBar.cpp 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuBar.cpp @@ -0,0 +1,572 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -1904,10 +1913,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuBar.cpp + DocListener()->Stop(); + DisconnectDocumentEventListeners(); +} -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuBar.h +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuBar.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuBar.h 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuBar.h @@ -0,0 +1,107 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -2016,10 +2025,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuBar.h +}; + +#endif /* __nsMenuBar_h__ */ -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuContainer.cpp +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuContainer.cpp =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuContainer.cpp 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuContainer.cpp @@ -0,0 +1,172 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -2193,10 +2202,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuContainer.cpp + + return aContent; +} -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuContainer.h +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuContainer.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuContainer.h 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuContainer.h @@ -0,0 +1,70 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -2268,11 +2277,11 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuContainer.h +}; + +#endif /* __nsMenuContainer_h__ */ -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuItem.cpp +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuItem.cpp =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuItem.cpp 2017-04-04 10:45:58.000000000 +0200 -@@ -0,0 +1,737 @@ +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuItem.cpp +@@ -0,0 +1,736 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -2320,7 +2329,6 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuItem.cpp +#include "nsMenuItem.h" + +using namespace mozilla; -+using namespace mozilla::widget; + +struct KeyCodeData { + const char* str; @@ -3010,10 +3018,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuItem.cpp +{ + return eType_MenuItem; +} -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuItem.h +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuItem.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuItem.h 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuItem.h @@ -0,0 +1,81 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -3096,10 +3104,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuItem.h +}; + +#endif /* __nsMenuItem_h__ */ -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuObject.cpp +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuObject.cpp =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuObject.cpp 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuObject.cpp @@ -0,0 +1,665 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -3347,7 +3355,7 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuObject.cpp + nullptr, loadGroup, this, nullptr, nullptr, + nsIRequest::LOAD_NORMAL, nullptr, + nsIContentPolicy::TYPE_IMAGE, EmptyString(), -+ getter_AddRefs(mImageRequest)); ++ false, getter_AddRefs(mImageRequest)); + } +} + @@ -3592,7 +3600,7 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuObject.cpp + } + + RefPtr<nsStyleContext> sc = -+ nsComputedDOMStyle::GetStyleContextForElementNoFlush( ++ nsComputedDOMStyle::GetStyleContextNoFlush( + mContent->AsElement(), nullptr, shell); + + return sc.forget(); @@ -3766,10 +3774,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuObject.cpp + weak = weak->mPrev; + } +} -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuObject.h +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuObject.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuObject.h 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuObject.h @@ -0,0 +1,170 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -3941,10 +3949,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuObject.h +}; + +#endif /* __nsMenuObject_h__ */ -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuSeparator.cpp +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuSeparator.cpp =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuSeparator.cpp 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuSeparator.cpp @@ -0,0 +1,85 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4031,10 +4039,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuSeparator.cpp +{ + return eType_MenuItem; +} -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuSeparator.h +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuSeparator.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuSeparator.h 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsMenuSeparator.h @@ -0,0 +1,37 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4073,10 +4081,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsMenuSeparator.h +}; + +#endif /* __nsMenuSeparator_h__ */ -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuAtomList.h +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsNativeMenuAtomList.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuAtomList.h 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsNativeMenuAtomList.h @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4090,10 +4098,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuAtomList.h +WIDGET_ATOM2(_moz_nativemenupopupstate, "_moz-nativemenupopupstate") +WIDGET_ATOM(openedwithkey) +WIDGET_ATOM(shellshowingmenubar) -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuAtoms.cpp +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsNativeMenuAtoms.cpp =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuAtoms.cpp 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/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: @@ -4134,10 +4142,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuAtoms.cpp +{ + NS_RegisterStaticAtoms(gAtoms); +} -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuAtoms.h +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsNativeMenuAtoms.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuAtoms.h 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsNativeMenuAtoms.h @@ -0,0 +1,27 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4166,10 +4174,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuAtoms.h +}; + +#endif /* __nsNativeMenuAtoms_h__ */ -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuDocListener.cpp +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsNativeMenuDocListener.cpp =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuDocListener.cpp 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsNativeMenuDocListener.cpp @@ -0,0 +1,350 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -4521,10 +4529,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuDocListener.cpp + CancelFlush(this); + mPendingMutations.Clear(); +} -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuDocListener.h +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsNativeMenuDocListener.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuDocListener.h 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/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: @@ -4678,10 +4686,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuDocListener.h +}; + +#endif /* __nsNativeMenuDocListener_h__ */ -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuService.cpp +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsNativeMenuService.cpp =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuService.cpp 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsNativeMenuService.cpp @@ -0,0 +1,541 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -5224,10 +5232,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuService.cpp + g_object_unref(cancellable); + } +} -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuService.h +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsNativeMenuService.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuService.h 2017-04-04 10:45:58.000000000 +0200 +--- /dev/null ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsNativeMenuService.h @@ -0,0 +1,87 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -5316,23 +5324,23 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsNativeMenuService.h +}; + +#endif /* __nsNativeMenuService_h__ */ -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsScreenGtk.cpp +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsNativeThemeGTK.cpp =================================================================== ---- firefox-54.0~a2~hg20170403r375673.orig/widget/gtk/nsScreenGtk.cpp 2017-04-03 12:51:18.000000000 +0200 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsScreenGtk.cpp 2017-04-04 10:45:58.000000000 +0200 -@@ -15,6 +15,7 @@ - #include <gtk/gtk.h> - #include <dlfcn.h> - #include "gfxPlatformGtk.h" -+#include "nsIWidget.h" +--- firefox-trunk-55.0~a1~hg20170510r357490.orig/widget/gtk/nsNativeThemeGTK.cpp ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsNativeThemeGTK.cpp +@@ -52,6 +52,7 @@ - static uint32_t sScreenId = 0; + using namespace mozilla; + using namespace mozilla::gfx; ++using mozilla::widget::ScreenHelperGTK; -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsWidgetFactory.cpp + NS_IMPL_ISUPPORTS_INHERITED(nsNativeThemeGTK, nsNativeTheme, nsITheme, + nsIObserver) +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsWidgetFactory.cpp =================================================================== ---- firefox-54.0~a2~hg20170403r375673.orig/widget/gtk/nsWidgetFactory.cpp 2017-04-03 12:51:18.000000000 +0200 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsWidgetFactory.cpp 2017-04-04 10:45:58.000000000 +0200 -@@ -49,6 +49,8 @@ +--- firefox-trunk-55.0~a1~hg20170510r357490.orig/widget/gtk/nsWidgetFactory.cpp ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsWidgetFactory.cpp +@@ -48,6 +48,8 @@ #include "GfxInfoX11.h" #endif @@ -5341,7 +5349,7 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsWidgetFactory.cpp #include "nsNativeThemeGTK.h" #include "nsIComponentRegistrar.h" -@@ -121,6 +123,9 @@ +@@ -124,6 +126,9 @@ } #endif @@ -5351,7 +5359,7 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsWidgetFactory.cpp #ifdef NS_PRINTING NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecGTK) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintOptionsGTK, Init) -@@ -223,6 +228,7 @@ +@@ -226,6 +231,7 @@ NS_DEFINE_NAMED_CID(NS_IDLE_SERVICE_CID); NS_DEFINE_NAMED_CID(NS_GFXINFO_CID); #endif @@ -5359,7 +5367,7 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsWidgetFactory.cpp static const mozilla::Module::CIDEntry kWidgetCIDs[] = { -@@ -258,6 +264,7 @@ +@@ -261,6 +267,7 @@ { &kNS_IDLE_SERVICE_CID, false, nullptr, nsIdleServiceGTKConstructor }, { &kNS_GFXINFO_CID, false, nullptr, mozilla::widget::GfxInfoConstructor }, #endif @@ -5367,7 +5375,7 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsWidgetFactory.cpp { nullptr } }; -@@ -295,6 +302,7 @@ +@@ -298,6 +305,7 @@ { "@mozilla.org/widget/idleservice;1", &kNS_IDLE_SERVICE_CID }, { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID }, #endif @@ -5375,10 +5383,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsWidgetFactory.cpp { nullptr } }; -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsWindow.cpp +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsWindow.cpp =================================================================== ---- firefox-54.0~a2~hg20170403r375673.orig/widget/gtk/nsWindow.cpp 2017-04-03 12:51:19.000000000 +0200 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsWindow.cpp 2017-04-04 10:45:58.000000000 +0200 +--- firefox-trunk-55.0~a1~hg20170510r357490.orig/widget/gtk/nsWindow.cpp ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsWindow.cpp @@ -67,6 +67,7 @@ #include "mozilla/Assertions.h" @@ -5387,7 +5395,7 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsWindow.cpp #include "mozilla/Preferences.h" #include "nsIPrefService.h" #include "nsIGConfService.h" -@@ -4945,6 +4946,11 @@ +@@ -5007,6 +5008,11 @@ #endif /* MOZ_X11 */ } @@ -5399,10 +5407,10 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsWindow.cpp bool nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY, bool aIsWheel, bool aAlwaysRollup) -Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsWindow.h +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsWindow.h =================================================================== ---- firefox-54.0~a2~hg20170403r375673.orig/widget/gtk/nsWindow.h 2017-04-03 12:51:19.000000000 +0200 -+++ firefox-54.0~a2~hg20170403r375673/widget/gtk/nsWindow.h 2017-04-04 10:45:58.000000000 +0200 +--- firefox-trunk-55.0~a1~hg20170510r357490.orig/widget/gtk/nsWindow.h ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/gtk/nsWindow.h @@ -35,6 +35,8 @@ #include "IMContextWrapper.h" @@ -5412,7 +5420,7 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsWindow.h #undef LOG #ifdef MOZ_LOGGING -@@ -160,6 +162,8 @@ +@@ -161,6 +163,8 @@ nsIScreen* aTargetScreen = nullptr) override; virtual void HideWindowChrome(bool aShouldHide) override; @@ -5421,7 +5429,7 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsWindow.h /** * GetLastUserInputTime returns a timestamp for the most recent user input * event. This is intended for pointer grab requests (including drags). -@@ -549,6 +553,8 @@ +@@ -562,6 +566,8 @@ RefPtr<mozilla::widget::IMContextWrapper> mIMContext; mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter; @@ -5430,40 +5438,30 @@ Index: firefox-54.0~a2~hg20170403r375673/widget/gtk/nsWindow.h }; class nsChildWindow : public nsWindow { -Index: firefox-54.0~a2~hg20170403r375673/widget/moz.build +Index: firefox-trunk-55.0~a1~hg20170510r357490/widget/moz.build =================================================================== ---- firefox-54.0~a2~hg20170403r375673.orig/widget/moz.build 2017-04-03 12:51:19.000000000 +0200 -+++ firefox-54.0~a2~hg20170403r375673/widget/moz.build 2017-04-04 10:45:58.000000000 +0200 -@@ -8,7 +8,7 @@ - - if toolkit in ('cocoa', 'android', 'gonk', 'uikit'): - DIRS += [toolkit] --if toolkit in ('android', 'cocoa', 'gonk', 'gtk2', 'gtk3'): -+if toolkit in ('android', 'gonk', 'gtk2', 'gtk3'): - EXPORTS += ['nsIPrintDialogService.h'] - - if toolkit == 'windows': -@@ -37,9 +37,12 @@ +--- firefox-trunk-55.0~a1~hg20170510r357490.orig/widget/moz.build ++++ firefox-trunk-55.0~a1~hg20170510r357490/widget/moz.build +@@ -60,9 +60,9 @@ + 'nsISystemStatusBar.idl', 'nsITaskbarProgress.idl', ] - EXPORTS += [ +- EXPORTS += [ - 'nsINativeMenuService.h', -+ 'nsIPrintDialogService.h', - ] - +- ] ++ +if toolkit in ('cocoa', 'gtk2', 'gtk3'): + EXPORTS += ['nsINativeMenuService.h'] -+ + TEST_DIRS += ['tests'] - # Don't build the DSO under the 'build' directory as windows does. -Index: firefox-54.0~a2~hg20170403r375673/xpfe/appshell/nsWebShellWindow.cpp +Index: firefox-trunk-55.0~a1~hg20170510r357490/xpfe/appshell/nsWebShellWindow.cpp =================================================================== ---- firefox-54.0~a2~hg20170403r375673.orig/xpfe/appshell/nsWebShellWindow.cpp 2017-04-03 12:52:20.000000000 +0200 -+++ firefox-54.0~a2~hg20170403r375673/xpfe/appshell/nsWebShellWindow.cpp 2017-04-04 10:45:58.000000000 +0200 -@@ -72,7 +72,7 @@ +--- firefox-trunk-55.0~a1~hg20170510r357490.orig/xpfe/appshell/nsWebShellWindow.cpp ++++ firefox-trunk-55.0~a1~hg20170510r357490/xpfe/appshell/nsWebShellWindow.cpp +@@ -74,7 +74,7 @@ - #include "nsPIWindowRoot.h" + #include "gfxPlatform.h" -#ifdef XP_MACOSX +#if defined(XP_MACOSX) || defined(MOZ_WIDGET_GTK) |