79.0-1

4 files changed, 106 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2d18985dd5c..a1641f627913 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-appmenu
 	pkgdesc = Firefox from extra with appmenu patch
-	pkgver = 78.0.2
+	pkgver = 79.0
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
@@ -26,6 +26,7 @@ pkgbase = firefox-appmenu
 	makedepends = nasm
 	makedepends = python-setuptools
 	makedepends = python-psutil
+	makedepends = lld
 	depends = gtk3
 	depends = libxt
 	depends = mime-types
@@ -39,22 +40,24 @@ pkgbase = firefox-appmenu
 	optdepends = pulseaudio: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = hunspell-en_US: Spell checking, American English
-	provides = firefox=78.0.2
+	provides = firefox=79.0
 	conflicts = firefox
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source = https://archive.mozilla.org/pub/firefox/releases/78.0.2/source/firefox-78.0.2.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/78.0.2/source/firefox-78.0.2.source.tar.xz.asc
+	source = https://archive.mozilla.org/pub/firefox/releases/79.0/source/firefox-79.0.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/79.0/source/firefox-79.0.source.tar.xz.asc
 	source = 0001-Use-remoting-name-for-GDK-application-names.patch
 	source = firefox.desktop
+	source = bug1654465.diff
 	source = unity-menubar.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = 1aa00ec6d40a771d525b867b175be28eda096becc745875bcceb133a985750fc
+	sha256sums = 12a922855914ec6b4d4f06a4ac58bc549aca6bdafd3722d68a3d709a935e5713
 	sha256sums = SKIP
 	sha256sums = 3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75
 	sha256sums = 34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c
-	sha256sums = 411f1580801f7b1484575d38f5967cf3d8c68efbba8dd4e2950e13a763bd09d8
+	sha256sums = e577f7e5636deda0026b0e385186f3ecb2212c9b84b6a2949a1811dab3e410d6
+	sha256sums = 3cc18a835a12cedee7ffdbe71df21c57cdcf68ea9f11e6198b764c13a0c82fbe
 
 pkgname = firefox-appmenu
 
diff --git a/PKGBUILD b/PKGBUILD
index 75c0561c4915..d9ceb8391d64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Jakub Schmidtke <sjakub@gmail.com>
 
@@ -7,7 +7,7 @@
 
 pkgname=firefox-appmenu
 _pkgname=firefox
-pkgver=78.0.2
+pkgver=79.0
 pkgrel=1
 pkgdesc="Firefox from extra with appmenu patch"
 arch=(x86_64)
@@ -16,7 +16,7 @@ url="https://www.mozilla.org/firefox/"
 depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse)
 makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
              autoconf2.13 rust clang llvm jack gtk2 nodejs cbindgen nasm
-             python-setuptools python-psutil)
+             python-setuptools python-psutil lld)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
@@ -28,12 +28,14 @@ options=(!emptydirs !makeflags !strip)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
         0001-Use-remoting-name-for-GDK-application-names.patch
         $_pkgname.desktop
+        bug1654465.diff
         unity-menubar.patch)
-sha256sums=('1aa00ec6d40a771d525b867b175be28eda096becc745875bcceb133a985750fc'
+sha256sums=('12a922855914ec6b4d4f06a4ac58bc549aca6bdafd3722d68a3d709a935e5713'
             'SKIP'
             '3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75'
             '34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c'
-            '411f1580801f7b1484575d38f5967cf3d8c68efbba8dd4e2950e13a763bd09d8')
+            'e577f7e5636deda0026b0e385186f3ecb2212c9b84b6a2949a1811dab3e410d6'
+            '3cc18a835a12cedee7ffdbe71df21c57cdcf68ea9f11e6198b764c13a0c82fbe')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -54,9 +56,12 @@ prepare() {
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
-  
+
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1654465
+  patch -Np1 -i ../bug1654465.diff
+
   # actual appmenu patch from ubuntu repos
-  # https://launchpad.net/~mozillateam/+archive/ubuntu/firefox-next/+sourcefiles/firefox/78.0+build2-0ubuntu0.18.04.1~mt1/firefox_78.0+build2-0ubuntu0.18.04.1~mt1.debian.tar.xz
+  # http://archive.ubuntu.com/ubuntu/pool/main/f/firefox/firefox_79.0+build1-0ubuntu0.16.04.2.debian.tar.xz
   patch -Np1 -i ../unity-menubar.patch
 
   echo -n "$_google_api_key" >google-api-key
@@ -70,6 +75,8 @@ ac_add_options --enable-release
 ac_add_options --enable-hardening
 ac_add_options --enable-optimize
 ac_add_options --enable-rust-simd
+ac_add_options --enable-linker=lld
+ac_add_options --disable-elf-hack
 export CC='clang --target=x86_64-unknown-linux-gnu'
 export CXX='clang++ --target=x86_64-unknown-linux-gnu'
 export AR=llvm-ar
@@ -133,15 +140,11 @@ END
     xvfb-run -s "-screen 0 1920x1080x24 -nolisten local" \
     ./mach python build/pgo/profileserver.py
 
-  if [[ ! -s merged.profdata ]]; then
-    echo "No profile data produced."
-    return 1
-  fi
+  stat -c "Profile data found (%s bytes)" merged.profdata
+  test -s merged.profdata
 
-  if [[ ! -s jarlog ]]; then
-    echo "No jar log produced."
-    return 1
-  fi
+  stat -c "Jar log found (%s bytes)" jarlog
+  test -s jarlog
 
   echo "Removing instrumented browser..."
   ./mach clobber
diff --git a/bug1654465.diff b/bug1654465.diff
new file mode 100644
index 000000000000..f9982cb4d105
--- /dev/null
+++ b/bug1654465.diff
@@ -0,0 +1,77 @@
+ build/moz.configure/rust.configure                         |  2 +-
+ config/makefiles/rust.mk                                   |  5 +++++
+ .../mozbuild/test/configure/test_toolchain_configure.py    | 14 --------------
+ 3 files changed, 6 insertions(+), 15 deletions(-)
+
+diff --git c/build/moz.configure/rust.configure i/build/moz.configure/rust.configure
+index aaa693059d95..c90ae5ca7b25 100644
+--- c/build/moz.configure/rust.configure
++++ i/build/moz.configure/rust.configure
+@@ -146,7 +146,7 @@ def rust_compiler(rustc_info, cargo_info, build_project):
+         or by directly running the installer from https://rustup.rs/
+         '''))
+     if build_project == 'tools/crashreporter':
+-        rustc_min_version = Version('1.31.0')
++        rustc_min_version = Version('1.38.0')
+     else:
+         rustc_min_version = Version('1.43.0')
+     cargo_min_version = rustc_min_version
+diff --git c/config/makefiles/rust.mk i/config/makefiles/rust.mk
+index a9abcc9af4c0..b5c7973104ce 100644
+--- c/config/makefiles/rust.mk
++++ i/config/makefiles/rust.mk
+@@ -63,6 +63,11 @@ ifndef MOZ_DEBUG_RUST
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+ cargo_rustc_flags += -Clto
+ endif
++# Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when
++# using -Clto.
++ifeq (,$(filter 1.38.% 1.39.% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION)))
++RUSTFLAGS += -Cembed-bitcode=yes
++endif
+ endif
+ endif
+ 
+diff --git c/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py i/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+index e1921ece6865..759d4d98cc0d 100755
+--- c/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
++++ i/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+@@ -1796,38 +1796,24 @@ class RustTest(BaseConfigureTest):
+                                      arm_arch=7, fpu='neon', thumb2=True, float_abi='softfp')),
+             'thumbv7neon-linux-androideabi')
+ 
+-        self.assertEqual(
+-            self.get_rust_target('arm-unknown-linux-androideabi',
+-                                 version='1.32.0',
+-                                 arm_target=ReadOnlyNamespace(
+-                                     arm_arch=7, fpu='neon', thumb2=True, float_abi='softfp')),
+-            'armv7-linux-androideabi')
+-
+         self.assertEqual(
+             self.get_rust_target('arm-unknown-linux-androideabi',
+                                  arm_target=ReadOnlyNamespace(
+                                      arm_arch=7, fpu='neon', thumb2=False, float_abi='softfp')),
+             'armv7-linux-androideabi')
+ 
+         self.assertEqual(
+             self.get_rust_target('arm-unknown-linux-androideabi',
+                                  arm_target=ReadOnlyNamespace(
+                                      arm_arch=7, fpu='vfpv2', thumb2=True, float_abi='softfp')),
+             'armv7-linux-androideabi')
+ 
+         self.assertEqual(
+             self.get_rust_target('armv7-unknown-linux-gnueabihf',
+                                  arm_target=ReadOnlyNamespace(
+                                      arm_arch=7, fpu='neon', thumb2=True, float_abi='hard')),
+             'thumbv7neon-unknown-linux-gnueabihf')
+ 
+-        self.assertEqual(
+-            self.get_rust_target('armv7-unknown-linux-gnueabihf',
+-                                 version='1.32.0',
+-                                 arm_target=ReadOnlyNamespace(
+-                                     arm_arch=7, fpu='neon', thumb2=True, float_abi='hard')),
+-            'armv7-unknown-linux-gnueabihf')
+-
+         self.assertEqual(
+             self.get_rust_target('armv7-unknown-linux-gnueabihf',
+                                  arm_target=ReadOnlyNamespace(
diff --git a/unity-menubar.patch b/unity-menubar.patch
index ab36cf3e3a24..7723d6631a54 100644
--- a/unity-menubar.patch
+++ b/unity-menubar.patch
@@ -98,15 +98,15 @@
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
 @@ -313,6 +313,9 @@ pref("dom.mouseevent.click.hack.use_lega
+ // Fastback caching - if this pref is negative, then we calculate the number
  // of content viewers to cache based on the amount of available memory.
  pref("browser.sessionhistory.max_total_viewers", -1);
- 
 +#ifdef MOZ_WIDGET_GTK
 +pref("ui.use_unity_menubar", true);
 +#endif
- pref("ui.click_hold_context_menus", false);
  // 0 = false, 1 = true, 2 = autodetect.
  pref("ui.android.mouse_as_touch", 1);
+ 
 --- a/toolkit/content/xul.css
 +++ b/toolkit/content/xul.css
 @@ -200,6 +200,13 @@ toolbar[type="menubar"] {