On 2016/06/01 07:44, Landry Breuil wrote: > On Tue, May 31, 2016 at 11:36:35PM +0100, Stuart Henderson wrote: > > Thanks for the pointer Ingo.. > > > > I'll be doing tests (including a bulk ports build) with this, > > but here's an update to sqlite 3.10.2 (the version which is > > in Firefox 46) in the hope it will let us get rid of the > > conflicting sqlite3 versions in firefox. > > Back to square one, when i need to pester someone to update sqlite3 in > base each time mozilla updates its copy/dependencies ? :)
Or do it yourself :) The current thing with conflicting versions is definitely wrong, so if you have another way to fix it, that would be fine too. > Firefox trunk/49 ships 3.13... see > http://hg.mozilla.org/mozilla-central/log/tip/db/sqlite3/src/sqlite3.h > for the history of updates. What's the timeframe for that? > > If anyone has anything in particular they'd like to test, > > could you try it please. > > To test it with firefox, you should just need to comment out > MOZILLA_USE_BUNDLED_SQLITE = Yes in www/mozilla-firefox/Makefile. > > > A shlib_version update is included, four symbols were removed so > > it's a major bump. > > > > I modified addopcodes.awk by hand based on the changes in the > > upstream version which has now switched to a Tcl script. > > > > (I don't really understand how things are working in Firefox on > > other OS, there are two different versions of sqlite in their > > tree...even in the one firefox tarball).. > > Nss is considered a third-party library in firefox, and thus has to be > self-contained. We dont build the copy of sqlite bundled in nss bundled > in firefox since we build against systemwide nss... I tried building nss with the included one but that still pulled in the base one..