[PR PATCH] sqlite: update to 3.38.0

[PR PATCH] sqlite: update to 3.38.0

[ologantr]

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

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

https://github.com/ologantr/void-packages sqlite-3.38.0
https://github.com/void-linux/void-packages/pull/35796

sqlite: update to 3.38.0
Also remove -DSQLITE_ENABLE_JSON1 as JSON is now on by default.
https://sqlite.org/releaselog/3_38_0.html

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

#### Local build testing
- I built this PR locally for my native architecture (x86_64-glibc)

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

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

From 61547c42fa12b5fc4d70b164702ad2813ee12055 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Tue, 22 Feb 2022 22:41:45 +0100
Subject: [PATCH] sqlite: update to 3.38.0

Also remove -DSQLITE_ENABLE_JSON1 as JSON is now on by default.
---
 srcpkgs/sqlite/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index a2cb06763b8d..8760d30aee97 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.37.2
+version=3.38.0
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -13,10 +13,10 @@ license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
 distfiles="${homepage}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8
+checksum=1c76e25dc63d9f3935e0f406aec520a33ee77cf54ea5147dffe1fae8369eff68
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
- -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \
+ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \
  -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 \
  -DSQLITE_ENABLE_FTS3_TOKENIZER=1 -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE=1 \
  -DSQLITE_ENABLE_DESERIALIZE"

Re: sqlite: update to 3.38.0

[mobinmob]

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/35796#issuecomment-1059716503

Comment:
`fossil` update depends on the sqlite update.

Re: sqlite: update to 3.38.0

[mobinmob]

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/35796#issuecomment-1059716503

Comment:
`fossil` update tp 2.18 depends on the sqlite update.

Re: sqlite: update to 3.38.0

[mobinmob]

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/35796#issuecomment-1059716503

Comment:
`fossil` update to 2.18 depends on the sqlite update.

Re: sqlite: update to 3.38.0

[ologantr]

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

New comment by ologantr on void-packages repository

https://github.com/void-linux/void-packages/pull/35796#issuecomment-1059822879

Comment:
> `fossil` update to 2.18 depends on the sqlite update.

I was actually waiting on this being merged.
Should I push a commit for fossil on this 
branch and edit this pull request?

Re: sqlite: update to 3.38.0

[mobinmob]

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/35796#issuecomment-1059823706

Comment:
If that is what you want :)
As a sidenote: In my tests fossil seems to need both `--disable-internal-sqlite` and -`-with-sqlite="${XBPS_CROSS_BASE}/usr/include/"` in order to use the system sqlite. I may be mistaken, but check it out.

Re: [PR PATCH] [Updated] sqlite: update to 3.38.0

[ologantr]

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

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

https://github.com/ologantr/void-packages sqlite-3.38.0
https://github.com/void-linux/void-packages/pull/35796

sqlite: update to 3.38.0
Also remove -DSQLITE_ENABLE_JSON1 as JSON is now on by default.
https://sqlite.org/releaselog/3_38_0.html

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

#### Local build testing
- I built this PR locally for my native architecture (x86_64-glibc)

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

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

From a6cd2e809264d84182e1cf3fe97c8dddfee3a6ab Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Tue, 22 Feb 2022 22:41:45 +0100
Subject: [PATCH 1/2] sqlite: update to 3.38.0.

Also remove -DSQLITE_ENABLE_JSON1 as JSON is now on by default.
---
 srcpkgs/sqlite/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index a2cb06763b8d..8760d30aee97 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.37.2
+version=3.38.0
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -13,10 +13,10 @@ license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
 distfiles="${homepage}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8
+checksum=1c76e25dc63d9f3935e0f406aec520a33ee77cf54ea5147dffe1fae8369eff68
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
- -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \
+ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \
  -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 \
  -DSQLITE_ENABLE_FTS3_TOKENIZER=1 -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE=1 \
  -DSQLITE_ENABLE_DESERIALIZE"

From 6e01d7af6a65d5c2b166a70c0c68cab2608d9f3b Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sat, 5 Mar 2022 21:26:06 +0100
Subject: [PATCH 2/2] fossil: update to 2.18.

Also, add --with-sqlite to configure_args in order to
use the system-provided sqlite.
---
 srcpkgs/fossil/patches/cross.patch | 2 +-
 srcpkgs/fossil/template            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fossil/patches/cross.patch b/srcpkgs/fossil/patches/cross.patch
index 79ce61fcdcd7..2e5cc092a67a 100644
--- a/srcpkgs/fossil/patches/cross.patch
+++ b/srcpkgs/fossil/patches/cross.patch
@@ -8,6 +8,6 @@ index 9818cbd..1c248b8 100644
  
 -XBCC = $(BCC) $(BCCFLAGS)
 +XBCC = $(BCC) -Os
- XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS)
+ XTCC = $(TCC) $(CFLAGS_INCLUDE) -I$(OBJDIR) $(TCCFLAGS)
  
  TESTFLAGS := -quiet
diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index 63323b9f1f02..7e266eb29fe2 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,9 +1,9 @@
 # Template file for 'fossil'
 pkgname=fossil
-version=2.17
+version=2.18
 revision=1
 build_style=configure
-configure_args="--disable-internal-sqlite --prefix=/usr"
+configure_args="--disable-internal-sqlite --prefix=/usr --with-sqlite=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="tcl"
 makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://www.fossil-scm.org"
 changelog="https://www.fossil-scm.org/home/doc/trunk/www/changes.wiki"
 distfiles="https://fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz"
-checksum=21d6ee5187775113f74e55ab5ebcb1764f7226a8e59be1b2c7896cbe9dce6914
+checksum=e89cb9c726348bb14e7736e031d2b08574408c5d4db98e7d3fc814dadc6f3546
 
 post_extract() {
 	vsed -i 's/test_system_sqlite$/# &/' auto.def  # failing on cross

Re: sqlite: update to 3.38.0

[ologantr]

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

New comment by ologantr on void-packages repository

https://github.com/void-linux/void-packages/pull/35796#issuecomment-1059827392

Comment:
> If that is what you want :) As a sidenote: In my tests fossil seems to need both `--disable-internal-sqlite` and -`-with-sqlite="${XBPS_CROSS_BASE}/usr/include/"` in order to use the system sqlite. I may be mistaken, but check it out.

Yes, you're right: without --with-sqlite, configure
falls back to the fossil-provided one even if
--disable-internal-sqlite was used. I've
updated fossil and added this switch.

Re: sqlite: update to 3.38.0, fossil: update to 2.18.

[ologantr]

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

New comment by ologantr on void-packages repository

https://github.com/void-linux/void-packages/pull/35796#issuecomment-1059827392

Comment:
> If that is what you want :) As a sidenote: In my tests fossil seems to need both `--disable-internal-sqlite` and -`-with-sqlite="${XBPS_CROSS_BASE}/usr/include/"` in order to use the system sqlite. I may be mistaken, but check it out.

Yes, you're right: without --with-sqlite, configure
falls back to the fossil-provided one even if
--disable-internal-sqlite was used. I've
updated fossil and added this switch.
I've just noticed that common/shlib entry
for sqlite is lagging behind: I'm going to
bump it while here.

Re: [PR PATCH] [Updated] sqlite: update to 3.38.0, fossil: update to 2.18.

[ologantr]

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

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

https://github.com/ologantr/void-packages sqlite-3.38.0
https://github.com/void-linux/void-packages/pull/35796

sqlite: update to 3.38.0, fossil: update to 2.18.
Also remove -DSQLITE_ENABLE_JSON1 as JSON is now on by default.
https://sqlite.org/releaselog/3_38_0.html

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

#### Local build testing
- I built this PR locally for my native architecture (x86_64-glibc)

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

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

From fe6be136401dc9b48da399f9dd6f315161c54bde Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Tue, 22 Feb 2022 22:41:45 +0100
Subject: [PATCH 1/2] sqlite: update to 3.38.0.

Also remove -DSQLITE_ENABLE_JSON1 as JSON is now on by default,
and revbump sqlite common/shlibs entry.
---
 common/shlibs           | 2 +-
 srcpkgs/sqlite/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 250e1e0b8cb5..d60e60a87534 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -352,7 +352,7 @@ libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
 libtcl8.6.so tcl-8.6.0_1
 libtk8.6.so tk-8.6.1_3
-libsqlite3.so.0 sqlite-3.31.1_3
+libsqlite3.so.0 sqlite-3.38.0_1
 libIDL-2.so.0 libIDL-0.8.13_1
 libnspr4.so nspr-4.8_1
 libplc4.so nspr-4.8_1
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index a2cb06763b8d..8760d30aee97 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.37.2
+version=3.38.0
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -13,10 +13,10 @@ license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
 distfiles="${homepage}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8
+checksum=1c76e25dc63d9f3935e0f406aec520a33ee77cf54ea5147dffe1fae8369eff68
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
- -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \
+ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \
  -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 \
  -DSQLITE_ENABLE_FTS3_TOKENIZER=1 -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE=1 \
  -DSQLITE_ENABLE_DESERIALIZE"

From 9b87eba5abcf25254b59b15a9d158dc391ff0a0d Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sat, 5 Mar 2022 21:26:06 +0100
Subject: [PATCH 2/2] fossil: update to 2.18.

Also, add --with-sqlite to configure_args in order to
use the system-provided sqlite.
---
 srcpkgs/fossil/patches/cross.patch | 2 +-
 srcpkgs/fossil/template            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fossil/patches/cross.patch b/srcpkgs/fossil/patches/cross.patch
index 79ce61fcdcd7..2e5cc092a67a 100644
--- a/srcpkgs/fossil/patches/cross.patch
+++ b/srcpkgs/fossil/patches/cross.patch
@@ -8,6 +8,6 @@ index 9818cbd..1c248b8 100644
  
 -XBCC = $(BCC) $(BCCFLAGS)
 +XBCC = $(BCC) -Os
- XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS)
+ XTCC = $(TCC) $(CFLAGS_INCLUDE) -I$(OBJDIR) $(TCCFLAGS)
  
  TESTFLAGS := -quiet
diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index 63323b9f1f02..7e266eb29fe2 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,9 +1,9 @@
 # Template file for 'fossil'
 pkgname=fossil
-version=2.17
+version=2.18
 revision=1
 build_style=configure
-configure_args="--disable-internal-sqlite --prefix=/usr"
+configure_args="--disable-internal-sqlite --prefix=/usr --with-sqlite=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="tcl"
 makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://www.fossil-scm.org"
 changelog="https://www.fossil-scm.org/home/doc/trunk/www/changes.wiki"
 distfiles="https://fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz"
-checksum=21d6ee5187775113f74e55ab5ebcb1764f7226a8e59be1b2c7896cbe9dce6914
+checksum=e89cb9c726348bb14e7736e031d2b08574408c5d4db98e7d3fc814dadc6f3546
 
 post_extract() {
 	vsed -i 's/test_system_sqlite$/# &/' auto.def  # failing on cross

Re: [PR PATCH] [Merged]: sqlite: update to 3.38.0, fossil: update to 2.18.

[leahneukirchen]

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

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

sqlite: update to 3.38.0, fossil: update to 2.18.
https://github.com/void-linux/void-packages/pull/35796

Description:
Also remove -DSQLITE_ENABLE_JSON1 as JSON is now on by default.
https://sqlite.org/releaselog/3_38_0.html

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

#### Local build testing
- I built this PR locally for my native architecture (x86_64-glibc)