From: stephan <stephan@noemail.net>
Date: Fri, 11 Aug 2023 21:24:08 +0000 (+0000)
Subject: Merge trunk into jni branch.
X-Git-Tag: version-3.43.0~47^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6746456d955cb23168a118475c0a6a39672f69c;p=thirdparty%2Fsqlite.git

Merge trunk into jni branch.

FossilOrigin-Name: 4f0aeeba0287e846908180eab6f7080ebe1323ebe49340771864d110e1ca5b2b
---

a6746456d955cb23168a118475c0a6a39672f69c
diff --cc manifest
index 62a3a3927c,151f12d021..92f7518f85
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\smakefile\sdeps\sproblem\swhich\scaused\sext/jni\sbuild\sto\sfail\sif\ssqlite3.c/h\swere\snot\screated\sbeforehand.
- D 2023-08-11T20:32:40.205
 -C If\sSQLITE_USE_SEH\sis\sdefined,\shandle\sstructured-exceptions\sthrown\sby\sMSVC\sbuilds\sif\sthe\s*-shm\sfile\smapping\sis\saccessed\safter\sit\sbecomes\sinvalid\sfor\ssome\sreason.
 -D 2023-08-11T19:31:51.656
++C Merge\strunk\sinto\sjni\sbranch.
++D 2023-08-11T21:24:08.276
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2090,8 -2051,8 +2091,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 6c8538d83495ce65dbd7417263b3b06dbbb2a649e9a61a743911944599d75ffc
- R 00e08242dc8443215cfb70aa39f020b2
 -P 0d7aac45b8e7078cc80757e12d6f0b2584f2b0b184dacc2348ad3519978e5bf9 3ed89c344fcb3b7ee8b764d95144643e42e053e1116150d6eda8355fbd6669df
 -R 35781298e1f4461a1a53ad9bec2f5ba2
 -U dan
 -Z d4c9bf3d3544cd45d448f96b6769914e
++P 101de670774f63757180282763730aa53e70198bd7a674c27e6044632d39d22a 8a6b0c24937e855b710f97b4aea973eff53e6d43e1182842731547aa4b37db2a
++R f0a8c88fe7b9660119e5c4d560adb197
 +U stephan
- Z 4a14af7dfae41cdfaa811266b607e2bd
++Z b7f921f442de7d419e4b8b5ee576c27d
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index a98896847a,fc40b98c6e..0d1edcf329
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 101de670774f63757180282763730aa53e70198bd7a674c27e6044632d39d22a
 -8a6b0c24937e855b710f97b4aea973eff53e6d43e1182842731547aa4b37db2a
++4f0aeeba0287e846908180eab6f7080ebe1323ebe49340771864d110e1ca5b2b