From: stephan Date: Sat, 11 Oct 2025 20:06:54 +0000 (+0000) Subject: Merge trunk into the cygwin-fixes branch. With tcl9 this passes all but one test... X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fcygwin-fixes;p=thirdparty%2Fsqlite.git Merge trunk into the cygwin-fixes branch. With tcl9 this passes all but one test, which fails with: error copying ...: No error FossilOrigin-Name: aeb983a65051c2233e88511f69d1456945a15e94d3e38a12837f782f7cc1e525 --- 637e1c7cc8d8b26fbef2159d38f710ef48eabb52 diff --cc autoconf/Makefile.msc index fca58285cf,fca58285cf..4f96e3b189 --- a/autoconf/Makefile.msc +++ b/autoconf/Makefile.msc @@@ -327,6 -327,6 +327,7 @@@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1 ++OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_CARRAY=1 !ENDIF OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1 !ENDIF @@@ -349,6 -349,6 +350,7 @@@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS # Always enable math functions on Windows OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MATH_FUNCTIONS ++OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PERCENTILE # Should the rbu extension be enabled? If so, add compilation options # to enable it. diff --cc manifest index 1ebb505246,7e8969aa38..c832952af9 --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Merge\strunk\sand\san\soff-list\spatch\sfrom\sJan\sN.\sinto\sthe\scygwin-fixes\sbranch. - D 2025-10-10T16:59:25.820 -C Improvements\sto\sthe\s(rarely\sused)\shome-grown\svarients\sof\sseriesCeil()\nand\sseriesFloor()\sbased\son\sideas\sfrom\n[forum:/forumpost/2025-10-11T12:36:56z|forum\spost\s2025-10-11T12:36:56z]. -D 2025-10-11T15:45:47.813 ++C Merge\strunk\sinto\sthe\scygwin-fixes\sbranch.\sWith\stcl9\sthis\spasses\sall\sbut\sone\stest,\swhich\sfails\swith:\serror\scopying\s...:\sNo\serror ++D 2025-10-11T20:06:54.784 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@@ -18,7 -18,7 +18,7 @@@ F art/sqlite370.svg 40b7e2fe8aac3add5d5 F auto.def 44a0d1bf09d78355fc88251ccbf8e64e6341fd89c11de68a01c3645e53a2bade F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac F autoconf/Makefile.in 306f500fce8cae9e1af9459f1ac7fe89ce46999594ef3fdc62dc9d7d651fb091 --F autoconf/Makefile.msc 05b345da3a512c6c387d0e78d812deb0a42748962c115a6eac781c160a95d7cc ++F autoconf/Makefile.msc 803aa9e23b6a764751f6a91d0673620eefa46729fb80faf51391120e1d752966 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136 F autoconf/README.txt b749816b8452b3af994dc6d607394bef3df1736d7e09359f1087de8439a52807 F autoconf/auto.def 3d994f3a9cc9b712dbce92a5708570ddcf3b988141b6eb738f2ed16127a9f0ac @@@ -2169,8 -2169,8 +2169,8 @@@ F tool/version-info.c 33d0390ef484b3b1c F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f - P 5ca248f96d26778c863ffc65e3263084b10a70494548f640c81de2057cd09f1f ea29180797aa4bb25180432e75a372277a6f6e2262906a9e765a3bddf8ca79d7 - R 475d8dccf0a393275dd581eee60c1ca2 -P 97d6fd2c99578adb6a1e9b879ba5ae5ad798a8ef8f0646bf0102747d52148bff -R 5a1f1568144db6c07cdc521048596f2c -U drh -Z d9315927b0ee8637a85e19835f7205c7 ++P 38807d8bce50114fcaaa656bba0437fd3c3164c7051e9938a39c2791c8f4725b e6b9bfdb6f8f86d4d2891d65fee4274dcbc61c9e998d81f90232153c05788cab ++R a2360b58313ffdb82688d1798b44ecee +U stephan - Z 119f796f65476eefad0b2c385c690ee2 ++Z eb375049ccc04e2e9e9409c5a07225cf # Remove this line to create a well-formed Fossil manifest. diff --cc manifest.uuid index b82e95be5d,c54c86da21..4c27c761a5 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 38807d8bce50114fcaaa656bba0437fd3c3164c7051e9938a39c2791c8f4725b -e6b9bfdb6f8f86d4d2891d65fee4274dcbc61c9e998d81f90232153c05788cab ++aeb983a65051c2233e88511f69d1456945a15e94d3e38a12837f782f7cc1e525