Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (11ecab64a2e7204c5cd916436f07f10c5d506d50)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (11ecab64a2e7204c5cd916436f07f10c5d506d50)
  • Date: Tue, 1 Apr 2025 14:32:45 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

http/firefox-esr/DEPENDS | 5 -
http/firefox-esr/HISTORY | 7 +
http/firefox-esr/patches/0020-bmo-1862601-system-icu-74.patch | 41
----------
3 files changed, 9 insertions(+), 44 deletions(-)

New commits:
commit 11ecab64a2e7204c5cd916436f07f10c5d506d50
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

firefox-esr: build with internal ICU, that is the only way

Even if we patch for system ICU with more line breakers (for example), the
included ICU headers still end up in the build and break things due to the
mismatch. Firefox is too entangled with its vendored version.

diff --git a/http/firefox-esr/DEPENDS b/http/firefox-esr/DEPENDS
index 06efe7a..29726ad 100755
--- a/http/firefox-esr/DEPENDS
+++ b/http/firefox-esr/DEPENDS
@@ -6,7 +6,8 @@ depends -sub "CLANG" llvm
&&
depends perl &&
depends python3 &&

-depends icu "--with-system-icu" &&
+# The build is not even trying to make this work. Do not do it.
+#depends icu "--with-system-icu" &&

depends glib2 &&
vdepends <<!
@@ -52,7 +53,7 @@ depends libwebp "--with-system-webp"
&&

depends nspr "--with-system-nspr" &&

-local NSS_BRANCH="3.101" &&
+local NSS_BRANCH="3.108" &&
if spell_ok nss &&
is_version_less "$(installed_version nss)" "${NSS_BRANCH}"; then
depends -sub "${NSS_BRANCH}" nss "--with-system-nss"
diff --git a/http/firefox-esr/HISTORY b/http/firefox-esr/HISTORY
index faa2b1e..30c1801 100644
--- a/http/firefox-esr/HISTORY
+++ b/http/firefox-esr/HISTORY
@@ -1,4 +1,9 @@
-2024-03-05 Thomas Orgis <sobukus AT sourcemage.org>
+2025-03-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: can use nss 3.108, too (BLFS uses 3.109, even)
+ * DEPENDS: can _not_ use system ICU. Really.
+ * patches/0020-bmo-1862601-system-icu-74.patch: removed, breaks
internal ICU
+
+2025-03-05 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: ++SECURITY_PATCH, version 128.8.0esr
* */*: sync with firefox 128.0.3
* patches/patches/0026-bmo-1898476-nvidia-wayland-egl-sync.patch:
diff --git a/http/firefox-esr/patches/0020-bmo-1862601-system-icu-74.patch
b/http/firefox-esr/patches/0020-bmo-1862601-system-icu-74.patch
deleted file mode 100644
index 617dd76..0000000
--- a/http/firefox-esr/patches/0020-bmo-1862601-system-icu-74.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/917599
-https://bugzilla.mozilla.org/show_bug.cgi?id=1862601
-https://hg.mozilla.org/try/rev/d5f3b0c4f08a426ce00a153c04e177eecb6820e2
-
-# HG changeset patch
-# User André Bargull <andre.bargull AT gmail.com>
-# Date 1697435923 -7200
-# Node ID d5f3b0c4f08a426ce00a153c04e177eecb6820e2
-# Parent c63994f8259efdf6e745c960aa9e1409d5477049
-Bug xxx - Part 12: Add new line break classes. r?
-
-diff --git a/intl/lwbrk/LineBreaker.cpp b/intl/lwbrk/LineBreaker.cpp
---- a/intl/lwbrk/LineBreaker.cpp
-+++ b/intl/lwbrk/LineBreaker.cpp
-@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB
- /* JT = 34, [JT] */ CLASS_CHARACTER,
- /* JV = 35, [JV] */ CLASS_CHARACTER,
- /* CLOSE_PARENTHESIS = 36, [CP] */
CLASS_CLOSE_LIKE_CHARACTER,
- /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
- /* HEBREW_LETTER = 38, [HL] */ CLASS_CHARACTER,
- /* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER,
- /* E_BASE = 40, [EB] */ CLASS_BREAKABLE,
- /* E_MODIFIER = 41, [EM] */ CLASS_CHARACTER,
-- /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER};
-+ /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER,
-+ /* AKSARA = 43, [AK] */ CLASS_CHARACTER,
-+ /* AKSARA_PREBASE = 44, [AP] */ CLASS_CHARACTER,
-+ /* AKSARA_START = 45, [AS] */ CLASS_CHARACTER,
-+ /* VIRAMA_FINAL = 46, [VF] */ CLASS_CHARACTER,
-+ /* VIRAMA = 47, [VI] */ CLASS_CHARACTER,
-+ };
-
- static_assert(U_LB_COUNT ==
mozilla::ArrayLength(sUnicodeLineBreakToClass),
- "Gecko vs ICU LineBreak class mismatch");
-
- auto cls = GetLineBreakClass(u);
- MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
-
- // Overrides based on rules for the different line-break values given in
-
-


  • [[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (11ecab64a2e7204c5cd916436f07f10c5d506d50), Thomas Orgis, 04/01/2025

Archive powered by MHonArc 2.6.24.

Top of Page