From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 29 Jun 2022 12:04:12 +0100
Subject: gentoo resync : 29.12.2022

---
 dev-vcs/fossil/Manifest                              |  3 ++-
 .../fossil-2.18-fix-sqlite-3.38-json-check.patch     | 20 ++++++++++++++++++++
 dev-vcs/fossil/fossil-2.18.ebuild                    | 10 ++++++++--
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 dev-vcs/fossil/files/fossil-2.18-fix-sqlite-3.38-json-check.patch

(limited to 'dev-vcs/fossil')

diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 5c4fdb9ecdc1..6c1a905157e1 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,6 +1,7 @@
 AUX fossil-2.10-check-lib64-for-tcl.patch 445 BLAKE2B a8282820edafb15ae6542b9f134553c5b6d7b3b685959baa531071923f0611fb22ce5945ab2ecbd4d1bae3c6234c557ac2edc872363cf05a3045bf70bebe1a1b SHA512 ccc3f6cf55902748bf8a27ea1c7c1733a2e33a45b297a7f9f732dc772e021e461052e30f841c7fa83c6303e6c7d8f8aac96f248c909d824237edb17335cb3e2f
+AUX fossil-2.18-fix-sqlite-3.38-json-check.patch 638 BLAKE2B b7803fe6ef617f0ce96b399fb9f317018fc99ad155625cb3062f8dd4b8648fbd2a14e3cd92bd0c60ca9d8458c250076bcd725bf932b0b66f1311cd131fe5adef SHA512 2133a926841509ac6edebf259b880c209568de66f4f88bd0ba14c67a1fc010fa1748b8edc18787a02f30ae7ecb445ed5306e3fb6a745b81eeb77f4e3126ddb54
 DIST fossil-src-2.16.tar.gz 6275775 BLAKE2B 504f828f121385ec73311b340e0abfdba7da6a8571adb390c55c75fea0ef027366fb914c12552e177988bedbb735a3148d87ebdb23ffc2ce4b7bef8ef603692a SHA512 0569640a3b509c592f812a42526eec88ead034ba0ba3de93da62cfb1caa751954ae185eaa3398d411a02ee2a858ecae6cdf4e47199847527f7524fc9798a4b12
 DIST fossil-src-2.18.tar.gz 6308652 BLAKE2B 299406d365e24c139e8bfbf94dc0aee2c04aa02a9f4c48d1425d0f6d21830aece10cbc5a38cee18cec03d3d0f39db3726d4890c09ca9bfc84a5058e76756ed4d SHA512 9dfeef1cc394af7afc6b68d2ebf084d5962698123518999130162718d450d061ab286b5f4039cde1af0e17059a9c801f1ded974fdb78b0965b73a7f8c80fd277
 EBUILD fossil-2.16-r1.ebuild 1891 BLAKE2B a14d37b8d26d8078112c7e60ecb7d6f3e45becfb5e0894e0955dfacc5281aba4ba480678d99bb6a57b356ca355f37f5d3e7e8ccca5a725915b08d2923b93a919 SHA512 96e2c2f724f6a4149c279f3caf61ba8defa4a56b6a8e471d9119a7ba46fcfa35c597fd58193af6cedbfad34ea676230650e77b977bcc268a9cc6d85cf4a924c4
-EBUILD fossil-2.18.ebuild 1903 BLAKE2B 6352afedcc35bea83084bb13e332eea6b6fef23c2e8ea500ebd969e9a276870c7bc608971159c564dfff7b6665392389dd10408979de715c8e28b23a1f70c72c SHA512 b3c783706a9cc6b49b9a90bf98ae24fe2a937b0d226e443b28b63f63ade5fed98c72425790e1e4ce9524efd1a40ae6f200a3fa761dd4430bea0958edc681dd9c
+EBUILD fossil-2.18.ebuild 2129 BLAKE2B e6ba8456ac3da1851f28afc98ea02a05ab999fdc614430a67ac826ac799fd5b1bba78af7a51e15c09fda3b769aebd2923efff1c8f5c6a654517a96eedcb2ff2e SHA512 c3a8b2eece3bf34705bbe7df87176bb5273f0b5dc155ff846cad2baec18dd6158b0e974b3eb78c5c418a852d0ab47d31ac5eb9549b7d39c357891a617892fa4b
 MISC metadata.xml 950 BLAKE2B 2c6fb55552dd44c01649e8f394bbd56c49b3e01857493de3ad907e1058ed9f25d7bcfbe9aea0da21a578090d5e8a2d75edcf9f25cf25f2b54ca909334a522289 SHA512 f8c769c99b4889ed79011f460e0dbf2dc7d9c6576256a5c7523abab868e2a5c4d61ca1719813584051b3a8e72051cc88b06a34316ba267415c0915f3fb30dcf4
diff --git a/dev-vcs/fossil/files/fossil-2.18-fix-sqlite-3.38-json-check.patch b/dev-vcs/fossil/files/fossil-2.18-fix-sqlite-3.38-json-check.patch
new file mode 100644
index 000000000000..9c7b57bfd37d
--- /dev/null
+++ b/dev-vcs/fossil/files/fossil-2.18-fix-sqlite-3.38-json-check.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/835810
+https://fossil-scm.org/home/vpatch?from=d862cb71d6266449&to=8af827342f4c4a77
+https://fossil-scm.org/forum/info/549da79dd9
+
+--- a/tools/sqlcompattest.c
++++ b/tools/sqlcompattest.c
+@@ -62,11 +62,10 @@
+   version=(major*1000000)+(minor*1000)+release;
+ 
+   int i;
+   static const char *zRequiredOpts[] = {
+     "ENABLE_FTS4",        /* Required for repository search */
+-    "ENABLE_JSON1",       /* Required for the check-in locking protocol */
+     "ENABLE_DBSTAT_VTAB", /* Required by /repo-tabsize page */
+   };
+ 
+   /* Check minimum SQLite version number */
+   if( sqlite3_libversion_number()<version ){
+
+
diff --git a/dev-vcs/fossil/fossil-2.18.ebuild b/dev-vcs/fossil/fossil-2.18.ebuild
index c577d1665bd5..6c43488232b7 100644
--- a/dev-vcs/fossil/fossil-2.18.ebuild
+++ b/dev-vcs/fossil/fossil-2.18.ebuild
@@ -19,6 +19,8 @@ IUSE="debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs
 
 REQUIRED_USE="ssl? ( !miniz )"
 
+# Please check sqlite minimum version on every release.
+# This can be done with ./configure --print-minimum-sqlite-version.
 RDEPEND="
 	sys-libs/zlib
 	|| (
@@ -43,8 +45,12 @@ DEPEND="${RDEPEND}
 # Tests can't be run from the build directory
 RESTRICT="test"
 
-# fossil-2.10-check-lib64-for-tcl.patch: Bug 690828
-PATCHES=( "${FILESDIR}"/fossil-2.10-check-lib64-for-tcl.patch )
+PATCHES=(
+	# fossil-2.10-check-lib64-for-tcl.patch: Bug 690828
+	"${FILESDIR}"/fossil-2.10-check-lib64-for-tcl.patch
+	# sqlite-3.38 patch should be in next release
+	"${FILESDIR}"/${P}-fix-sqlite-3.38-json-check.patch
+)
 
 S="${WORKDIR}/fossil-src-${PV}"
 
-- 
cgit v1.2.3