* [PR PATCH] firefox: update to 118.0.
@ 2023-09-26 11:43 Duncaen
2023-09-26 13:55 ` [PR PATCH] [Merged]: " Duncaen
0 siblings, 1 reply; 2+ messages in thread
From: Duncaen @ 2023-09-26 11:43 UTC (permalink / raw)
To: ml
[-- 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-118
https://github.com/void-linux/void-packages/pull/46265
firefox: update to 118.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/46265.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-118-46265.patch --]
[-- Type: text/x-diff, Size: 7668 bytes --]
From 6ebd812627f67acc2f6e4cb7097971c0f0817e04 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 21 Sep 2023 16:18:17 +0200
Subject: [PATCH] firefox: update to 118.0.
---
...5102bc50cccae86d05d5052501845a6fd7bb.patch | 54 ------------------
...c50cccae86d05d5052501845a6fd7bb.patch.args | 1 -
srcpkgs/firefox/patches/sqlite-ppc.patch | 55 -------------------
srcpkgs/firefox/template | 7 +--
4 files changed, 3 insertions(+), 114 deletions(-)
delete mode 100644 srcpkgs/firefox/patches/REVERT-721a5102bc50cccae86d05d5052501845a6fd7bb.patch
delete mode 100644 srcpkgs/firefox/patches/REVERT-721a5102bc50cccae86d05d5052501845a6fd7bb.patch.args
delete mode 100644 srcpkgs/firefox/patches/sqlite-ppc.patch
diff --git a/srcpkgs/firefox/patches/REVERT-721a5102bc50cccae86d05d5052501845a6fd7bb.patch b/srcpkgs/firefox/patches/REVERT-721a5102bc50cccae86d05d5052501845a6fd7bb.patch
deleted file mode 100644
index 59f72bed5a801..0000000000000
--- a/srcpkgs/firefox/patches/REVERT-721a5102bc50cccae86d05d5052501845a6fd7bb.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-
-# 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/REVERT-721a5102bc50cccae86d05d5052501845a6fd7bb.patch.args b/srcpkgs/firefox/patches/REVERT-721a5102bc50cccae86d05d5052501845a6fd7bb.patch.args
deleted file mode 100644
index 8bbbbe9483632..0000000000000
--- a/srcpkgs/firefox/patches/REVERT-721a5102bc50cccae86d05d5052501845a6fd7bb.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--RNp1
diff --git a/srcpkgs/firefox/patches/sqlite-ppc.patch b/srcpkgs/firefox/patches/sqlite-ppc.patch
deleted file mode 100644
index 51f7faa618dda..0000000000000
--- a/srcpkgs/firefox/patches/sqlite-ppc.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 67157b1aa7da0a146b7d2d5abb9237eea1f434ec Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Fri, 23 Sep 2022 02:38:29 +0200
-Subject: [PATCH] fix sqlite3 on ppc with clang
-
-The __ppc__ macro is always defined on clang but not gcc, which
-results in sqlite mistakenly thinking that ppc64le with clang
-is big endian.
-
-Also disable some inline assembly stuff on ppc that is never used
-with gcc and probably was never tested with modern machines.
----
- third_party/sqlite3/src/sqlite3.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/third_party/sqlite3/src/sqlite3.c b/third_party/sqlite3/src/sqlite3.c
-index 4f3dc68..9017062 100644
---- a/third_party/sqlite3/src/sqlite3.c
-+++ b/third_party/sqlite3/src/sqlite3.c
-@@ -14317,9 +14317,9 @@ typedef INT16_TYPE LogEst;
- # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \
- defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
- defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
-- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
-+ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || defined(__LITTLE_ENDIAN__)
- # define SQLITE_BYTEORDER 1234
--# elif defined(sparc) || defined(__ppc__) || \
-+# elif defined(sparc) || defined(__BIG_ENDIAN__) || \
- defined(__ARMEB__) || defined(__AARCH64EB__)
- # define SQLITE_BYTEORDER 4321
- # else
-@@ -20713,7 +20713,7 @@ SQLITE_PRIVATE const char **sqlite3CompileOptions(int *pnOpt);
- return val;
- }
-
--#elif !defined(__STRICT_ANSI__) && (defined(__GNUC__) && defined(__ppc__))
-+#elif 0
-
- __inline__ sqlite_uint64 sqlite3Hwtime(void){
- unsigned long long retval;
-@@ -196385,9 +196385,9 @@ struct RtreeMatchArg {
- #if defined(i386) || defined(__i386__) || defined(_M_IX86) || \
- defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
- defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
-- defined(__arm__)
-+ defined(__arm__) || defined(__LITTLE_ENDIAN__)
- # define SQLITE_BYTEORDER 1234
--#elif defined(sparc) || defined(__ppc__)
-+#elif defined(sparc) || defined(__BIG_ENDIAN__)
- # define SQLITE_BYTEORDER 4321
- #else
- # define SQLITE_BYTEORDER 0 /* 0 means "unknown at compile-time" */
---
-2.37.3
-
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 60d778640898a..4c5ea87148a01 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,16 +3,15 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
#
pkgname=firefox
-version=117.0.1
+version=118.0
revision=1
build_helper="rust"
short_desc="Mozilla Firefox web browser"
maintainer="Duncaen <duncaen@voidlinux.org>"
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=7ea4203b5cf9e59f80043597e2c9020291754fcab784a337586b5f5e1370c416
+distfiles="${MOZILLA_SITE}/firefox/releases/${version/beta/b}/source/firefox-${version/beta/b}.source.tar.xz"
+checksum=d0f996116ae234dc7bd59e0d77ddefe268179d7500d16a9488309c826547c97c
lib32disabled=yes
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: firefox: update to 118.0.
2023-09-26 11:43 [PR PATCH] firefox: update to 118.0 Duncaen
@ 2023-09-26 13:55 ` Duncaen
0 siblings, 0 replies; 2+ messages in thread
From: Duncaen @ 2023-09-26 13:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
There's a merged pull request on the void-packages repository
firefox: update to 118.0.
https://github.com/void-linux/void-packages/pull/46265
Description:
[ci skip]
* [x] x86_64-glibc
* [x] x86_64-musl
* [x] aarch64-musl
* [x] i686-glibc
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-26 13:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-26 11:43 [PR PATCH] firefox: update to 118.0 Duncaen
2023-09-26 13:55 ` [PR PATCH] [Merged]: " Duncaen
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).