sqlite3: Update to 3.49.2 (#24221)

* 0002-fix-building-sqldiff.patch: refresh
* 0005-fix-name-and-install-dir.patch: fixed upstream
This commit is contained in:
Christoph Reiter 2025-05-09 16:12:42 +02:00 committed by GitHub
parent d1179cd6b5
commit 21a2ece4ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 38 deletions

View File

@ -1,11 +1,11 @@
--- sqlite-src-3490100/main.mk.orig 2025-02-18 15:09:33.000000000 +0100
+++ sqlite-src-3490100/main.mk 2025-05-04 09:57:47.680155900 +0200
@@ -2044,7 +2044,7 @@
--- sqlite-src-3490200/main.mk.orig 2025-05-09 11:44:35.719952400 +0200
+++ sqlite-src-3490200/main.mk 2025-05-09 11:46:29.438013800 +0200
@@ -2081,7 +2081,7 @@
# How to build sqldiff$(T.exe) depends on $(LINK_TOOLS_DYNAMICALLY)
#
sqldiff.0.deps = $(TOP)/tool/sqldiff.c $(TOP)/ext/misc/sqlite3_stdio.h sqlite3.o sqlite3.h
-sqldiff.0.rules = $(T.link) -o $@ $(TOP)/tool/sqldiff.c sqlite3.o $(LDFLAGS.libsqlite3)
+sqldiff.0.rules = $(T.link) -o $@ $(TOP)/tool/sqldiff.c $(TOP)/ext/misc/sqlite3_stdio.c sqlite3.o $(LDFLAGS.libsqlite3)
sqldiff.1.deps = $(TOP)/tool/sqldiff.c $(TOP)/ext/misc/sqlite3_stdio.h $(libsqlite3.SO)
sqldiff.1.deps = $(TOP)/tool/sqldiff.c $(TOP)/ext/misc/sqlite3_stdio.h $(libsqlite3.DLL)
sqldiff.1.rules = $(T.link) -o $@ $(TOP)/tool/sqldiff.c -L. -lsqlite3 $(LDFLAGS.configure)
sqldiff$(T.exe): $(sqldiff.$(LINK_TOOLS_DYNAMICALLY).deps)

View File

@ -1,26 +0,0 @@
--- sqlite-src-3490100/main.mk.orig 2025-02-18 15:09:33.000000000 +0100
+++ sqlite-src-3490100/main.mk 2025-05-02 18:07:01.901993900 +0200
@@ -1053,7 +1053,7 @@
touch .target_source
libsqlite3.LIB = libsqlite3$(T.lib)
-libsqlite3.SO = libsqlite3$(T.dll)
+libsqlite3.SO = libsqlite3-0$(T.dll)
# Rules to build the LEMON compiler generator
#
@@ -1467,10 +1467,10 @@
# In either case, libsqlite3.la, if found, is deleted because it would
# contain stale state, refering to non-libtool-generated libraries.
#
-install-so-1: $(install-dir.lib) $(libsqlite3.SO)
- $(INSTALL) $(libsqlite3.SO) "$(install-dir.lib)"
- @if [ -f $(libsqlite3.SO).a ]; then \
- $(INSTALL) $(libsqlite3.SO).a "$(install-dir.lib)"; \
+install-so-1: $(install-dir.lib) $(install-dir.bin) $(libsqlite3.SO)
+ $(INSTALL) $(libsqlite3.SO) "$(install-dir.bin)"
+ @if [ -f libsqlite3.dll.a ]; then \
+ $(INSTALL) libsqlite3.dll.a "$(install-dir.lib)"; \
fi
@echo "Setting up $(libsqlite3.SO) version symlinks..."; \
if [ x.dll = x$(T.dll) ]; then \

View File

@ -7,9 +7,9 @@ pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
$([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-sqlite-docs"))
_sqlite_year=2025
_amalgamationver=3490100
_amalgamationver=3490200
_docver=${_amalgamationver}
pkgver=3.49.1
pkgver=3.49.2
pkgrel=1
pkgdesc="A C library that implements an SQL database engine (mingw-w64)"
arch=('any')
@ -33,17 +33,15 @@ source=(https://www.sqlite.org/${_sqlite_year}/sqlite-src-${_amalgamationver}.zi
0002-fix-building-sqldiff.patch
0003-do-not-install-tclsqlite3-with-make.patch
0004-dont-misuse-tcl-extern.patch
0005-fix-name-and-install-dir.patch
Makefile.ext.in
README.md.in
LICENSE)
sha256sums=('4404d93cbce818b1b98ca7259d0ba9b45db76f2fdd9373e56f2d29b519f4d43b'
'4581e3340d9d0d8ce03f10fb8ab1cea03cf49fed8198478c1abf5d383521f037'
sha256sums=('c3101978244669a43bc09f44fa21e47a4e25cdf440f1829e9eff176b9a477862'
'8568b11c76856de357a71fdcc02cfdfb210b4ec62f98bfb7af55211ed6540b83'
'6518119034ceb2820d058afcb099d11f636271f55a41ffae22855af66a369166'
'2b25eb4c46fa2ad804c704fd2c2252a0b25a8268ef413c509fa429d3fe944661'
'cf5c47c30e97f5493d2fad730a9bfcd33d20a0a052571e8e35b88f388d368724'
'a500428a3434075932de84247b1405f3d73e7ed0a8b664eb20a736bd02d6ed29'
'8dd2377afaad17fa85049be90bfc2bd757350343b3f64ff9bfbbcf3736593a34'
'5a16326220dafbab7ff9d1fbc12ba83a08a6cf9e893648fa584d0be7fcf99ccc'
'84b64569978dde5b63799099b0fbb3336943ef877170beb84483020c67e25b3c'
'5ca42f1f92abfb61bacc9ff60f5836cc56e2ce2af52264f918cb06c3d566d562'
'0b76663a90e034f3d7f2af5bfada4cedec5ebc275361899eccc5c18e6f01ff1f')
@ -56,7 +54,6 @@ prepare() {
patch -p1 -i "${srcdir}/0001-sqlite-pcachetrace-include-sqlite3.patch"
patch -p1 -i "${srcdir}/0002-fix-building-sqldiff.patch"
patch -p1 -i "${srcdir}/0004-dont-misuse-tcl-extern.patch"
patch -p1 -i "${srcdir}/0005-fix-name-and-install-dir.patch"
}
build() {