From: stephan <stephan@noemail.net>
Date: Mon, 10 Mar 2025 17:35:00 +0000 (+0000)
Subject: Merge trunk into the cygwin-fixes branch.
X-Git-Tag: major-release~149^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0fa42053fe1603de66d23a5a17d0147450d162d;p=thirdparty%2Fsqlite.git

Merge trunk into the cygwin-fixes branch.

FossilOrigin-Name: f3d14433f24f89558e72a9085c950bc72440e9933d6b4ff59d6e603d25e39422
---

e0fa42053fe1603de66d23a5a17d0147450d162d
diff --cc manifest
index c7c40d4626,b3d524e4c0..119efea57a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Patch\san\sunnecessary\ssize_t-to-int\sconversion\swhich\swarns\son\ssome\scompilers.
- D 2025-03-10T15:35:43.346
 -C Add\san\sexplicit\sdb\sclose\sto\stest/walsetlk.test\sto\swork\saround\san\sunjustified\stest\sfailure\son\sWindows\swhen\sthe\swalsetlk\stests\sare\srun\sin\sthe\ssame\sinvocation\sof\stestfixture.exe\sin\sWindows.
 -D 2025-03-10T17:28:43.120
++C Merge\strunk\sinto\sthe\scygwin-fixes\sbranch.
++D 2025-03-10T17:35:00.466
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -2213,8 -2213,8 +2213,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P a591c018558af70e0ddfdd2d4d61905f030bac01df19ac9b204aed09d44517be
- R 6bed3060a5a54ab64492dc249411b575
 -P d7013b63932b2f5750572ae6bdd259a2b6e6548c20fb9a5559edd22d2f2fc6cb
 -R cb2e10fc56d1e1fbf885d5500a62f25a
++P 8681dfdb59d3258663ec176daafd7a52446a207db21fbd1a4d151508092dcbc5 f418de109335cd7cb29d2b587540c163bbaaa7129c662c2908ef67492139b2d7
++R bee86888a7151d2e80a9568beca57317
  U stephan
- Z 690380eef0b46b079ce996dc120adcaf
 -Z c867479e9a5d0c3a65bf2562516a55c9
++Z f13475192cf48b8c4466aedb50a415e2
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 1b1d18ef72,843ccdc623..df41f537a0
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8681dfdb59d3258663ec176daafd7a52446a207db21fbd1a4d151508092dcbc5
 -f418de109335cd7cb29d2b587540c163bbaaa7129c662c2908ef67492139b2d7
++f3d14433f24f89558e72a9085c950bc72440e9933d6b4ff59d6e603d25e39422