upkg

3 files changed, 147 insertions, 132 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 13f4b7940c68..289aa5530881 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-kde-opensuse
 	pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE
-	pkgver = 41.0.2
+	pkgver = 42.0
 	pkgrel = 1
 	url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox
 	install = firefox.install
@@ -41,11 +41,11 @@ pkgbase = firefox-kde-opensuse
 	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = gst-plugins-good: h.264 video
 	optdepends = gst-libav: h.264 video
-	provides = firefox=41.0.2
+	provides = firefox=42.0
 	conflicts = firefox
 	options = !emptydirs
 	options = strip
-	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/41.0.2/source/firefox-41.0.2.source.tar.xz
+	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/42.0/source/firefox-42.0.source.tar.xz
 	source = mozconfig
 	source = firefox.desktop
 	source = firefox-install-dir.patch
@@ -53,17 +53,16 @@ pkgbase = firefox-kde-opensuse
 	source = kde.js
 	source = firefox-fixed-loading-icon.png
 	source = rhbz-966424.patch
-	source = http://www.rosenauer.org/hg/mozilla/raw-file/7aa7715fdc8f/firefox-branded-icons.patch
-	source = http://www.rosenauer.org/hg/mozilla/raw-file/7aa7715fdc8f/firefox-kde.patch
-	source = http://www.rosenauer.org/hg/mozilla/raw-file/7aa7715fdc8f/firefox-no-default-ualocale.patch
-	source = http://www.rosenauer.org/hg/mozilla/raw-file/7aa7715fdc8f/mozilla-kde.patch
-	source = http://www.rosenauer.org/hg/mozilla/raw-file/7aa7715fdc8f/mozilla-language.patch
-	source = http://www.rosenauer.org/hg/mozilla/raw-file/7aa7715fdc8f/mozilla-nongnome-proxies.patch
-	source = http://www.rosenauer.org/hg/mozilla/raw-file/7aa7715fdc8f/toolkit-download-folder.patch
+	source = http://www.rosenauer.org/hg/mozilla/raw-file/ee3c462047d5/firefox-branded-icons.patch
+	source = http://www.rosenauer.org/hg/mozilla/raw-file/ee3c462047d5/firefox-kde.patch
+	source = http://www.rosenauer.org/hg/mozilla/raw-file/ee3c462047d5/firefox-no-default-ualocale.patch
+	source = http://www.rosenauer.org/hg/mozilla/raw-file/ee3c462047d5/mozilla-kde.patch
+	source = http://www.rosenauer.org/hg/mozilla/raw-file/ee3c462047d5/mozilla-language.patch
+	source = http://www.rosenauer.org/hg/mozilla/raw-file/ee3c462047d5/mozilla-nongnome-proxies.patch
 	source = unity-menubar.patch
 	source = add_missing_pgo_rule.patch
 	source = pgo_fix_missing_kdejs.patch
-	sha256sums = ff00689f4d2ff54c5eb7b3aa367560a3645800eb0c96e73a795e461461b1970e
+	sha256sums = 994a346699298277b64ec0cab72660b8d3e5b879a2ac79207576f7e6c33da3ae
 	sha256sums = 7659ccd23d0f111c3ed7d4b1624dfe63269a3df0ec90eac2019f0ece01c4d641
 	sha256sums = c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826
 	sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd
@@ -72,13 +71,12 @@ pkgbase = firefox-kde-opensuse
 	sha256sums = 68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213
 	sha256sums = 746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a
 	sha256sums = 72abd31e89a41cddbd8165b0b9555465184c52c426e0998c9cb7786af94b5532
-	sha256sums = fd063e2db91b034a9a985238299b4d99751deb4910480e13e3bde5edb4633d1f
+	sha256sums = 23ce5dbcff0a9caf8cbf13730f12366c84382ab63e4020136f331df4a7ebe5ed
 	sha256sums = 02e92f84dd31ed079be3e67509cf23d0d351e06bb690fcc091c904d906d2d690
-	sha256sums = dc5b64b912e81976e7e431171f3e5d142f15924a83985b1fe93d399d1e1e4756
+	sha256sums = efb473d0fbf41bd0a6c388d8d74de719b263675c522ec63b465af040067ecf5e
 	sha256sums = ce1b7a5bb217c31590bce30653aea5139b6401a01eda7bded7fd2f83a23d397b
 	sha256sums = e8289ea4c1f8191e1e23661312ceee2128b8e790501b9a589d0d7bfc4384553f
-	sha256sums = a87332e4baff50fad86b5a5b7d59076a09725f89113b8fd86dbe28efda103882
-	sha256sums = 7c1028460b0ebc15b9dc54af6d7ec8d33b72b9bf095e4117558de5a525a29fc2
+	sha256sums = 18166673c6e00debf56191b1d9b2706e8987814f59cb6122118aef9f2b31413e
 	sha256sums = f9067f62a25a7a77276e15f91cc9e7ba6576315345cfc6347b1b2e884becdb0c
 	sha256sums = 2c9c97bff07cc71b3f6d35f3edfaddaf8180a1f533ee4682adf18a8f86d29264
 
diff --git a/PKGBUILD b/PKGBUILD
index f551aa507a59..8451431d35f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,9 @@
 # try to build with PGO
 _pgo=true
 
-pkgname=firefox-kde-opensuse
-pkgver=41.0.2
+_pkgname=firefox
+pkgname=$_pkgname-kde-opensuse
+pkgver=42.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
 arch=('i686' 'x86_64')
@@ -26,7 +27,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 provides=("firefox=${pkgver}")
 conflicts=('firefox')
 install=firefox.install
-_patchrev=7aa7715fdc8f
+_patchrev=ee3c462047d5
 options=('!emptydirs'  'strip' )
 _patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
 source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
@@ -40,7 +41,6 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/
 	$_patchurl/mozilla-kde.patch
 	$_patchurl/mozilla-language.patch
 	$_patchurl/mozilla-nongnome-proxies.patch
-	$_patchurl/toolkit-download-folder.patch
 	unity-menubar.patch
 	add_missing_pgo_rule.patch
         pgo_fix_missing_kdejs.patch 
@@ -49,7 +49,7 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/
 _google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM
 
 prepare() {
-  cd mozilla-release
+  cd $_pkgname-$pkgver
 
   cp "$srcdir/mozconfig" .mozconfig
 
@@ -60,7 +60,6 @@ prepare() {
   patch -Np1 -i "$srcdir/rhbz-966424.patch"
 
   msg "Patching for KDE"
-  patch -Np1 -i "$srcdir/toolkit-download-folder.patch"
   patch -Np1 -i "$srcdir/mozilla-nongnome-proxies.patch"
   patch -Np1 -i "$srcdir/mozilla-kde.patch"
   patch -Np1 -i "$srcdir/mozilla-language.patch"
@@ -95,7 +94,7 @@ prepare() {
 
 build() {
 
-  cd mozilla-release
+  cd $_pkgname-$pkgver
 
   export PATH="$srcdir/path:$PATH"
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/firefox"
@@ -116,7 +115,7 @@ build() {
 }
 
 package() {
-  cd mozilla-release
+  cd $_pkgname-$pkgver
 
   [[ "$CARCH" == "i686" ]] && cp "$srcdir/kde.js" obj-i686-pc-linux-gnu/dist/bin/defaults/pref
   [[ "$CARCH" == "x86_64" ]] && cp "$srcdir/kde.js" obj-x86_64-unknown-linux-gnu/dist/bin/defaults/pref
@@ -152,7 +151,7 @@ package() {
   ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin"
 }
 
-sha256sums=('ff00689f4d2ff54c5eb7b3aa367560a3645800eb0c96e73a795e461461b1970e'
+sha256sums=('994a346699298277b64ec0cab72660b8d3e5b879a2ac79207576f7e6c33da3ae'
             '7659ccd23d0f111c3ed7d4b1624dfe63269a3df0ec90eac2019f0ece01c4d641'
             'c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826'
             'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
@@ -161,12 +160,11 @@ sha256sums=('ff00689f4d2ff54c5eb7b3aa367560a3645800eb0c96e73a795e461461b1970e'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213'
             '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a'
             '72abd31e89a41cddbd8165b0b9555465184c52c426e0998c9cb7786af94b5532'
-            'fd063e2db91b034a9a985238299b4d99751deb4910480e13e3bde5edb4633d1f'
+            '23ce5dbcff0a9caf8cbf13730f12366c84382ab63e4020136f331df4a7ebe5ed'
             '02e92f84dd31ed079be3e67509cf23d0d351e06bb690fcc091c904d906d2d690'
-            'dc5b64b912e81976e7e431171f3e5d142f15924a83985b1fe93d399d1e1e4756'
+            'efb473d0fbf41bd0a6c388d8d74de719b263675c522ec63b465af040067ecf5e'
             'ce1b7a5bb217c31590bce30653aea5139b6401a01eda7bded7fd2f83a23d397b'
             'e8289ea4c1f8191e1e23661312ceee2128b8e790501b9a589d0d7bfc4384553f'
-            'a87332e4baff50fad86b5a5b7d59076a09725f89113b8fd86dbe28efda103882'
-            '7c1028460b0ebc15b9dc54af6d7ec8d33b72b9bf095e4117558de5a525a29fc2'
+            '18166673c6e00debf56191b1d9b2706e8987814f59cb6122118aef9f2b31413e'
             'f9067f62a25a7a77276e15f91cc9e7ba6576315345cfc6347b1b2e884becdb0c'
             '2c9c97bff07cc71b3f6d35f3edfaddaf8180a1f533ee4682adf18a8f86d29264')
diff --git a/unity-menubar.patch b/unity-menubar.patch
index 69b3fca79bcb..88ada0e7e48b 100644
--- a/unity-menubar.patch
+++ b/unity-menubar.patch
@@ -1,7 +1,7 @@
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/browser/base/content/browser-menubar.inc
+Index: firefox-trunk-42.0~a1~hg20150805r256164/browser/base/content/browser-menubar.inc
 ===================================================================
---- thunderbird-trunk-40.0~a1~hg20150331r17722.237186.orig/browser/base/content/browser-menubar.inc	2015-04-02 13:34:46.760325051 +0100
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/browser/base/content/browser-menubar.inc	2015-04-02 13:34:46.740325004 +0100
+--- firefox-trunk-42.0~a1~hg20150805r256164.orig/browser/base/content/browser-menubar.inc	2015-08-05 12:10:12.000000000 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/browser/base/content/browser-menubar.inc	2015-08-06 11:53:39.000000000 +0100
 @@ -5,7 +5,11 @@
  
         <menubar id="main-menubar"
@@ -14,10 +14,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/browser/base/content/br
                                    this.setAttribute('openedwithkey',
                                                      event.target.parentNode.openedWithKey);"
                  style="border:0px;padding:0px;margin:0px;-moz-appearance:none">
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/browser/components/places/content/places.xul
+Index: firefox-trunk-42.0~a1~hg20150805r256164/browser/components/places/content/places.xul
 ===================================================================
---- thunderbird-trunk-40.0~a1~hg20150331r17722.237186.orig/browser/components/places/content/places.xul	2015-04-02 13:34:46.760325051 +0100
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/browser/components/places/content/places.xul	2015-04-02 13:34:46.740325004 +0100
+--- firefox-trunk-42.0~a1~hg20150805r256164.orig/browser/components/places/content/places.xul	2015-08-05 12:10:20.000000000 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/browser/components/places/content/places.xul	2015-08-06 11:53:39.000000000 +0100
 @@ -157,7 +157,7 @@
          <toolbarbutton type="menu" class="tabbable"
                onpopupshowing="document.getElementById('placeContent').focus()"
@@ -27,10 +27,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/browser/components/plac
          <menu accesskey="&organize.accesskey;" class="menu-iconic"
  #endif
                id="organizeButton" label="&organize.label;"
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/toolkit/content/widgets/popup.xml
+Index: firefox-trunk-42.0~a1~hg20150805r256164/toolkit/content/widgets/popup.xml
 ===================================================================
---- thunderbird-trunk-40.0~a1~hg20150331r17722.237186.orig/toolkit/content/widgets/popup.xml	2015-04-02 13:34:46.760325051 +0100
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/toolkit/content/widgets/popup.xml	2015-04-02 13:34:46.740325004 +0100
+--- firefox-trunk-42.0~a1~hg20150805r256164.orig/toolkit/content/widgets/popup.xml	2015-08-05 12:11:56.000000000 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/toolkit/content/widgets/popup.xml	2015-08-06 11:53:39.000000000 +0100
 @@ -25,8 +25,14 @@
          </getter>
        </property>
@@ -48,11 +48,11 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/toolkit/content/widgets
  
        <property name="triggerNode" readonly="true"
                  onget="return this.popupBoxObject.triggerNode"/>
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/toolkit/content/xul.css
+Index: firefox-trunk-42.0~a1~hg20150805r256164/toolkit/content/xul.css
 ===================================================================
---- thunderbird-trunk-40.0~a1~hg20150331r17722.237186.orig/toolkit/content/xul.css	2015-04-02 13:34:46.760325051 +0100
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/toolkit/content/xul.css	2015-04-02 13:34:46.744325011 +0100
-@@ -308,6 +308,18 @@
+--- firefox-trunk-42.0~a1~hg20150805r256164.orig/toolkit/content/xul.css	2015-08-05 12:11:56.000000000 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/toolkit/content/xul.css	2015-08-06 11:53:39.000000000 +0100
+@@ -315,6 +315,18 @@
  }
  %endif
  
@@ -71,11 +71,11 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/toolkit/content/xul.css
  toolbarseparator {
    -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration");
  }
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsDbusmenu.cpp
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsDbusmenu.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsDbusmenu.cpp	2015-04-02 13:34:46.744325011 +0100
-@@ -0,0 +1,59 @@
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsDbusmenu.cpp	2015-08-06 11:53:39.000000000 +0100
+@@ -0,0 +1,63 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
 + */
@@ -130,15 +130,19 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsDbusmenu.c
 +    }
 +
 +    LOAD_LIBRARY(DbusmenuGlib, "libdbusmenu-glib.so.4")
++#if (MOZ_WIDGET_GTK == 3)
++    LOAD_LIBRARY(DbusmenuGtk, "libdbusmenu-gtk3.so.4")
++#else
 +    LOAD_LIBRARY(DbusmenuGtk, "libdbusmenu-gtk.so.4")
++#endif
 +#undef LOAD_LIBRARY
 +
 +    return NS_OK;
 +}
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsDbusmenu.h
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsDbusmenu.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsDbusmenu.h	2015-04-02 13:34:46.744325011 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsDbusmenu.h	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,99 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -239,10 +243,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsDbusmenu.h
 +#define dbusmenu_menuitem_property_set_shortcut nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_shortcut
 +
 +#endif /* __nsDbusmenu_h__ */
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenu.cpp
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenu.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenu.cpp	2015-04-02 13:34:46.744325011 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenu.cpp	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,866 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -1110,10 +1114,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenu.cpp
 +
 +    MaybeAddPlaceholderItem();
 +}
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenu.h
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenu.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenu.h	2015-04-02 13:34:46.744325011 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenu.h	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,166 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -1281,10 +1285,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenu.h
 +};
 +
 +#endif /* __nsMenu_h__ */
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuBar.cpp
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuBar.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuBar.cpp	2015-04-02 13:34:46.744325011 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuBar.cpp	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,545 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -1831,10 +1835,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuBar.cp
 +    DebugOnly<nsresult> rv = RemoveChild(aChild);
 +    NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to remove item from menubar");
 +}
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuBar.h
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuBar.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuBar.h	2015-04-02 13:34:46.744325011 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuBar.h	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,112 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -1948,10 +1952,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuBar.h
 +};
 +
 +#endif /* __nsMenuBar_h__ */
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuContainer.cpp
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuContainer.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuContainer.cpp	2015-04-02 13:34:46.744325011 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuContainer.cpp	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,174 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -2127,10 +2131,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuContai
 +
 +    return aContent;
 +}
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuContainer.h
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuContainer.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuContainer.h	2015-04-02 13:34:46.744325011 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuContainer.h	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,66 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -2198,11 +2202,11 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuContai
 +};
 +
 +#endif /* __nsMenuContainer_h__ */
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuItem.cpp
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuItem.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuItem.cpp	2015-04-02 13:34:46.744325011 +0100
-@@ -0,0 +1,739 @@
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuItem.cpp	2015-08-06 11:53:39.000000000 +0100
+@@ -0,0 +1,742 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
 + */
@@ -2239,6 +2243,9 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuItem.c
 +
 +#include <gdk/gdk.h>
 +#include <gdk/gdkkeysyms.h>
++#if (MOZ_WIDGET_GTK == 3)
++#include <gdk/gdkkeysyms-compat.h>
++#endif
 +#include <gdk/gdkx.h>
 +#include <gtk/gtk.h>
 +
@@ -2942,10 +2949,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuItem.c
 +        UpdateIcon(sc);
 +    }
 +}
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuItem.h
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuItem.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuItem.h	2015-04-02 13:34:46.744325011 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuItem.h	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,107 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -3054,10 +3061,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuItem.h
 +};
 +
 +#endif /* __nsMenuItem_h__ */
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuObject.cpp
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuObject.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuObject.cpp	2015-04-02 13:34:46.748325019 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuObject.cpp	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,707 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -3766,10 +3773,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuObject
 +        weak = weak->GetPrevious();
 +    }
 +}
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuObject.h
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuObject.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuObject.h	2015-04-02 13:34:46.748325019 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuObject.h	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,242 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4013,10 +4020,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuObject
 +};
 +
 +#endif /* __nsMenuObject_h__ */
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuSeparator.cpp
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuSeparator.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuSeparator.cpp	2015-04-02 13:34:46.748325019 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuSeparator.cpp	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,90 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4108,10 +4115,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuSepara
 +        UpdateVisibility(sc);
 +    }
 +}
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuSeparator.h
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuSeparator.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuSeparator.h	2015-04-02 13:34:46.748325019 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsMenuSeparator.h	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,41 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4154,10 +4161,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsMenuSepara
 +};
 +
 +#endif /* __nsMenuSeparator_h__ */
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenuAtomList.h
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsNativeMenuAtomList.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenuAtomList.h	2015-04-02 13:34:46.748325019 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsNativeMenuAtomList.h	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,11 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4170,10 +4177,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenu
 +WIDGET_ATOM2(_moz_menupopupstate, "_moz-menupopupstate")
 +WIDGET_ATOM(openedwithkey)
 +WIDGET_ATOM(shellshowingmenubar)
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenuAtoms.cpp
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsNativeMenuAtoms.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenuAtoms.cpp	2015-04-02 13:34:46.748325019 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsNativeMenuAtoms.cpp	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,39 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4214,10 +4221,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenu
 +{
 +    NS_RegisterStaticAtoms(gAtoms);
 +}
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenuAtoms.h
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsNativeMenuAtoms.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenuAtoms.h	2015-04-02 13:34:46.748325019 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsNativeMenuAtoms.h	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,25 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4244,11 +4251,11 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenu
 +};
 +
 +#endif /* __nsNativeMenuAtoms_h__ */
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenuDocListener.cpp
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsNativeMenuDocListener.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenuDocListener.cpp	2015-04-02 13:34:46.748325019 +0100
-@@ -0,0 +1,369 @@
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsNativeMenuDocListener.cpp	2015-08-06 11:56:44.909216041 +0100
+@@ -0,0 +1,370 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
 + */
@@ -4475,7 +4482,8 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenu
 +                                          mozilla::dom::Element *aElement,
 +                                          int32_t aNameSpaceID,
 +                                          nsIAtom *aAttribute,
-+                                          int32_t aModType)
++                                          int32_t aModType,
++                                          const nsAttrValue* aOldValue)
 +{
 +    if (sUpdateDepth == 0) {
 +        DoAttributeChanged(aElement, aAttribute);
@@ -4618,10 +4626,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenu
 +    CancelFlush(this);
 +    mPendingMutations.Clear();
 +}
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenuDocListener.h
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsNativeMenuDocListener.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenuDocListener.h	2015-04-02 13:34:46.748325019 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsNativeMenuDocListener.h	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,152 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4775,10 +4783,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenu
 +};
 +
 +#endif /* __nsNativeMenuDocListener_h__ */
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenuService.cpp
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsNativeMenuService.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenuService.cpp	2015-04-02 13:34:46.748325019 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsNativeMenuService.cpp	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,506 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -5286,10 +5294,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenu
 +
 +    return NS_OK;
 +}
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenuService.h
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsNativeMenuService.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenuService.h	2015-04-02 13:34:46.748325019 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsNativeMenuService.h	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,88 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -5379,10 +5387,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenu
 +};
 +
 +#endif /* __nsNativeMenuService_h__ */
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenuUtils.h
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsNativeMenuUtils.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenuUtils.h	2015-04-02 13:34:46.748325019 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsNativeMenuUtils.h	2015-08-06 11:53:39.000000000 +0100
 @@ -0,0 +1,59 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -5443,11 +5451,11 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsNativeMenu
 +};
 +
 +#endif /* __nsNativeMenuUtils_h__ */
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsWidgetFactory.cpp
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsWidgetFactory.cpp
 ===================================================================
---- thunderbird-trunk-40.0~a1~hg20150331r17722.237186.orig/widget/gtk/nsWidgetFactory.cpp	2015-04-02 13:34:46.760325051 +0100
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsWidgetFactory.cpp	2015-04-02 13:34:46.748325019 +0100
-@@ -45,6 +45,9 @@
+--- firefox-trunk-42.0~a1~hg20150805r256164.orig/widget/gtk/nsWidgetFactory.cpp	2015-08-05 12:12:19.000000000 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsWidgetFactory.cpp	2015-08-06 11:53:39.000000000 +0100
+@@ -49,6 +49,9 @@
  #include "GfxInfoX11.h"
  #endif
  
@@ -5457,7 +5465,7 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsWidgetFact
  #include "nsNativeThemeGTK.h"
  
  #include "nsIComponentRegistrar.h"
-@@ -118,6 +121,9 @@
+@@ -122,6 +125,9 @@
  }
  #endif
  
@@ -5467,7 +5475,7 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsWidgetFact
  #ifdef NS_PRINTING
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecGTK)
  NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintOptionsGTK, Init)
-@@ -198,6 +204,7 @@
+@@ -224,6 +230,7 @@
  NS_DEFINE_NAMED_CID(NS_IDLE_SERVICE_CID);
  NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
  #endif
@@ -5475,7 +5483,7 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsWidgetFact
  
  
  static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
-@@ -230,6 +237,7 @@
+@@ -259,6 +266,7 @@
      { &kNS_IDLE_SERVICE_CID, false, nullptr, nsIdleServiceGTKConstructor },
      { &kNS_GFXINFO_CID, false, nullptr, mozilla::widget::GfxInfoConstructor },
  #endif
@@ -5483,7 +5491,7 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsWidgetFact
      { nullptr }
  };
  
-@@ -263,6 +271,7 @@
+@@ -295,6 +303,7 @@
      { "@mozilla.org/widget/idleservice;1", &kNS_IDLE_SERVICE_CID },
      { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
  #endif
@@ -5491,7 +5499,7 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsWidgetFact
      { nullptr }
  };
  
-@@ -284,13 +293,22 @@
+@@ -317,13 +326,22 @@
  #endif
  }
  
@@ -5515,11 +5523,11 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsWidgetFact
      nsWidgetGtk2ModuleDtor
  };
  
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsWindow.cpp
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsWindow.cpp
 ===================================================================
---- thunderbird-trunk-40.0~a1~hg20150331r17722.237186.orig/widget/gtk/nsWindow.cpp	2015-04-02 13:34:46.760325051 +0100
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsWindow.cpp	2015-04-02 13:34:46.752325029 +0100
-@@ -4888,6 +4888,11 @@
+--- firefox-trunk-42.0~a1~hg20150805r256164.orig/widget/gtk/nsWindow.cpp	2015-08-05 12:12:19.000000000 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsWindow.cpp	2015-08-06 11:53:39.000000000 +0100
+@@ -4796,6 +4796,11 @@
      return NS_OK;
  }
  
@@ -5531,20 +5539,20 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsWindow.cpp
  bool
  nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY,
                           bool aIsWheel, bool aAlwaysRollup)
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsWindow.h
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsWindow.h
 ===================================================================
---- thunderbird-trunk-40.0~a1~hg20150331r17722.237186.orig/widget/gtk/nsWindow.h	2015-04-02 13:34:46.760325051 +0100
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsWindow.h	2015-04-02 13:34:46.752325029 +0100
+--- firefox-trunk-42.0~a1~hg20150805r256164.orig/widget/gtk/nsWindow.h	2015-08-05 12:12:19.000000000 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/nsWindow.h	2015-08-06 11:53:39.000000000 +0100
 @@ -33,6 +33,8 @@
  
- #include "nsGtkIMModule.h"
+ #include "IMContextWrapper.h"
  
 +#include "nsMenuBar.h"
 +
  #undef LOG
  #ifdef MOZ_LOGGING
  
-@@ -152,6 +154,8 @@
+@@ -156,6 +158,8 @@
                                        nsIScreen* aTargetScreen = nullptr) override;
      NS_IMETHOD         HideWindowChrome(bool aShouldHide) override;
  
@@ -5553,7 +5561,7 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsWindow.h
      /**
       * GetLastUserInputTime returns a timestamp for the most recent user input
       * event.  This is intended for pointer grab requests (including drags).
-@@ -500,6 +504,8 @@
+@@ -507,6 +511,8 @@
      int GdkCoordToDevicePixels(gint coord);
      mozilla::LayoutDeviceIntPoint GdkPointToDevicePixels(GdkPoint point);
      nsIntRect GdkRectToDevicePixels(GdkRectangle rect);
@@ -5562,10 +5570,10 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/nsWindow.h
  };
  
  class nsChildWindow : public nsWindow {
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/xpfe/appshell/nsWebShellWindow.cpp
+Index: firefox-trunk-42.0~a1~hg20150805r256164/xpfe/appshell/nsWebShellWindow.cpp
 ===================================================================
---- thunderbird-trunk-40.0~a1~hg20150331r17722.237186.orig/xpfe/appshell/nsWebShellWindow.cpp	2015-04-02 13:34:46.760325051 +0100
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/xpfe/appshell/nsWebShellWindow.cpp	2015-04-02 13:35:41.200454803 +0100
+--- firefox-trunk-42.0~a1~hg20150805r256164.orig/xpfe/appshell/nsWebShellWindow.cpp	2015-08-05 12:12:26.000000000 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/xpfe/appshell/nsWebShellWindow.cpp	2015-08-06 11:53:39.000000000 +0100
 @@ -58,6 +58,7 @@
  #include "nsIScreen.h"
  
@@ -5583,7 +5591,7 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/xpfe/appshell/nsWebShel
  #include "nsINativeMenuService.h"
  #define USE_NATIVE_MENUS
  #endif
-@@ -447,6 +448,11 @@
+@@ -457,6 +458,11 @@
  
    if (menubarNode) {
      nsCOMPtr<nsIContent> menubarContent(do_QueryInterface(menubarNode));
@@ -5595,21 +5603,19 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/xpfe/appshell/nsWebShel
      nms->CreateNativeMenuBar(aParentWindow, menubarContent);
    } else {
      nms->CreateNativeMenuBar(aParentWindow, nullptr);
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/moz.build
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/moz.build
 ===================================================================
---- thunderbird-trunk-40.0~a1~hg20150331r17722.237186.orig/widget/gtk/moz.build	2015-04-02 13:34:46.760325051 +0100
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/moz.build	2015-04-02 13:34:46.752325029 +0100
-@@ -19,11 +19,20 @@
+--- firefox-trunk-42.0~a1~hg20150805r256164.orig/widget/gtk/moz.build	2015-08-05 12:12:19.000000000 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/moz.build	2015-08-06 11:53:39.000000000 +0100
+@@ -20,10 +20,18 @@
      'nsAppShell.cpp',
      'nsBidiKeyboard.cpp',
      'nsColorPicker.cpp',
 +    'nsDbusmenu.cpp',
      'nsFilePicker.cpp',
-     'nsGtkIMModule.cpp',
      'nsGtkKeyUtils.cpp',
      'nsImageToPixbuf.cpp',
      'nsLookAndFeel.cpp',
-+    'nsMenu.cpp',
 +    'nsMenuBar.cpp',
 +    'nsMenuContainer.cpp',
 +    'nsMenuItem.cpp',
@@ -5620,15 +5626,16 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/moz.build
      'nsNativeThemeGTK.cpp',
      'nsScreenGtk.cpp',
      'nsScreenManagerGtk.cpp',
-@@ -35,6 +44,7 @@
+@@ -35,6 +43,8 @@
  ]
  
  SOURCES += [
++    'nsMenu.cpp', # conflicts with X11 headers
 +    'nsNativeMenuService.cpp',
      'nsWindow.cpp', # conflicts with X11 headers
  ]
  
-@@ -82,6 +92,7 @@
+@@ -83,6 +93,7 @@
  
  LOCAL_INCLUDES += [
      '/layout/generic',
@@ -5636,11 +5643,11 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/gtk/moz.build
      '/layout/xul',
      '/other-licenses/atk-1.0',
      '/widget',
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/browser/base/content/browser.js
+Index: firefox-trunk-42.0~a1~hg20150805r256164/browser/base/content/browser.js
 ===================================================================
---- thunderbird-trunk-40.0~a1~hg20150331r17722.237186.orig/browser/base/content/browser.js	2015-04-02 13:34:46.760325051 +0100
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/browser/base/content/browser.js	2015-04-02 13:34:46.752325029 +0100
-@@ -4801,6 +4801,8 @@
+--- firefox-trunk-42.0~a1~hg20150805r256164.orig/browser/base/content/browser.js	2015-08-05 12:10:12.000000000 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/browser/base/content/browser.js	2015-08-06 11:53:39.000000000 +0100
+@@ -4843,6 +4843,8 @@
    let toolbarNodes = Array.slice(gNavToolbox.childNodes);
    toolbarNodes = toolbarNodes.concat(gNavToolbox.externalToolbars);
    toolbarNodes = toolbarNodes.filter(node => node.getAttribute("toolbarname"));
@@ -5649,11 +5656,11 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/browser/base/content/br
    return toolbarNodes;
  }
  
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/moz.build
+Index: firefox-trunk-42.0~a1~hg20150805r256164/widget/moz.build
 ===================================================================
---- thunderbird-trunk-40.0~a1~hg20150331r17722.237186.orig/widget/moz.build	2015-04-02 13:34:46.760325051 +0100
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/moz.build	2015-04-02 13:34:46.752325029 +0100
-@@ -38,10 +38,12 @@
+--- firefox-trunk-42.0~a1~hg20150805r256164.orig/widget/moz.build	2015-08-05 12:12:19.000000000 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/moz.build	2015-08-06 11:53:39.000000000 +0100
+@@ -39,10 +39,12 @@
          'nsITaskbarProgress.idl',
      ]
      EXPORTS += [
@@ -5667,11 +5674,11 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/widget/moz.build
  TEST_DIRS += ['tests']
  
  # Don't build the DSO under the 'build' directory as windows does.
-Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/modules/libpref/init/all.js
+Index: firefox-trunk-42.0~a1~hg20150805r256164/modules/libpref/init/all.js
 ===================================================================
---- thunderbird-trunk-40.0~a1~hg20150331r17722.237186.orig/modules/libpref/init/all.js	2015-04-02 13:34:46.760325051 +0100
-+++ thunderbird-trunk-40.0~a1~hg20150331r17722.237186/modules/libpref/init/all.js	2015-04-02 13:34:46.756325040 +0100
-@@ -190,6 +190,9 @@
+--- firefox-trunk-42.0~a1~hg20150805r256164.orig/modules/libpref/init/all.js	2015-08-05 12:11:57.000000000 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/modules/libpref/init/all.js	2015-08-06 11:53:39.000000000 +0100
+@@ -202,6 +202,9 @@
  pref("browser.sessionhistory.max_total_viewers", -1);
  
  pref("ui.use_native_colors", true);
@@ -5681,3 +5688,15 @@ Index: thunderbird-trunk-40.0~a1~hg20150331r17722.237186/modules/libpref/init/al
  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-trunk-42.0~a1~hg20150805r256164/widget/gtk/mozgtk/mozgtk.c
+===================================================================
+--- firefox-trunk-42.0~a1~hg20150805r256164.orig/widget/gtk/mozgtk/mozgtk.c	2015-08-05 12:12:19.000000000 +0100
++++ firefox-trunk-42.0~a1~hg20150805r256164/widget/gtk/mozgtk/mozgtk.c	2015-08-06 11:53:39.000000000 +0100
+@@ -120,6 +120,7 @@
+ STUB(gdk_x11_display_get_xdisplay)
+ STUB(gdk_x11_get_default_root_xwindow)
+ STUB(gdk_x11_get_default_xdisplay)
++STUB(gdk_x11_get_server_time)
+ STUB(gdk_x11_get_xatom_by_name)
+ STUB(gdk_x11_lookup_xdisplay)
+ STUB(gdk_x11_screen_get_xscreen)