GNOME Bugzilla – Bug 784598
Build mozjs with consistent set of patches (jhbuild, continuous, flatpak)
Last modified: 2020-11-11 18:31:14 UTC
I'd like to collect all the patches that I use for the various mozjs versions in one git repository, so that I only have to update them once instead of separately on JHbuild, Continuous, and the org.gnome.Platform Flatpak manifest. This can also serve as a guide to downstream GNOME distributors as to what patches to include on their distro's version of mozjs, and as a guide to SpiderMonkey upstream as to what patches are needed for backporting to their ESR versions.
Created attachment 355000 [details] [review] Patch for JHbuild (3.24 and 3.26 modulesets) This makes it easier to make sure that we are using the same patches everywhere in GNOME: in JHbuild, in Continuous, and in the Flatpak runtime.
Created attachment 355001 [details] [review] Patch for Flatpak manifest (should be applied both to master and gnome-3-24) This makes it easier to make sure that we are using the same patches everywhere in GNOME: in JHbuild, in Continuous, and in the Flatpak runtime.
Created attachment 355003 [details] [review] Patch for Continuous This makes it easier to make sure that we are using the same patches everywhere in GNOME: in JHbuild, in Continuous, and in the Flatpak runtime.
@jjardon, cc'ing you for the release team - who should I talk to about this?
Any feedback on these patches? I am going to go ahead and commit mozjs52 to Continuous this weekend so that I can merge my mozjs52 branch and release GJS for the unstable .4 release without Continuous breaking. I'll be following the style of the mozjs38 Continuous patch attached here.
Review of attachment 355003 [details] [review]: Oops, missed a few things that I noticed when adding mozjs52. ::: manifest.json @@ +909,3 @@ "--enable-installed-tests"]}, + {"src": "git:https://github.com/ptomato/mozjs38.git", Should be mozjs.git @@ -913,3 @@ "component": "minimal", - "checksum": "01994c758174bc173bcf4960f05ecb4da21014f09641a63b2952bbf9eeaa8b5c", - "patches": ["mozjs38-buildapi.patch", We actually still need the buildapi patch, since I don't think this manifest supports "source-subdir" like jhbuild does
Build is broken on Continuous: ERROR: Could not find autoconf 2.13 ob: pid 2 exited with code 1 Log: http://build.gnome.org/continuous/buildmaster/builds/2017/07/16/10/build/log-mozjs52.txt
Created attachment 355793 [details] [review] Patch for JHbuild (3.24 and 3.26 modulesets) This makes it easier to make sure that we are using the same patches everywhere in GNOME: in JHbuild, in Continuous, and in the Flatpak runtime.
Review of attachment 355003 [details] [review]: This isn't needed anymore, since I added mozjs52 to Continuous today and will remove mozjs38 after the GJS release.
Removed the blockage on 784196, since mozjs52 is now added to Continuous and JHbuild.
Created attachment 355800 [details] [review] core-deps-3.24,26: Build mozjs38 from github repo This makes it easier to make sure that we are using the same patches everywhere in GNOME: in JHbuild, in Continuous, and in the Flatpak runtime.
I assume this particular bug is no longer relevant, so closing.