From: stephan <stephan@noemail.net>
Date: Mon, 21 Nov 2022 16:03:19 +0000 (+0000)
Subject: Merge trunk into wasi-patches branch to clean up the diff view.
X-Git-Tag: version-3.41.0~35^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6eb11f0a95d375059e43330a4fff2c4416860782;p=thirdparty%2Fsqlite.git

Merge trunk into wasi-patches branch to clean up the diff view.

FossilOrigin-Name: 95de6742d3d96d2b21eec57195dc7a2236d3f61640633ae1baa36bf142a3485b
---

6eb11f0a95d375059e43330a4fff2c4416860782
diff --cc manifest
index 113a79c680,ab782561db..7215710ede
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\scheck\sfor\sWASM_WASI\smacro\swhen\sdetecting\swasi\scompilation\smode,\sas\sthat\smacro\sis\sproject-specific.\sRely\sonly\son\s__wasi__\s(exposed\sby\sclang)\sto\sdetect\swasi\scompilation\smode.
- D 2022-11-20T15:30:42.968
 -C OPFS\scontention\stest:\sgive\seach\sworker\sa\sdistinct\srecognizable\sname\sinstead\sof\sa\srandom\sone.
 -D 2022-11-21T16:00:26.047
++C Merge\strunk\sinto\swasi-patches\sbranch\sto\sclean\sup\sthe\sdiff\sview.
++D 2022-11-21T16:03:19.238
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -549,12 -549,14 +549,14 @@@ F ext/wasm/sql/000-mandelbrot.sql 77533
  F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
  F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555e685bce3da8c3f
  F ext/wasm/test-opfs-vfs.js 44363db07b2a20e73b0eb1808de4400ca71b703af718d0fa6d962f15e73bf2ac
- F ext/wasm/tester1-esm.html 8d226a21b20707dbd66d68a3990141f0392fc781a281291d3dc59f38a3555887
- F ext/wasm/tester1-worker.html 51bf39e2b87f974ae3d5bc3086e2fb36d258f3698c54f6e21ba4b3b99636fa27
- F ext/wasm/tester1.html 624ec41cd9f78a1f2b6d7df70aaa7a6394396b1f2455ecbd6de5775c1275b121
- F ext/wasm/tester1.js bff806de454de115922d78c056f11d523ec7ed9ed3839d4e21433a9f72558b88
+ F ext/wasm/tester1-worker.html 5ef353348c37cf2e4fd0b23da562d3275523e036260b510734e9a3239ba8c987
 -F ext/wasm/tester1.c-pp.html 74aa9b31c75f12490653f814b53c3dd39f40cd3f70d6a53a716f4e8587107399
 -F ext/wasm/tester1.c-pp.js 0c129495d057c77788b59715152d51f9bf9002ebbcce759ef8b028272ce3519d
++F ext/wasm/tester1.c-pp.html 74aa9b31c75f12490653f814b53c3dd39f40cd3f70d6a53a716f4e8587107399 w ext/wasm/tester1.html
++F ext/wasm/tester1.c-pp.js 0c129495d057c77788b59715152d51f9bf9002ebbcce759ef8b028272ce3519d w ext/wasm/tester1.js
+ F ext/wasm/tests/opfs/concurrency/index.html bb9b0f6da86df34c67fa506db9c45b7c4cf0045a211611cc6b8d2b53fa983481
+ F ext/wasm/tests/opfs/concurrency/test.js 5993c08657d547d3a26b78ff3480122aed2b7361823bc127e96e558931093aff
+ F ext/wasm/tests/opfs/concurrency/worker.js df065bb386ff994951f7fbdd76e12f16e58fbef0e929b2caf74553359da40afc
  F ext/wasm/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
- F ext/wasm/wasmfs.make 8aa7565f9de8dd3c291ad8c3ceb1a2c67a3eb31a8e531070b25c6c6b1f0278bf
+ F ext/wasm/wasmfs.make 8fea9b4f3cde06141de1fc4c586ab405bd32c3f401554f4ebb18c797401a678d
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
@@@ -2057,8 -2059,8 +2059,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 9b8b15a779158ec7c39d936f6bfa6a35e12063a36933341ade051809993a5678
- R eab0332091536d080c020fa14b102cbe
 -P bee94d1bb0daade023cc1e274339daafc249e1978c0765fc45042b5f9060e478
 -R 24e9b381879a473eda77c6d52873b2a6
++P d469ac0c448eced26a697751ce9be316e8bc3cd029fda2b50966523c7850854f 5f564bf7de7ce3ad7bedb5f06b3086ceaec55da768a60d74059fa4fba4328567
++R c6e7dc02521e7ecf758d690fc58cd968
  U stephan
- Z 0c7f0b6e6cee222ce3be0bf4f50c95f1
 -Z 5200ed97b9b65f90e5d50e34624e223d
++Z ef5aed11fc17ce6d5e08251a18764500
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 79a5820846,2dbda6c4cc..133176599b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d469ac0c448eced26a697751ce9be316e8bc3cd029fda2b50966523c7850854f
 -5f564bf7de7ce3ad7bedb5f06b3086ceaec55da768a60d74059fa4fba4328567
++95de6742d3d96d2b21eec57195dc7a2236d3f61640633ae1baa36bf142a3485b