From ceb9cc0736601c008a248dec424164f10e78c1e1 Mon Sep 17 00:00:00 2001 From: Owen Rafferty Date: Mon, 5 Sep 2022 01:15:58 -0500 Subject: [PATCH] firefox [testing]: 105.0b7 --- testing/firefox/build | 8 ++-- testing/firefox/checksums | 4 +- testing/firefox/depends | 3 +- testing/firefox/files/firefox.sh | 4 ++ testing/firefox/patches/no-perl.patch | 65 +++++++++++++++++++++++++++ testing/firefox/sources | 2 + testing/firefox/version | 2 +- 7 files changed, 82 insertions(+), 6 deletions(-) create mode 100755 testing/firefox/files/firefox.sh create mode 100644 testing/firefox/patches/no-perl.patch diff --git a/testing/firefox/build b/testing/firefox/build index adecf5cb..0303d4db 100755 --- a/testing/firefox/build +++ b/testing/firefox/build @@ -43,7 +43,6 @@ export CXXFLAGS="$CXXFLAGS -w" # change them to relative paths ($PWD/... ./...). export RUSTFLAGS="$RUSTFLAGS --remap-path-prefix=$PWD=." -export LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib/firefox,--enable-new-dtags" export RUSTFLAGS="$RUSTFLAGS -Cdebuginfo=0" export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system export MOZ_DEBUG_FLAGS=-g0 @@ -68,8 +67,8 @@ ac_add_options --with-system-png ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-pixman -ac_add_options --without-system-nss -ac_add_options --without-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-nspr ac_add_options --without-wasm-sandboxed-libraries ac_add_options --disable-eme ac_add_options --disable-dbus @@ -102,3 +101,6 @@ rm -rf \ "$1/usr/lib/firefox/browser/features/webcompat-reporter@mozilla.org.xpi" \ "$1/usr/lib/firefox/browser/features/webcompat@mozilla.org.xpi" \ "$1/usr/lib/firefox/browser/features/doh-rollout@mozilla.org.xpi" + +rm "$1/usr/bin/firefox" +cp firefox.sh "$1/usr/bin/firefox" diff --git a/testing/firefox/checksums b/testing/firefox/checksums index 5ca55a94..bbf3271c 100644 --- a/testing/firefox/checksums +++ b/testing/firefox/checksums @@ -1,4 +1,4 @@ -2c4f6aefe296a51b1434ceed3ca78fdfca67cf06b4c0fe2ad165f9dbd44b57d7 +a3d4a14dcbe92961ef921e00705c6f8c6724380d00010d211a7a887607876fff 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 @@ -6,3 +6,5 @@ ba6e380bc3d2cbd1b3a505ab97687498335c334d8a4be7f465ad30ee366806c7 86ce49e650dd117f0f2928a7f810a58df526b1087c274d35eeb9c5bbf09eac5b 42d489e60eae7d2807ef109a4eb1dd3d0e52e8ea9a8a19074495453e588f0625 4a232e3aa3973894a58c126b9e901c924d4e1ca3e00c4fc82d08de4b880183a9 +ed51ce8a6730c489ea9dda354f02c579fb3632925096a0260bfae7a6b82ceace +a68295affbd2c9abac063127bba06e50d007a6a0f2fad9ec30aa5a841e521bb5 diff --git a/testing/firefox/depends b/testing/firefox/depends index c7d777fc..5397e3e4 100644 --- a/testing/firefox/depends +++ b/testing/firefox/depends @@ -20,8 +20,9 @@ m4 make mesa nasm make nodejs make +nspr +nss pango -perl make pixman pkgconf make python make diff --git a/testing/firefox/files/firefox.sh b/testing/firefox/files/firefox.sh new file mode 100755 index 00000000..85326b38 --- /dev/null +++ b/testing/firefox/files/firefox.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/firefox" +exec /usr/lib/firefox/firefox diff --git a/testing/firefox/patches/no-perl.patch b/testing/firefox/patches/no-perl.patch new file mode 100644 index 00000000..bcde015a --- /dev/null +++ b/testing/firefox/patches/no-perl.patch @@ -0,0 +1,65 @@ +diff --git a/moz.configure b/moz.configure +index 95763e2..dc0ed30 100755 +--- a/moz.configure ++++ b/moz.configure +@@ -527,60 +527,6 @@ def awk_for_old_configure(value): + + add_old_configure_assignment("AWK", awk_for_old_configure) + +- +-# Perl detection +-# ============================================================== +-perl = check_prog("PERL", ("perl5", "perl")) +- +-# Until the PERL variable is not necessary in old-configure +- +- +-@depends(perl) +-def perl_for_old_configure(value): +- return value +- +- +-add_old_configure_assignment("PERL", perl_for_old_configure) +- +- +-@template +-def perl_version_check(min_version): +- @depends(perl) +- @checking("for minimum required perl version >= %s" % min_version) +- def get_perl_version(perl): +- return Version( +- check_cmd_output( +- perl, +- "-e", +- "print $]", +- onerror=lambda: die("Failed to get perl version."), +- ) +- ) +- +- @depends(get_perl_version) +- def check_perl_version(version): +- if version < min_version: +- die("Perl %s or higher is required.", min_version) +- +- @depends(perl) +- @checking("for full perl installation") +- @imports("subprocess") +- def has_full_perl_installation(perl): +- ret = subprocess.call([perl, "-e", "use Config; exit(!-d $Config{archlib})"]) +- return ret == 0 +- +- @depends(has_full_perl_installation) +- def require_full_perl_installation(has_full_perl_installation): +- if not has_full_perl_installation: +- die( +- "Cannot find Config.pm or $Config{archlib}. " +- "A full perl installation is required." +- ) +- +- +-perl_version_check("5.006") +- +- + # GNU make detection + # ============================================================== + option(env="MAKE", nargs=1, help="Path to GNU make") diff --git a/testing/firefox/sources b/testing/firefox/sources index 16b3cd8e..82844e3c 100644 --- a/testing/firefox/sources +++ b/testing/firefox/sources @@ -6,3 +6,5 @@ patches/fix-clang-as.patch patches/fix-linux-header.patch patches/no-dbus.patch patches/no-fribidi.patch +patches/no-perl.patch +files/firefox.sh diff --git a/testing/firefox/version b/testing/firefox/version index 41168532..84d0aa6a 100644 --- a/testing/firefox/version +++ b/testing/firefox/version @@ -1 +1 @@ -105.0b6 1 +105.0b7 1