extra/firefox to 71.0-1

This commit is contained in:
Kevin Mihelich 2019-12-03 19:10:18 +00:00
parent 398db9da2e
commit 90b8c5a8a4
5 changed files with 21 additions and 24493 deletions

View file

@ -1,8 +1,8 @@
From d5b879780bfa6cdde2c3917c5f40dce26ba756ea Mon Sep 17 00:00:00 2001
From 8206881a390a660fa1baa3b0ba742a51dfb48e4a Mon Sep 17 00:00:00 2001
From: Edwin Takahashi <egao@mozilla.com>
Date: Wed, 30 Oct 2019 20:42:50 +0000
Subject: [PATCH 2/2] Bug 1212502 - Switch mozinfo to using the 'distro'
package to get linux distribution info r=ahal,KWierso
Subject: [PATCH] Bug 1212502 - Switch mozinfo to using the 'distro' package to
get linux distribution info r=ahal,KWierso
Differential Revision: https://phabricator.services.mozilla.com/D49366
---
@ -316,10 +316,10 @@ index 71bd3afc347c..223f4752e6aa 100644
mozilla.pth:third_party/python/enum34
mozilla.pth:third_party/python/fluent
diff --git a/python/mozbuild/mozbuild/action/test_archive.py b/python/mozbuild/mozbuild/action/test_archive.py
index b7854e109c79..4cf6f5d38940 100644
index 6b98946678e7..53ee95d42dbb 100644
--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -247,6 +247,12 @@ ARCHIVE_FILES = {
@@ -249,6 +249,12 @@ ARCHIVE_FILES = {
'pattern': '**',
'dest': 'tools/six',
},
@ -332,7 +332,7 @@ index b7854e109c79..4cf6f5d38940 100644
{
'source': buildconfig.topobjdir,
'base': '',
@@ -434,6 +440,12 @@ ARCHIVE_FILES = {
@@ -436,6 +442,12 @@ ARCHIVE_FILES = {
'pattern': 'six.py',
'dest': 'mozharness',
},
@ -346,7 +346,7 @@ index b7854e109c79..4cf6f5d38940 100644
'reftest': [
{
diff --git a/testing/mozbase/mozinfo/mozinfo/mozinfo.py b/testing/mozbase/mozinfo/mozinfo/mozinfo.py
index 50bfaf8a0670..8256d0eb2cb0 100755
index 363cc8afb0e5..2157f517bea4 100755
--- a/testing/mozbase/mozinfo/mozinfo/mozinfo.py
+++ b/testing/mozbase/mozinfo/mozinfo/mozinfo.py
@@ -14,6 +14,7 @@ import os

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,4 @@
From 1cab10b39cfda068100cab8c598f1ca0f50e4131 Mon Sep 17 00:00:00 2001
Message-Id: <1cab10b39cfda068100cab8c598f1ca0f50e4131.1553597287.git.jan.steffens@gmail.com>
From 83f234464554c7f4393cd1dbdeb3a68d3ae0ccae Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 25 Mar 2019 20:30:11 +0100
Subject: [PATCH] Use remoting name for GDK application names
@ -10,10 +9,10 @@ Subject: [PATCH] Use remoting name for GDK application names
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 0b808ef215f06..28911c0ffeaec 100644
index 984b998133bd..b6c9f013940c 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -3728,11 +3728,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
@@ -3746,11 +3746,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
// consistently.
// Set program name to the one defined in application.ini.
@ -27,7 +26,7 @@ index 0b808ef215f06..28911c0ffeaec 100644
// Initialize GTK here for splash.
diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
index 0686ff814916b..ae4a4ea55f420 100644
index 0daa78fdbbad..49038d0bb1c8 100644
--- a/widget/gtk/nsAppShell.cpp
+++ b/widget/gtk/nsAppShell.cpp
@@ -24,6 +24,7 @@
@ -38,7 +37,7 @@ index 0686ff814916b..ae4a4ea55f420 100644
#include "ScreenHelperGTK.h"
#include "HeadlessScreenHelper.h"
#include "mozilla/widget/ScreenManager.h"
@@ -171,10 +172,8 @@ nsresult nsAppShell::Init() {
@@ -175,10 +176,8 @@ nsresult nsAppShell::Init() {
// option when program uses gdk_set_program_class().
//
// See https://bugzilla.gnome.org/show_bug.cgi?id=747634
@ -52,5 +51,5 @@ index 0686ff814916b..ae4a4ea55f420 100644
}
--
2.21.0
2.24.0

View file

@ -11,8 +11,8 @@ highmem=1
noautobuild=1
pkgname=firefox
pkgver=70.0.1
pkgrel=3
pkgver=71.0
pkgrel=1
pkgdesc="Standalone web browser from mozilla.org"
arch=(x86_64)
license=(MPL GPL LGPL)
@ -29,21 +29,17 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
'hunspell-en_US: Spell checking, American English')
options=(!emptydirs !makeflags !strip)
source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
no-relinking.patch
arm.patch
build-arm-libopus.patch
0001-Update-bindgen.patch
0002-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch
0001-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch
0001-Use-remoting-name-for-GDK-application-names.patch
$pkgname.desktop)
sha256sums=('f2e9bb26af7682b31e82fdfc3a4b3e04fd1caa8b004469ea608185d33e35691b'
sha256sums=('78304cd58229e7103b56b34718aad051c9a4db30c266512a64f501ba58da7fbe'
'SKIP'
'2dc9d1aa5eb7798c89f46478f254ae61e4122b4d1956d6044426288627d8a014'
'832d895c90d346fe4acf25b8b8ba9a62bea595fe5fcdeaf545c8e952393993fc'
'58890388e02af41055e1ec9797b7c094dee499a5219dc9c532c6cfccf2cce972'
'bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
'2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9'
'ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894'
'33f5aec0bba83b23410176c5351425d2ad949d7f0bf409a579be25bebb773fce'
'5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c'
'a9e5264257041c0b968425b5c97436ba48e8d294e1a0f02c59c35461ea245c33')
validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
@ -64,12 +60,8 @@ prepare() {
mkdir mozbuild
cd firefox-$pkgver
# Avoid relinking during buildsymbols
patch -Np1 -i ../no-relinking.patch
# Make it compile with Rust 1.39 and Python 3.8
patch -Np1 -i ../0001-Update-bindgen.patch
patch -Np1 -i ../0002-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch
# Make it compile with Python 3.8
patch -Np1 -i ../0001-Bug-1212502-Switch-mozinfo-to-using-the-distro-packa.patch
# https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch

View file

@ -1,41 +0,0 @@
# HG changeset patch
# User Mike Shal <mshal@mozilla.com>
# Date 1570127498 25200
# Node ID b8bc2504f108d8a2216ee11405cbbe4cf7a0eaec
# Parent 9a4d6aacc48080f019024c02ac7da1fd576b39fe
Bug XYZ - Only force re-linking on 1-tier PGO builds; r?#firefox-build-system-reviewers
diff --git a/config/rules.mk b/config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -465,25 +465,27 @@ ifeq ($(OS_ARCH)_$(GNU_CC), WINNT_)
$(foreach pgd,$(wildcard *.pgd),pgomgr -clear $(pgd);)
else
ifdef GNU_CC
-$(RM) *.gcda
endif
endif
endif
+ifdef MOZ_1TIER_PGO
ifneq (,$(MOZ_PROFILE_GENERATE)$(MOZ_PROFILE_USE))
ifneq (,$(filter target,$(MAKECMDGOALS)))
ifdef GNU_CC
# Force rebuilding libraries and programs in both passes because each
# pass uses different object files.
$(PROGRAM) $(SHARED_LIBRARY) $(LIBRARY): FORCE
endif
endif
endif
+endif
endif # NO_PROFILE_GUIDED_OPTIMIZE
##############################################
clean clobber realclean clobber_all::
-$(RM) $(ALL_TRASH)
-$(RM) -r $(ALL_TRASH_DIRS)