From: Duncaen <Duncaen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] firefox: update to 117.0.
Date: Mon, 28 Aug 2023 23:33:02 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45804@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 402 bytes --]
There is a new pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages firefox-117
https://github.com/void-linux/void-packages/pull/45804
firefox: update to 117.0.
[ci skip]
* [x] x86_64-glibc
* [ ] x86_64-musl
* [ ] aarch64-musl
* [ ] i686-glibc
A patch file from https://github.com/void-linux/void-packages/pull/45804.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-117-45804.patch --]
[-- Type: text/x-diff, Size: 4673 bytes --]
From 4ca512dccdbc3ae76bc741ee9e30a6c33793a35b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 28 Aug 2023 23:24:52 +0200
Subject: [PATCH] firefox: update to 117.0.
---
...5102bc50cccae86d05d5052501845a6fd7bb.patch | 54 +++++++++++++++++++
...c50cccae86d05d5052501845a6fd7bb.patch.args | 1 +
srcpkgs/firefox/template | 4 +-
3 files changed, 57 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/firefox/patches/721a5102bc50cccae86d05d5052501845a6fd7bb.patch
create mode 100644 srcpkgs/firefox/patches/721a5102bc50cccae86d05d5052501845a6fd7bb.patch.args
diff --git a/srcpkgs/firefox/patches/721a5102bc50cccae86d05d5052501845a6fd7bb.patch b/srcpkgs/firefox/patches/721a5102bc50cccae86d05d5052501845a6fd7bb.patch
new file mode 100644
index 0000000000000..59f72bed5a801
--- /dev/null
+++ b/srcpkgs/firefox/patches/721a5102bc50cccae86d05d5052501845a6fd7bb.patch
@@ -0,0 +1,54 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# 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)
+
+
diff --git a/srcpkgs/firefox/patches/721a5102bc50cccae86d05d5052501845a6fd7bb.patch.args b/srcpkgs/firefox/patches/721a5102bc50cccae86d05d5052501845a6fd7bb.patch.args
new file mode 100644
index 0000000000000..8bbbbe9483632
--- /dev/null
+++ b/srcpkgs/firefox/patches/721a5102bc50cccae86d05d5052501845a6fd7bb.patch.args
@@ -0,0 +1 @@
+-RNp1
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 2b6f276b9addc..e52e90ad0e403 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
#
pkgname=firefox
-version=116.0.3
+version=117.0
revision=1
build_helper="rust"
short_desc="Mozilla Firefox web browser"
@@ -12,7 +12,7 @@ license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.mozilla.org/firefox/"
# distfiles="${MOZILLA_SITE}/firefox/candidates/${version/beta/b}-candidates/build1/source/firefox-${version/beta/b}.source.tar.xz"
distfiles="${MOZILLA_SITE}/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"
-checksum=575a0d11b487a03527cc90c5e6d556c09669201cbb584b73442b202ee1d3e2e6
+checksum=fa524cb9a63334d74ef996f3cbaf1559b5836f6c8ef6e890fa20846029242ac7
lib32disabled=yes
next reply other threads:[~2023-08-28 21:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-28 21:33 Duncaen [this message]
2023-08-28 21:37 ` [PR PATCH] [Updated] " Duncaen
2023-08-28 22:15 ` Duncaen
2023-08-31 10:34 ` Duncaen
2023-08-31 10:35 ` [PR PATCH] [Merged]: " Duncaen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45804@inbox.vuxu.org \
--to=duncaen@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).