diff --git a/firefox/.signature b/firefox/.signature index 0e39b17ca..a8b0b6b35 100644 --- a/firefox/.signature +++ b/firefox/.signature @@ -1,8 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF345ym4nE1sWJy0AWSb0UmIJK3Q5iWF6Uvt3Af833VRDY7UAZlTQ+PVNMpjJnY3rdScx4oQSQRMjJRoTu9Mz8gAI= -SHA256 (Pkgfile) = 490b5b02b8e2ef5ddc527607bcbfc73879caf2602a84b2a321097b159c7a12e6 +RWSagIOpLGJF38mli5QSiX36X+/H+/tP3ey0g5q17U9ivZw5/ClDCwWJI73aVh0hQtgNQS+2kgGi9oacyHKKNKGTfmYR0/+lEQw= +SHA256 (Pkgfile) = 5f757c630992929254b6347616d67761ffd09d3e422ef5e84c975459e06236ef SHA256 (.footprint) = d932c0f2d873abbf10fe3fd1a0d1dd95bf413717d06238eae7d85e86637aae53 -SHA256 (firefox-117.0.source.tar.xz) = fa524cb9a63334d74ef996f3cbaf1559b5836f6c8ef6e890fa20846029242ac7 -SHA256 (REVERT-721a5102bc50cccae86d05d5052501845a6fd7bb.patch) = ff38df27bc09229870b31ed560ce11ec7b7f9480f94742de87069982996355ee +SHA256 (firefox-117.0.1.source.tar.xz) = 7ea4203b5cf9e59f80043597e2c9020291754fcab784a337586b5f5e1370c416 SHA256 (firefox.desktop) = 05bd1a4e283bc68f525f87cabf35ad0a59e5e63e107ce3901a4ac73e3d16ef33 SHA256 (node-stdout-nonblocking-wrapper) = bb8c503015e49ed1b152225bdc56cf502cd831f35962d113dcbb9121967f3523 diff --git a/firefox/Pkgfile b/firefox/Pkgfile index 8857c563c..97a7acaae 100644 --- a/firefox/Pkgfile +++ b/firefox/Pkgfile @@ -5,19 +5,18 @@ # Optional: apulse jack pulseaudio pipewire sndio sccache lld wasi-libc++ wayland name=firefox -version=117.0 +version=117.0.1 release=1 source=(https://ftp.mozilla.org/pub/firefox/releases/${version}/source/$name-${version}.source.tar.xz - REVERT-721a5102bc50cccae86d05d5052501845a6fd7bb.patch firefox.desktop node-stdout-nonblocking-wrapper) build() { cd $name-$version - for p in $SRC/REV*.patch; do - patch -p1 -R -i $p - done + #for p in $SRC/REV*.patch; do + # patch -p1 -R -i $p + #done if [ "$(/usr/bin/python3 -c "import sys; print(sys.stdout.encoding)")" != 'utf-8' ]; then printf "\e[031mError: set an UTF-8 locale to compile this!\033[0m\n" diff --git a/firefox/REVERT-721a5102bc50cccae86d05d5052501845a6fd7bb.patch b/firefox/REVERT-721a5102bc50cccae86d05d5052501845a6fd7bb.patch deleted file mode 100644 index 59f72bed5..000000000 --- a/firefox/REVERT-721a5102bc50cccae86d05d5052501845a6fd7bb.patch +++ /dev/null @@ -1,54 +0,0 @@ - -# HG changeset patch -# User Mike Hommey -# Date 1691703966 0 -# Node ID 721a5102bc50cccae86d05d5052501845a6fd7bb -# Parent 24195ef5e1a7ff8f510159dca76ddbc92c5dce6c -Bug 1847697 - Don't use -z,pack-relative-relocs when it would lead to a ld.so error. r=firefox-build-system-reviewers,ahochheiden - -Differential Revision: https://phabricator.services.mozilla.com/D185712 - -diff --git a/toolkit/moz.configure b/toolkit/moz.configure ---- a/toolkit/moz.configure -+++ b/toolkit/moz.configure -@@ -1595,26 +1595,34 @@ with only_when("--enable-compile-environ - onerror=lambda: None, - ) - is not None - ): - # BFD ld ignores options it doesn't understand. So check - # that we did get packed relative relocations (DT_RELR). - env = os.environ.copy() - env["LANG"] = "C" -- dyn = check_cmd_output(readelf, "-d", path, env=env) -+ dyn = check_cmd_output(readelf, "-d", path, env=env).splitlines() - tags = [ -- int(l.split()[0], 16) -- for l in dyn.splitlines() -- if l.strip().startswith("0x") -+ int(l.split()[0], 16) for l in dyn if l.strip().startswith("0x") - ] - # Older versions of readelf don't know about DT_RELR but will - # still display the tag number. - if 0x23 in tags: -- return pack_rel_relocs -+ needed = [l for l in dyn if l.split()[1] == "(NEEDED)"] -+ is_glibc = any(l.endswith("[libc.so.6]") for l in needed) -+ # The mold linker doesn't add a GLIBC_ABI_DT_RELR version -+ # dependency, which ld.so doesn't like. -+ # https://github.com/rui314/mold/issues/653#issuecomment-1670274638 -+ if is_glibc: -+ versions = check_cmd_output(readelf, "-V", path, env=env) -+ if "GLIBC_ABI_DT_RELR" in versions.split(): -+ return pack_rel_relocs -+ else: -+ return pack_rel_relocs - finally: - try: - os.remove(path) - except FileNotFoundError: - pass - - add_old_configure_assignment("PACK_REL_RELOC_FLAGS", pack_relative_relocs) - -