From: ologantr <ologantr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] sqlite: update to 3.38.0
Date: Sat, 05 Mar 2022 21:30:37 +0100 [thread overview]
Message-ID: <20220305203037.qy3IdIavg2m8dQSqe6OxvL9cYgA5LAeES3pIkgJKxlk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35796@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2022-03-05 20:30 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-22 21:47 [PR PATCH] " ologantr
2022-03-05 7:59 ` mobinmob
2022-03-05 8:01 ` mobinmob
2022-03-05 8:01 ` mobinmob
2022-03-05 19:54 ` ologantr
2022-03-05 20:01 ` mobinmob
2022-03-05 20:30 ` ologantr [this message]
2022-03-05 20:32 ` ologantr
2022-03-05 20:42 ` sqlite: update to 3.38.0, fossil: update to 2.18 ologantr
2022-03-05 20:47 ` [PR PATCH] [Updated] " ologantr
2022-03-08 21:47 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220305203037.qy3IdIavg2m8dQSqe6OxvL9cYgA5LAeES3pIkgJKxlk@z \
--to=ologantr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).