From a8a206890a81a6a4efea56b2cfcdf45a7ab65002 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 2 Oct 2025 22:45:02 +1000 Subject: [PATCH] iceweasel: bump version --- ...-143.0.recipe => iceweasel-143.0.3.recipe} | 8 ++- ....0.patchset => iceweasel-143.0.3.patchset} | 64 ++++++++++++------- ...et => iceweasel_launcher-143.0.3.patchset} | 0 3 files changed, 47 insertions(+), 25 deletions(-) rename www-client/iceweasel/{iceweasel-143.0.recipe => iceweasel-143.0.3.recipe} (94%) rename www-client/iceweasel/patches/{iceweasel-143.0.patchset => iceweasel-143.0.3.patchset} (99%) rename www-client/iceweasel/patches/{iceweasel_launcher-143.0.patchset => iceweasel_launcher-143.0.3.patchset} (100%) diff --git a/www-client/iceweasel/iceweasel-143.0.recipe b/www-client/iceweasel/iceweasel-143.0.3.recipe similarity index 94% rename from www-client/iceweasel/iceweasel-143.0.recipe rename to www-client/iceweasel/iceweasel-143.0.3.recipe index 535d010d1..bb46ef845 100644 --- a/www-client/iceweasel/iceweasel-143.0.recipe +++ b/www-client/iceweasel/iceweasel-143.0.3.recipe @@ -7,7 +7,7 @@ COPYRIGHT="1995-2025 Mozilla Developers and Contributors" LICENSE="MPL v2.0" REVISION="1" SOURCE_URI="https://ftp.mozilla.org/pub/firefox/releases/${portVersion}/source/firefox-${portVersion}.source.tar.xz" -CHECKSUM_SHA256="6c45ca38091820c2c9925a85c80c04120de0ced98589065358c34d257e1edf83" +CHECKSUM_SHA256="cb65352aea024e3b52d99b6fa4d028be687e3455381a0c065b2da740eeb1002b" SOURCE_DIR="firefox-$portVersion" PATCHES=" iceweasel-$portVersion.patchset @@ -86,7 +86,6 @@ BUILD_PREREQUIRES=" cmd:make cmd:nasm cmd:perl - cmd:pip3 cmd:pkg_config cmd:python3 cmd:tar @@ -112,6 +111,9 @@ BUILD() export DISABLE_ASLR=1 export MOZBUILD_STATE_PATH="$sourceDir/.mozconfig" + export RUSTFLAGS="-C link-arg=-Wl,--no-gc-sections" + + python3 -m ensurepip --default-pip ./mach -vv \ --no-interactive bootstrap \ @@ -159,7 +161,7 @@ INSTALL() local APP_SIGNATURE="application/x-vnd.iceweasel" local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="0" + local MINOR="`echo "$portVersion" | cut -d. -f3`" local LONG_INFO="$SUMMARY" sed \ -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ diff --git a/www-client/iceweasel/patches/iceweasel-143.0.patchset b/www-client/iceweasel/patches/iceweasel-143.0.3.patchset similarity index 99% rename from www-client/iceweasel/patches/iceweasel-143.0.patchset rename to www-client/iceweasel/patches/iceweasel-143.0.3.patchset index 0b2408ce8..b708dfab9 100644 --- a/www-client/iceweasel/patches/iceweasel-143.0.patchset +++ b/www-client/iceweasel/patches/iceweasel-143.0.3.patchset @@ -1,6 +1,6 @@ -From 1a26d6092016b5173b3834be67aa71dfb68c15cd Mon Sep 17 00:00:00 2001 +From f5ff1d1e7bced1c13e1f55f20e5ae956dd38c8b6 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Fri, 19 Sep 2025 16:35:07 +1000 +Date: Thu, 2 Oct 2025 21:41:00 +1000 Subject: Add Haiku build support Based on patches sourced from https://github.com/kenz-gelsoft/gecko-dev/ @@ -14,7 +14,7 @@ Based on patches sourced from https://github.com/kenz-gelsoft/gecko-dev/ - Implement remote server diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index d4f0e75..8297455 100644 +index 805f0b8..eb327e2 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -15,7 +15,9 @@ @@ -37,7 +37,7 @@ index d4f0e75..8297455 100644 pref("general.autoScroll", false); #else pref("general.autoScroll", true); -@@ -1060,7 +1062,7 @@ pref("browser.unexpectedScriptLoad.logLevel", "Warn"); +@@ -1061,7 +1063,7 @@ pref("browser.unexpectedScriptLoad.logLevel", "Warn"); pref("browser.tabs.min_inactive_duration_before_unload", 600000); // Does middleclick paste of clipboard to new tab button @@ -189,18 +189,20 @@ index af5a0cd..1d6be80 100644 if host.os == "OpenBSD": diff --git a/build/moz.configure/flags.configure b/build/moz.configure/flags.configure -index f0f4d7a..297718d 100644 +index f0f4d7a..eb6a2e4 100644 --- a/build/moz.configure/flags.configure +++ b/build/moz.configure/flags.configure -@@ -520,7 +520,7 @@ set_config("EXPAND_LIBS_LIST_STYLE", expand_libs_list_style) +@@ -520,8 +520,8 @@ set_config("EXPAND_LIBS_LIST_STYLE", expand_libs_list_style) # --------------------------------- @depends(building_with_gnu_compatible_cc, target) def moz_program_ldflags(building_with_gnu_compatible_cc, target): - if building_with_gnu_compatible_cc and target.kernel not in ("Darwin", "WASI"): +- return ["-pie"] + if building_with_gnu_compatible_cc and target.kernel not in ("Darwin", "WASI", "Haiku"): - return ["-pie"] ++ return ["-fPIC"] + set_config("MOZ_PROGRAM_LDFLAGS", moz_program_ldflags) diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index 6baa691..d583a4f 100644 --- a/build/moz.configure/init.configure @@ -805,7 +807,7 @@ index 06954b3..f9dd019 100644 # define EIP_sig(p) ((p)->thread.uts.ts32.__eip) # define EBP_sig(p) ((p)->thread.uts.ts32.__ebp) diff --git a/media/ffvpx/config_unix64.h b/media/ffvpx/config_unix64.h -index 7d63f47..2fe6932 100644 +index 7d63f47..f72e3bd 100644 --- a/media/ffvpx/config_unix64.h +++ b/media/ffvpx/config_unix64.h @@ -291,7 +291,7 @@ @@ -817,6 +819,15 @@ index 7d63f47..2fe6932 100644 #define HAVE_GETENV 1 #define HAVE_GETHRTIME 0 #define HAVE_GETOPT 1 +@@ -319,7 +319,7 @@ + #define HAVE_NANOSLEEP 1 + #define HAVE_PEEKNAMEDPIPE 0 + #define HAVE_PTHREAD_CANCEL 1 +-#define HAVE_SCHED_GETAFFINITY 1 ++#define HAVE_SCHED_GETAFFINITY 0 + #define HAVE_SECITEMIMPORT 0 + #define HAVE_SETCONSOLETEXTATTRIBUTE 0 + #define HAVE_SETCONSOLECTRLHANDLER 0 diff --git a/media/libcubeb/src/cubeb.c b/media/libcubeb/src/cubeb.c index 0511ad9..1e0b48e 100644 --- a/media/libcubeb/src/cubeb.c @@ -1861,10 +1872,10 @@ index c3ea652..0ef9564 100644 # define MOZ_REALLY_CRASH(line) __builtin_trap() diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index a6c4943..f7030de 100644 +index 2714dd3..4f2d3e2 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -11400,6 +11400,8 @@ +@@ -11403,6 +11403,8 @@ value: true #elif defined(XP_SOLARIS) value: true @@ -1873,7 +1884,7 @@ index a6c4943..f7030de 100644 #else value: false #endif -@@ -11444,6 +11446,8 @@ +@@ -11447,6 +11449,8 @@ value: true #elif defined(XP_SOLARIS) value: true @@ -1882,7 +1893,7 @@ index a6c4943..f7030de 100644 #else value: false #endif -@@ -11477,6 +11481,8 @@ +@@ -11480,6 +11484,8 @@ value: true #elif defined(XP_SOLARIS) value: true @@ -1891,7 +1902,7 @@ index a6c4943..f7030de 100644 #else value: false #endif -@@ -11496,6 +11502,8 @@ +@@ -11499,6 +11505,8 @@ value: true #elif defined(XP_SOLARIS) value: true @@ -1900,7 +1911,7 @@ index a6c4943..f7030de 100644 #else value: false #endif -@@ -11515,6 +11523,8 @@ +@@ -11518,6 +11526,8 @@ value: true #elif defined(XP_SOLARIS) value: true @@ -1909,7 +1920,7 @@ index a6c4943..f7030de 100644 #else value: false #endif -@@ -11534,6 +11544,8 @@ +@@ -11537,6 +11547,8 @@ value: true #elif defined(XP_SOLARIS) value: true @@ -1918,7 +1929,7 @@ index a6c4943..f7030de 100644 #else value: false #endif -@@ -11562,6 +11574,8 @@ +@@ -11565,6 +11577,8 @@ value: true #elif defined(XP_SOLARIS) value: true @@ -1927,7 +1938,7 @@ index a6c4943..f7030de 100644 #else value: false #endif -@@ -12525,6 +12539,8 @@ +@@ -12528,6 +12542,8 @@ type: bool #if defined(MOZ_WIDGET_ANDROID) value: true @@ -2391,10 +2402,10 @@ index ca05c3b..c9bf842 100644 unsigned char certFingerprint[SHA256_LENGTH]; srv = PK11_HashBuf(SEC_OID_SHA256, certFingerprint, cert->derCert.data, diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml -index 1e6a82e..96bb4a7 100644 +index d52bbe0..09433f7 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml -@@ -2761,6 +2761,12 @@ criteria = "safe-to-deploy" +@@ -2772,6 +2772,12 @@ criteria = "safe-to-deploy" delta = "6.0.1 -> 6.0.2" notes = "I'm the author of the changes in this version of the crate." @@ -2407,7 +2418,7 @@ index 1e6a82e..96bb4a7 100644 [[audits.goblin]] who = "Jan-Erik Rediger " criteria = "safe-to-deploy" -@@ -3568,6 +3574,12 @@ criteria = "safe-to-deploy" +@@ -3579,6 +3585,12 @@ criteria = "safe-to-deploy" version = "0.14.0" notes = "Victor and Myk developed this crate at Mozilla." @@ -2421,7 +2432,7 @@ index 1e6a82e..96bb4a7 100644 who = "Mike Hommey " criteria = "safe-to-deploy" diff --git a/supply-chain/config.toml b/supply-chain/config.toml -index 9e62ee8..6320ee1 100644 +index 3317308..780e22f 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -72,6 +72,10 @@ notes = "Used for testing." @@ -4931,7 +4942,7 @@ index 3e796cb..005a31d 100644 return elemString; diff --git a/toolkit/moz.configure b/toolkit/moz.configure -index 44b91b7..a2baa00 100644 +index 44b91b7..1f26185 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -295,6 +295,8 @@ def audio_backends_default(target): @@ -4972,6 +4983,15 @@ index 44b91b7..a2baa00 100644 imply_option( "--enable-jack", imply_jack, reason="--enable-audio-backends", when=use_pkg_config ) +@@ -1748,7 +1758,7 @@ with only_when("--enable-compile-environment"): + # being built as position independent. + "int main() { return 0; }\nint (*ptr)() = main;", + pack_rel_relocs +- + ["-pie", "-o", path] ++ + ["-fPIC", "-o", path] + + (extra_toolchain_flags or []) + + linker_ldflags, + wrapper=c_compiler.wrapper, @@ -3111,6 +3121,7 @@ def forkserver_default(target, build_project): (target.os == "GNU" and target.kernel == "Linux") or target.os == "FreeBSD" diff --git a/www-client/iceweasel/patches/iceweasel_launcher-143.0.patchset b/www-client/iceweasel/patches/iceweasel_launcher-143.0.3.patchset similarity index 100% rename from www-client/iceweasel/patches/iceweasel_launcher-143.0.patchset rename to www-client/iceweasel/patches/iceweasel_launcher-143.0.3.patchset