[PR PATCH] sqlite: update to 3.45.3.

[PR PATCH] sqlite: update to 3.45.3.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages sqlite
https://github.com/void-linux/void-packages/pull/50011

sqlite: update to 3.45.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/50011.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sqlite-50011.patch --]
[-- Type: text/x-diff, Size: 4829 bytes --]

From 5781dd28bbdfad589cbdd95512f6f34b55cdd4e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 23 Apr 2024 18:49:47 +0700
Subject: [PATCH] sqlite: update to 3.45.3.

---
 srcpkgs/sqlite-lemon          |  1 +
 srcpkgs/sqlite-lemon/template | 29 ------------------------
 srcpkgs/sqlite-lemon/update   |  1 -
 srcpkgs/sqlite-tcl            |  1 +
 srcpkgs/sqlite-tools          |  1 +
 srcpkgs/sqlite/template       | 42 +++++++++++++++++++++++++++++------
 6 files changed, 38 insertions(+), 37 deletions(-)
 create mode 120000 srcpkgs/sqlite-lemon
 delete mode 100644 srcpkgs/sqlite-lemon/template
 delete mode 100644 srcpkgs/sqlite-lemon/update
 create mode 120000 srcpkgs/sqlite-tcl
 create mode 120000 srcpkgs/sqlite-tools

diff --git a/srcpkgs/sqlite-lemon b/srcpkgs/sqlite-lemon
new file mode 120000
index 00000000000000..90a746152e828d
--- /dev/null
+++ b/srcpkgs/sqlite-lemon
@@ -0,0 +1 @@
+sqlite
\ No newline at end of file
diff --git a/srcpkgs/sqlite-lemon/template b/srcpkgs/sqlite-lemon/template
deleted file mode 100644
index d82d3e1b732406..00000000000000
--- a/srcpkgs/sqlite-lemon/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'sqlite-lemon'
-pkgname=sqlite-lemon
-version=3.45.0
-revision=1
-short_desc="LALR(1) Parser Generator"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
-license="Public Domain"
-homepage="https://sqlite.org/lemon.html"
-distfiles="https://raw.githubusercontent.com/sqlite/sqlite/version-${version}/tool/lemon.c
- https://raw.githubusercontent.com/sqlite/sqlite/version-${version}/tool/lempar.c"
-checksum="8a7d39a6d55cef0e6769f869a09d1269e3aca366c44291e1445bb877e5e94b00
- 4cfe425b513895dd11af7d3cde963920a2daeb7f5731f706e6973bfc79f207ed"
-
-skip_extraction="lemon.c lempar.c"
-
-do_extract() {
-	vsrccopy $skip_extraction .
-	vsed -i -e 's,"lempar.c","/usr/share/lemon/lempar.c",' lemon.c
-}
-
-do_build() {
-	echo $CC $CFLAGS $LDFLAGS -o lemon lemon.c
-	$CC $CFLAGS $LDFLAGS -o lemon lemon.c
-}
-
-do_install() {
-	vbin lemon
-	vinstall lempar.c 644 usr/share/lemon
-}
diff --git a/srcpkgs/sqlite-lemon/update b/srcpkgs/sqlite-lemon/update
deleted file mode 100644
index 425926ce0dad99..00000000000000
--- a/srcpkgs/sqlite-lemon/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='>Version \K[\d.]+'
diff --git a/srcpkgs/sqlite-tcl b/srcpkgs/sqlite-tcl
new file mode 120000
index 00000000000000..90a746152e828d
--- /dev/null
+++ b/srcpkgs/sqlite-tcl
@@ -0,0 +1 @@
+sqlite
\ No newline at end of file
diff --git a/srcpkgs/sqlite-tools b/srcpkgs/sqlite-tools
new file mode 120000
index 00000000000000..90a746152e828d
--- /dev/null
+++ b/srcpkgs/sqlite-tools
@@ -0,0 +1 @@
+sqlite
\ No newline at end of file
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 1d548eb479560b..38da383dadb103 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,18 +1,19 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.45.2
+version=3.45.3
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 build_style=gnu-configure
-configure_args="--enable-threadsafe --enable-dynamic-extensions --enable-fts5"
-makedepends="libedit-devel zlib-devel"
+configure_args="--enable-threadsafe --enable-dynamic-extensions --enable-fts5
+ --with-tcl=$XBPS_CROSS_BASE/usr/lib"
+makedepends="libedit-devel zlib-devel tcl-devel"
 short_desc="SQL Database Engine in a C Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/changes.html"
-distfiles="https://sqlite.org/2024/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=bc9067442eedf3dd39989b5c5cfbfff37ae66cc9c99274e0c3052dc4d4a8f6ae
+distfiles="https://sqlite.org/2024/sqlite-src-${_amalgamationver}.zip"
+checksum=ec0c959e42cb5f1804135d0555f8ea32be6ff2048eb181bccd367c8f53f185d1
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \
@@ -29,8 +30,10 @@ case "$XBPS_TARGET_ENDIAN" in
 	be) CFLAGS+=" -DSHA3_BYTEORDER=4321 -DSQLITE_BYTEORDER=4321";;
 esac
 
-pre_configure() {
-	vsed -i -e 's/ -ltinfo//g' configure
+
+_tools="showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer"
+post_build() {
+	make lemon $_tools
 }
 
 sqlite-devel_package() {
@@ -43,3 +46,28 @@ sqlite-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+sqlite-lemon_package() {
+	short_desc="sqlite - LALR(1) Parser Generator"
+	pkg_install() {
+		vbin lemon
+		vinstall lempar.c 644 usr/share/lemon
+	}
+}
+
+sqlite-tools_package() {
+	short_desc+=" - tools"
+	pkg_install() {
+		local t
+		for t in $_tools; do
+			vbin $t
+		done
+	}
+}
+
+sqlite-tcl_package() {
+	short_desc+=" - tcl bindings"
+	pkg_install() {
+		vmove "usr/lib/tcl*"
+	}
+}

Re: [PR PATCH] [Updated] sqlite: update to 3.45.3.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages sqlite
https://github.com/void-linux/void-packages/pull/50011

sqlite: update to 3.45.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/50011.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sqlite-50011.patch --]
[-- Type: text/x-diff, Size: 4952 bytes --]

From c7aca0b1d4b419be2268b2129ee219b792975953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 23 Apr 2024 18:49:47 +0700
Subject: [PATCH] sqlite: update to 3.45.3.

---
 srcpkgs/sqlite-lemon          |  1 +
 srcpkgs/sqlite-lemon/template | 29 ----------------------
 srcpkgs/sqlite-lemon/update   |  1 -
 srcpkgs/sqlite-tcl            |  1 +
 srcpkgs/sqlite-tools          |  1 +
 srcpkgs/sqlite/template       | 46 +++++++++++++++++++++++++++++------
 6 files changed, 42 insertions(+), 37 deletions(-)
 create mode 120000 srcpkgs/sqlite-lemon
 delete mode 100644 srcpkgs/sqlite-lemon/template
 delete mode 100644 srcpkgs/sqlite-lemon/update
 create mode 120000 srcpkgs/sqlite-tcl
 create mode 120000 srcpkgs/sqlite-tools

diff --git a/srcpkgs/sqlite-lemon b/srcpkgs/sqlite-lemon
new file mode 120000
index 00000000000000..90a746152e828d
--- /dev/null
+++ b/srcpkgs/sqlite-lemon
@@ -0,0 +1 @@
+sqlite
\ No newline at end of file
diff --git a/srcpkgs/sqlite-lemon/template b/srcpkgs/sqlite-lemon/template
deleted file mode 100644
index d82d3e1b732406..00000000000000
--- a/srcpkgs/sqlite-lemon/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'sqlite-lemon'
-pkgname=sqlite-lemon
-version=3.45.0
-revision=1
-short_desc="LALR(1) Parser Generator"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
-license="Public Domain"
-homepage="https://sqlite.org/lemon.html"
-distfiles="https://raw.githubusercontent.com/sqlite/sqlite/version-${version}/tool/lemon.c
- https://raw.githubusercontent.com/sqlite/sqlite/version-${version}/tool/lempar.c"
-checksum="8a7d39a6d55cef0e6769f869a09d1269e3aca366c44291e1445bb877e5e94b00
- 4cfe425b513895dd11af7d3cde963920a2daeb7f5731f706e6973bfc79f207ed"
-
-skip_extraction="lemon.c lempar.c"
-
-do_extract() {
-	vsrccopy $skip_extraction .
-	vsed -i -e 's,"lempar.c","/usr/share/lemon/lempar.c",' lemon.c
-}
-
-do_build() {
-	echo $CC $CFLAGS $LDFLAGS -o lemon lemon.c
-	$CC $CFLAGS $LDFLAGS -o lemon lemon.c
-}
-
-do_install() {
-	vbin lemon
-	vinstall lempar.c 644 usr/share/lemon
-}
diff --git a/srcpkgs/sqlite-lemon/update b/srcpkgs/sqlite-lemon/update
deleted file mode 100644
index 425926ce0dad99..00000000000000
--- a/srcpkgs/sqlite-lemon/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='>Version \K[\d.]+'
diff --git a/srcpkgs/sqlite-tcl b/srcpkgs/sqlite-tcl
new file mode 120000
index 00000000000000..90a746152e828d
--- /dev/null
+++ b/srcpkgs/sqlite-tcl
@@ -0,0 +1 @@
+sqlite
\ No newline at end of file
diff --git a/srcpkgs/sqlite-tools b/srcpkgs/sqlite-tools
new file mode 120000
index 00000000000000..90a746152e828d
--- /dev/null
+++ b/srcpkgs/sqlite-tools
@@ -0,0 +1 @@
+sqlite
\ No newline at end of file
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 1d548eb479560b..c244b8d6876890 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,18 +1,20 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.45.2
+version=3.45.3
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 build_style=gnu-configure
-configure_args="--enable-threadsafe --enable-dynamic-extensions --enable-fts5"
-makedepends="libedit-devel zlib-devel"
+configure_args="--enable-threadsafe --enable-dynamic-extensions --enable-fts5
+ --with-tcl=$XBPS_CROSS_BASE/usr/lib"
+hostmakedepends="tcl"
+makedepends="libedit-devel zlib-devel tcl-devel"
 short_desc="SQL Database Engine in a C Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/changes.html"
-distfiles="https://sqlite.org/2024/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=bc9067442eedf3dd39989b5c5cfbfff37ae66cc9c99274e0c3052dc4d4a8f6ae
+distfiles="https://sqlite.org/2024/sqlite-src-${_amalgamationver}.zip"
+checksum=ec0c959e42cb5f1804135d0555f8ea32be6ff2048eb181bccd367c8f53f185d1
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \
@@ -29,8 +31,13 @@ case "$XBPS_TARGET_ENDIAN" in
 	be) CFLAGS+=" -DSHA3_BYTEORDER=4321 -DSQLITE_BYTEORDER=4321";;
 esac
 
-pre_configure() {
-	vsed -i -e 's/ -ltinfo//g' configure
+
+_tools="showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer"
+post_build() {
+	make $_tools
+	cd tool
+	echo $CC $CFLAGS $LDFLAGS -o lemon lemon.c
+	$CC $CFLAGS $LDFLAGS -o lemon lemon.c
 }
 
 sqlite-devel_package() {
@@ -43,3 +50,28 @@ sqlite-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+sqlite-lemon_package() {
+	short_desc="LALR(1) Parser Generator from sqlite"
+	pkg_install() {
+		vbin tool/lemon
+		vinstall tool/lempar.c 644 usr/share/lemon
+	}
+}
+
+sqlite-tools_package() {
+	short_desc+=" - tools"
+	pkg_install() {
+		local t
+		for t in $_tools; do
+			vbin $t
+		done
+	}
+}
+
+sqlite-tcl_package() {
+	short_desc+=" - tcl bindings"
+	pkg_install() {
+		vmove "usr/lib/tcl*"
+	}
+}

Re: [PR PATCH] [Merged]: sqlite: update to 3.45.3.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1105 bytes --]

There's a merged pull request on the void-packages repository

sqlite: update to 3.45.3.
https://github.com/void-linux/void-packages/pull/50011

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Re: sqlite: update to 3.45.3.

[ntzm]

[-- Attachment #1: Type: text/plain, Size: 290 bytes --]

New comment by ntzm on void-packages repository

https://github.com/void-linux/void-packages/pull/50011#issuecomment-2085528555

Comment:
This change broke the building of libspatialite for me:

```
ld: /lib64/libspatialite.so: undefined reference to `sqlite3_rtree_query_callback'
```

Re: sqlite: update to 3.45.3.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 150 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/50011#issuecomment-2088131557

Comment:
Re-enabling!