fossil: Update to 2.10

mingw-w64-fossil/PKGBUILD

@@ -6,7 +6,7 @@
 _realname=fossil
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.9
+pkgver=2.10
 pkgrel=1
 pkgdesc='Simple, high-reliability, distributed software configuration management (mingw-w64)'
 arch=('any')
@@ -22,8 +22,8 @@ source=("https://www.fossil-scm.org/index.html/uv/${_realname}-src-${pkgver}.tar
         "win.patch"
         "readline.patch"
         "win-tcl-unix-path.patch")
-sha256sums=('1cb2ada92d43e3e7e008fe77f5e743d301c7ea34d4c36c42f255f873e73d8b4f'
-            '3480192ef445b1bafa71072e2e3ebf1e8a5e5a313800c7cf98dfa673aaf2e70d'
+sha256sums=('d8a3776d2ce77385ed5ff20a2776d13bb534fb2508e87351e14e94f91cd12b10'
+            '8d2053a4d4e6577ceb9d7c1882b8bc0b345337571edaab5bc93decc5af345ddd'
             '887c8b16de984156cb13bfdbc5715b1eff0123af0d07e6dc08265dbef0a1d519'
             '96090936b1aee3539211c400a4c8a7a9475c71f47238967a1924229798a2910b')
 
@@ -45,6 +45,7 @@ build() {
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
+    --with-zlib=${MINGW_PREFIX} \
     --debug \
     --disable-internal-sqlite
 

mingw-w64-fossil/win.patch

@@ -57,7 +57,7 @@ diff -aur fossil-src-1.33.orig/Makefile.in fossil-src-1.33/Makefile.in
      "# Enter a commit message for this check-in."
 --- fossil-src-1.33.orig/src/db.c	2015-05-23 13:11:31.000000000 +0200
 +++ fossil-src-1.33/src/db.c	2015-05-23 13:55:02.561878900 +0200
-@@ -1372,44 +1372,31 @@
+@@ -1372,47 +1372,31 @@
      db_close_config();
    }
    zHome = fossil_getenv("FOSSIL_HOME");
@@ -67,9 +67,12 @@ diff -aur fossil-src-1.33.orig/Makefile.in fossil-src-1.33/Makefile.in
 -    if( zHome==0 ){
 -      zHome = fossil_getenv("APPDATA");
 -      if( zHome==0 ){
--        char *zDrive = fossil_getenv("HOMEDRIVE");
--        char *zPath = fossil_getenv("HOMEPATH");
--        if( zDrive && zPath ) zHome = mprintf("%s%s", zDrive, zPath);
+-        zHome = fossil_getenv("USERPROFILE");
+-        if( zHome==0 ){
+-          char *zDrive = fossil_getenv("HOMEDRIVE");
+-          char *zPath = fossil_getenv("HOMEPATH");
+-          if( zDrive && zPath ) zHome = mprintf("%s%s", zDrive, zPath);
+-        }
 -      }
 -    }
 +    zHome = fossil_getenv("HOME");
@@ -77,9 +80,9 @@ diff -aur fossil-src-1.33.orig/Makefile.in fossil-src-1.33/Makefile.in
    if( zHome==0 ){
      if( isOptional ) return 0;
      fossil_panic("cannot locate home directory - please set the "
--                 "FOSSIL_HOME, LOCALAPPDATA, APPDATA, or HOMEPATH "
+-                 "FOSSIL_HOME, LOCALAPPDATA, APPDATA, USERPROFILE, "
 +                 "FOSSIL_HOME, USERPROFILE or HOME "
-                  "environment variables");
+                  "or HOMEDRIVE / HOMEPATH environment variables");
    }
 -#else
 +

mingw-w64-sqlite3/PKGBUILD

@@ -5,10 +5,10 @@
 _realname=sqlite3
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-_amalgamationver=3290000
+_amalgamationver=3300000
 _docver=${_amalgamationver}
-pkgver=3.29.0
-pkgrel=2
+pkgver=3.30.0
+pkgrel=1
 pkgdesc="A C library that implements an SQL database engine (mingw-w64)"
 arch=('any')
 license=(PublicDomain)
@@ -26,8 +26,8 @@ source=(https://www.sqlite.org/2019/sqlite-src-${_amalgamationver}.zip
         https://www.sqlite.org/2019/sqlite-doc-${_docver}.zip
         LICENSE
         lemon.patch)
-sha256sums=('a1533d97504e969ca766da8ff393e71edd70798564813fc2620b0708944c8817'
-            '4fb9cc6d1f29560300692029089ca1d2feb7c397df6f6eb4c2998856d3bc2929'
+sha256sums=('cd9d9e0b7dd0c7359eea714b9e67e47ea17a7ac91574f572bd281807f0419134'
+            'cb4deed80e94c7c0d7ee4a5c76d9d91e4deec48e8b158b473b27253fbfc891d6'
             '0b76663a90e034f3d7f2af5bfada4cedec5ebc275361899eccc5c18e6f01ff1f'
             '8f6e8e4fdcaea30801675deb296bdd1ba00eeccfeea71bca7f5325728b521a19')
 options=('!strip' 'staticlibs' '!buildflags')
@@ -42,7 +42,37 @@ build() {
   mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
 
   export lt_cv_deplibs_check_method='pass_all'
-  CFLAGS+=" -fexceptions -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_USE_MALLOC_H=1 -DSQLITE_USE_MSIZE=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_RTREE=1 -fno-strict-aliasing"
+  SQLITE_OPTIONS=" -DNDEBUG=1 \
+            -DSQLITE_DQS=0 \
+            -DSQLITE_THREADSAFE=0 \
+            -DSQLITE_DEFAULT_MEMSTATUS=0 \
+            -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 \
+            -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
+            -DSQLITE_OMIT_DEPRECATED \
+            -DSQLITE_OMIT_GET_TABLE \
+            -DSQLITE_OMIT_PROGRESS_CALLBACK \
+            -DSQLITE_OMIT_SHARED_CACHE \
+            -DSQLITE_OMIT_LOAD_EXTENSION \
+            -DSQLITE_MAX_EXPR_DEPTH=0 \
+            -DSQLITE_USE_ALLOCA \
+            -DSQLITE_ENABLE_LOCKING_STYLE=0 \
+            -DSQLITE_DEFAULT_FILE_FORMAT=4 \
+            -DSQLITE_ENABLE_COLUMN_METADATA=1 \
+            -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
+            -DSQLITE_ENABLE_FTS4 \
+            -DSQLITE_ENABLE_DBSTAT_VTAB \
+            -DSQLITE_ENABLE_JSON1 \
+            -DSQLITE_ENABLE_FTS5 \
+            -DSQLITE_ENABLE_RTREE=1 \
+            -DSQLITE_ENABLE_STMTVTAB \
+            -DSQLITE_HAVE_ZLIB \
+            -DSQLITE_INTROSPECTION_PRAGMAS \
+            -DSQLITE_ENABLE_DBPAGE_VTAB \
+            -DSQLITE_DISABLE_DIRSYNC=1 \
+            -DSQLITE_WIN32_NO_ANSI \
+            -DSQLITE_USE_MALLOC_H \
+            -DSQLITE_USE_MSIZE"
+  CFLAGS+=" -fexceptions -fno-strict-aliasing ${SQLITE_OPTIONS}"
 
   ../sqlite-src-${_amalgamationver}/configure \
     --prefix=${MINGW_PREFIX} \