diff --git a/network/web/firefox/actions.py b/network/web/firefox/actions.py index 3728d19300..0c65240c8e 100644 --- a/network/web/firefox/actions.py +++ b/network/web/firefox/actions.py @@ -18,7 +18,10 @@ xpidir = "%s/xpi" % get.workDIR() arch = get.ARCH() ver = ".".join(get.srcVERSION().split(".")[:3]) -jobs = jobs = "-j"+ subprocess.check_output("nproc 2>/dev/null", shell=True).rstrip("\n") + +# jobs = jobs = "-j"+ subprocess.check_output("nproc 2>/dev/null", shell=True).rstrip("\n") +jobs_number = subprocess.check_output("nproc 2>/dev/null", shell=True).rstrip("\n") + shelltools.export("SHELL", "/bin/sh") shelltools.export("PYTHON", "/usr/bin/python3") @@ -29,7 +32,7 @@ shelltools.export("MOZBUILD_STATE_PATH", "mozbuild") shelltools.system("export MOZ_NOSPAM=1") def setup(): - + shelltools.system("echo 'Instrumenting Firefox for PGO'") shelltools.system("cp mozconfig-inst .mozconfig") @@ -37,7 +40,7 @@ def setup(): shelltools.echo("google_api_key", "AIzaSyBINKL31ZYd8W5byPuwTXYK6cEyoceGh6Y") pisitools.dosed(".mozconfig", "%%PWD%%", get.curDIR()) pisitools.dosed(".mozconfig", "%%FILE%%", "google_api_key") - pisitools.dosed(".mozconfig", "##JOBCOUNT##", jobs) + pisitools.dosed(".mozconfig", "##JOBS##", jobs_number) # LOCALE shelltools.system("rm -rf langpack-ff/*/browser/defaults") @@ -79,7 +82,7 @@ def build(): #shelltools.echo("google_api_key", "AIzaSyBINKL31ZYd8W5byPuwTXYK6cEyoceGh6Y") pisitools.dosed(".mozconfig", "%%PWD%%", get.curDIR()) pisitools.dosed(".mozconfig", "%%FILE%%", "google_api_key") - pisitools.dosed(".mozconfig", "##JOBCOUNT##", jobs) + pisitools.dosed(".mozconfig", "##JOBS##", jobs_number) #shelltools.system("../configure --prefix=/usr --libdir=/usr/lib --disable-strip --disable-install-strip") shelltools.system("./mach build") diff --git a/network/web/firefox/files/mozconfig-inst b/network/web/firefox/files/mozconfig-inst index 391755b5e4..ff50b82dcd 100644 --- a/network/web/firefox/files/mozconfig-inst +++ b/network/web/firefox/files/mozconfig-inst @@ -1,5 +1,5 @@ . $topsrcdir/browser/config/mozconfig -mk_add_options MOZ_MAKE_FLAGS="##JOBCOUNT##" +mk_add_options MOZ_PARALLEL_BUILD=##JOBS## ac_add_options --prefix=/usr ac_add_options --enable-release diff --git a/network/web/firefox/files/mozconfig-opt b/network/web/firefox/files/mozconfig-opt index aa86751007..5c8cd7ced4 100644 --- a/network/web/firefox/files/mozconfig-opt +++ b/network/web/firefox/files/mozconfig-opt @@ -1,5 +1,5 @@ . $topsrcdir/browser/config/mozconfig -mk_add_options MOZ_MAKE_FLAGS="##JOBCOUNT##" +mk_add_options MOZ_PARALLEL_BUILD=##JOBS## ac_add_options --prefix=/usr ac_add_options --enable-release diff --git a/network/web/firefox/files/pisilinux/distribution.ini b/network/web/firefox/files/pisilinux/distribution.ini index e01e91414c..dcc9c12ca0 100644 --- a/network/web/firefox/files/pisilinux/distribution.ini +++ b/network/web/firefox/files/pisilinux/distribution.ini @@ -1,6 +1,6 @@ [Global] id=PisiLinux -version=2.4 +version=2.4.1 about=Mozilla Firefox for PisiLinux [Preferences] diff --git a/network/web/firefox/pspec.xml b/network/web/firefox/pspec.xml index 32f554792d..7029b453aa 100644 --- a/network/web/firefox/pspec.xml +++ b/network/web/firefox/pspec.xml @@ -15,7 +15,7 @@ app:gui Firefox Web Browser It is more secure and faster to browse the web with Firefox web browser. You can personalize your web browser with many specifications that is not enough to explain in two sentences. - https://ftp.mozilla.org/pub/firefox/releases/138.0.4/source/firefox-138.0.4.source.tar.xz + https://ftp.mozilla.org/pub/firefox/releases/139.0/source/firefox-139.0.source.tar.xz @@ -567,6 +567,13 @@ + + 2025-05-26 + 139.0 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2025-05-18 138.0.4