summaryrefslogtreecommitdiff
path: root/dev-db/sqlite/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/sqlite/files')
-rw-r--r--dev-db/sqlite/files/sqlite-3.47.0-allocator-mismatch.patch37
-rw-r--r--dev-db/sqlite/files/sqlite-3.47.0-buildtclext.patch122
-rw-r--r--dev-db/sqlite/files/sqlite-3.47.0-nonbash.patch53
3 files changed, 0 insertions, 212 deletions
diff --git a/dev-db/sqlite/files/sqlite-3.47.0-allocator-mismatch.patch b/dev-db/sqlite/files/sqlite-3.47.0-allocator-mismatch.patch
deleted file mode 100644
index 35ea63a28e6a..000000000000
--- a/dev-db/sqlite/files/sqlite-3.47.0-allocator-mismatch.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/sqlite/sqlite/commit/76b77c63f730aa163d82d082c0e1bf648cc4c567
-
-From 76b77c63f730aa163d82d082c0e1bf648cc4c567 Mon Sep 17 00:00:00 2001
-From: stephan <stephan@noemail.net>
-Date: Mon, 4 Nov 2024 13:59:58 +0000
-Subject: [PATCH] Fix two mismatched uses of malloc() and sqlite3_free() in
- sqlite3_stdio.c, as reported in [forum:7dd7c70038 | forum post 7dd7c70038].
-
-FossilOrigin-Name: 5238959d05bbf3c12f488a55e52f3e9733138993d0365255184dffeb2bf36c03
----
- ext/misc/sqlite3_stdio.c | 4 ++--
- manifest | 13 +++++++------
- manifest.uuid | 2 +-
- 3 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/ext/misc/sqlite3_stdio.c b/ext/misc/sqlite3_stdio.c
-index 5bb26084c2..ba37e4be30 100644
---- a/ext/misc/sqlite3_stdio.c
-+++ b/ext/misc/sqlite3_stdio.c
-@@ -146,7 +146,7 @@ char *sqlite3_fgets(char *buf, int sz, FILE *in){
- ** that into UTF-8. Otherwise, non-ASCII characters all get translated
- ** into '?'.
- */
-- wchar_t *b1 = malloc( sz*sizeof(wchar_t) );
-+ wchar_t *b1 = sqlite3_malloc( sz*sizeof(wchar_t) );
- if( b1==0 ) return 0;
- _setmode(_fileno(in), IsConsole(in) ? _O_WTEXT : _O_U8TEXT);
- if( fgetws(b1, sz/4, in)==0 ){
-@@ -212,7 +212,7 @@ int sqlite3_fputs(const char *z, FILE *out){
- ** use O_U8TEXT for everything in text mode.
- */
- int sz = (int)strlen(z);
-- wchar_t *b1 = malloc( (sz+1)*sizeof(wchar_t) );
-+ wchar_t *b1 = sqlite3_malloc( (sz+1)*sizeof(wchar_t) );
- if( b1==0 ) return 0;
- sz = MultiByteToWideChar(CP_UTF8, 0, z, sz, b1, sz);
- b1[sz] = 0;
diff --git a/dev-db/sqlite/files/sqlite-3.47.0-buildtclext.patch b/dev-db/sqlite/files/sqlite-3.47.0-buildtclext.patch
deleted file mode 100644
index 491674f5e993..000000000000
--- a/dev-db/sqlite/files/sqlite-3.47.0-buildtclext.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-# https://sqlite.org/forum/forumpost/0683a49cb02f31a1
-# https://bugs.gentoo.org/942918
-# Compiled from https://sqlite.org/forum/forumpost/6fd4ca69e86eafc6, https://www.sqlite.org/src/info/38136b33f9536b63 and https://www.sqlite.org/src/info/2f6e5946cf34e094
-
---- a/tool/buildtclext.tcl
-+++ b/tool/buildtclext.tcl
-@@ -140,12 +140,13 @@
- if {[string length $OPTS]>1} {
- append LDFLAGS $OPTS
- }
-- set CMD [subst $cmd]
- if {$TCLMAJOR>8} {
- set OUT libtcl9sqlite$VERSION.$SUFFIX
- } else {
- set OUT libsqlite$VERSION.$SUFFIX
- }
-+ set @ $OUT; # workaround for https://sqlite.org/forum/forumpost/6b1af7eb10884373
-+ set CMD [subst $cmd]
- }
-
- # Show information about prior installs
-
-From b03592c324a4d066e12c3af945dd510dc28b6d65 Mon Sep 17 00:00:00 2001
-From: stephan <stephan@noemail.net>
-Date: Sat, 16 Nov 2024 14:33:01 +0000
-Subject: [PATCH] Add DESTDIR support to the tclextension-install target, via
- [67a3ca0c013b] and [d1663cf05f7d].
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1600,7 +1600,7 @@ tclextension: tclsqlite3.c
- # to find it.
- #
- tclextension-install: tclsqlite3.c
-- $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --cc "$(CC)" $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS)
-+ $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --destdir "$(DESTDIR)" --cc "$(CC)" $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS)
-
- # Install the SQLite TCL extension that is used by $TCLSH_CMD
- #
-+38136b33f9536b63520d3810f397a3b4b5372028b31108806f84fe44bf338425
---- a/tool/buildtclext.tcl
-+++ b/tool/buildtclext.tcl
-@@ -15,6 +15,7 @@ Options:
- --info Show info on existing SQLite TCL extension installs
- --install-only Install an extension previously build
- --uninstall Uninstall the extension
-+ --destdir DIR Installation root (used by "make install DESTDIR=...")
-
- Other options are retained and passed through into the compiler.}
-
-@@ -25,6 +26,7 @@ set uninstall 0
- set infoonly 0
- set CC {}
- set OPTS {}
-+set DESTDIR ""; # --destdir "$(DESTDIR)"
- for {set ii 0} {$ii<[llength $argv]} {incr ii} {
- set a0 [lindex $argv $ii]
- if {$a0=="--install-only"} {
-@@ -42,6 +44,9 @@ for {set ii 0} {$ii<[llength $argv]} {incr ii} {
- } elseif {$a0=="--cc" && $ii+1<[llength $argv]} {
- incr ii
- set CC [lindex $argv $ii]
-+ } elseif {$a0=="--destdir" && $ii+1<[llength $argv]} {
-+ incr ii
-+ set DESTDIR [lindex $argv $ii]
- } elseif {[string match -* $a0]} {
- append OPTS " $a0"
- } else {
-@@ -245,7 +250,7 @@ package ifneeded sqlite3 $VERSION \\
-
- if {$install} {
- # Install the extension
-- set DEST2 $DEST/sqlite$VERSION
-+ set DEST2 ${DESTDIR}$DEST/sqlite$VERSION
- file mkdir $DEST2
- puts "installing $DEST2/pkgIndex.tcl"
- file copy -force pkgIndex.tcl $DEST2
-
-From 375552f224813c7e2fac0e67dd13ecd6ba3a3571 Mon Sep 17 00:00:00 2001
-From: stephan <stephan@noemail.net>
-Date: Sat, 16 Nov 2024 17:12:17 +0000
-Subject: [PATCH] Handle DESTDIR at an earlier phase in buildtclext.tcl to
- account for the is-writable-dir check and to filter out //zipfs: dirs as
- (im)possible installation targets.
---- a/tool/buildtclext.tcl
-+++ b/tool/buildtclext.tcl
-@@ -198,7 +198,15 @@ if {$install} {
- #
- set DEST {}
- foreach dir $auto_path {
-- if {[file writable $dir]} {
-+ if {[string match //*:* $dir]} {
-+ # We can't install to //zipfs: paths
-+ continue
-+ } elseif {"" ne $DESTDIR && ![file writable $DESTDIR]} {
-+ continue
-+ }
-+ set dir ${DESTDIR}$dir
-+ if {[file writable $dir] || "" ne $DESTDIR} {
-+ # the dir will be created later ^^^^^^^^
- set DEST $dir
- break
- } elseif {[glob -nocomplain $dir/sqlite3*/pkgIndex.tcl]!=""} {
-@@ -216,7 +224,7 @@ if {$install} {
- puts "to work around this problem.\n"
- puts "These are the (unwritable) \$auto_path directories:\n"
- foreach dir $auto_path {
-- puts " * $dir"
-+ puts " * ${DESTDIR}$dir"
- }
- exit 1
- }
-@@ -250,7 +258,7 @@ package ifneeded sqlite3 $VERSION \\
-
- if {$install} {
- # Install the extension
-- set DEST2 ${DESTDIR}$DEST/sqlite$VERSION
-+ set DEST2 $DEST/sqlite$VERSION
- file mkdir $DEST2
- puts "installing $DEST2/pkgIndex.tcl"
- file copy -force pkgIndex.tcl $DEST2
-
diff --git a/dev-db/sqlite/files/sqlite-3.47.0-nonbash.patch b/dev-db/sqlite/files/sqlite-3.47.0-nonbash.patch
deleted file mode 100644
index 3eece5ed5b29..000000000000
--- a/dev-db/sqlite/files/sqlite-3.47.0-nonbash.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://sqlite.org/forum/info/14274389fb2
-https://bugs.gentoo.org/942917
-https://bugs.gentoo.org/942918
-https://github.com/sqlite/sqlite/commit/a40e6e927313ed97a895ff7c022eff705e50b1e6
-
-From a40e6e927313ed97a895ff7c022eff705e50b1e6 Mon Sep 17 00:00:00 2001
-From: stephan <stephan@noemail.net>
-Date: Wed, 30 Oct 2024 00:35:08 +0000
-Subject: [PATCH] Replace 3 instances of the == 'test' shell command operator
- with =, as == is apparently not as portable across shells. Problem reported
- in [forum:14274389fb2|forum post 14274389fb2].
-
-FossilOrigin-Name: 68199c40fedeb07a3f9c5024fac6376a0579a13b0e5690aef6238e3e22b9c1b7
---- a/configure
-+++ b/configure
-@@ -10334,7 +10334,7 @@ else
- fi
-
- original_use_tcl=${use_tcl}
--if test x"${with_tclsh}" == x -a x"${with_tcl}" == x; then
-+if test x"${with_tclsh}" = x -a x"${with_tcl}" = x; then
- for ac_prog in tclsh9.0 tclsh8.6 tclsh
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -10453,7 +10453,7 @@ $as_echo "unable to run tests because no tclConfig.sh file could be located" >&6
- HAVE_TCL=0
- fi
-
--if test x"$TCLSH_CMD" == x; then
-+if test x"$TCLSH_CMD" = x; then
- TCLSH_CMD=${TCL_EXEC_PREFIX}/bin/tclsh${TCL_VERSION}
- if test ! -x ${TCLSH_CMD}; then
- TCLSH_CMD_2=${TCL_EXEC_PREFIX}/bin/tclsh
---- a/configure.ac
-+++ b/configure.ac
-@@ -124,7 +124,7 @@ AC_ARG_WITH(tcl, AS_HELP_STRING([--with-tcl=DIR],[directory containing (tclConfi
- AC_ARG_ENABLE(tcl, AS_HELP_STRING([--disable-tcl],[omit building accessory programs that require TCL-dev]),
- [use_tcl=$enableval],[use_tcl=yes])
- original_use_tcl=${use_tcl}
--if test x"${with_tclsh}" == x -a x"${with_tcl}" == x; then
-+if test x"${with_tclsh}" = x -a x"${with_tcl}" = x; then
- AC_CHECK_PROGS(TCLSH_CMD, [tclsh9.0 tclsh8.6 tclsh],none)
- with_tclsh=${TCLSH_CMD}
- fi
-@@ -195,7 +195,7 @@ else
- HAVE_TCL=0
- fi
- AC_SUBST(HAVE_TCL)
--if test x"$TCLSH_CMD" == x; then
-+if test x"$TCLSH_CMD" = x; then
- TCLSH_CMD=${TCL_EXEC_PREFIX}/bin/tclsh${TCL_VERSION}
- if test ! -x ${TCLSH_CMD}; then
- TCLSH_CMD_2=${TCL_EXEC_PREFIX}/bin/tclsh
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-13 01:37:05 +0000