[arch-commits] Commit in lib32-sqlite/trunk (2 files)

[Laurent Carlier]

    Date: Monday, December 13, 2021 @ 20:11:53
  Author: lcarlier
Revision: 1072166

upgpkg: lib32-sqlite 3.37.0-1: upstream update 3.37.0

Added:
  lib32-sqlite/trunk/sqlite3-amalgamation_configure.patch
Modified:
  lib32-sqlite/trunk/PKGBUILD

--------------------------------------+
 PKGBUILD                             |   12 +++++++---
 sqlite3-amalgamation_configure.patch |   37 +++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-13 20:02:12 UTC (rev 1072165)
+++ PKGBUILD	2021-12-13 20:11:53 UTC (rev 1072166)
@@ -4,8 +4,8 @@
 
 _pkgbasename=sqlite
 pkgname=lib32-sqlite
-_srcver=3360000
-pkgver=3.36.0
+_srcver=3370000
+pkgver=3.37.0
 pkgrel=1
 pkgdesc="A C library that implements an SQL database engine (32-bit)"
 arch=('x86_64')
@@ -13,12 +13,16 @@
 url="https://www.sqlite.org/"
 depends=(lib32-glibc $_pkgbasename)
 makedepends=('tcl' 'lib32-readline')
-source=(https://www.sqlite.org/2021/sqlite-src-${_srcver}.zip)
+source=(https://www.sqlite.org/2021/sqlite-src-${_srcver}.zip
+        sqlite3-amalgamation_configure.patch)
 # upstream now switched to sha3sums - currently not supported by makepkg
-sha256sums=('25a3b9d08066b3a9003f06a96b2a8d1348994c29cc912535401154501d875324')
+sha256sums=('70977fb3942187d4627413afde9a9492fa02b954850812b53974b6a31ece8faf'
+            '6c5d360d9c6cee104977529cfb5004ca22093824bc5ba9a9741fe567597d3684')
 
 prepare() {
   cd "$srcdir"/sqlite-src-$_srcver
+
+  patch -Np1 -i ../sqlite3-amalgamation_configure.patch
   autoreconf -vfi
 }
 

Added: sqlite3-amalgamation_configure.patch
===================================================================
--- sqlite3-amalgamation_configure.patch	                        (rev 0)
+++ sqlite3-amalgamation_configure.patch	2021-12-13 20:11:53 UTC (rev 1072166)
@@ -0,0 +1,37 @@
+--- sqlite-src-3370000/configure.ac.orig	2021-11-27 16:05:17.000000000 +0100
++++ sqlite-src-3370000/configure.ac	2021-12-03 21:21:47.506868981 +0100
+@@ -116,6 +116,13 @@
+ USE_AMALGAMATION=1
+ 
+ #########
++# By default, amalgamation sqlite3.c will have #line directives.
++# This is a build option not shown by ./configure --help
++# To control it, use configure option: amalgamation_line_macros=?
++# where ? is no to suppress #line directives or yes to create them.
++AMALGAMATION_LINE_MACROS=--linemacros=0
++
++#########
+ # See whether we can run specific tclsh versions known to work well;
+ # if not, then we fall back to plain tclsh.
+ # TODO: try other versions before falling back?
+@@ -574,6 +581,20 @@
+ fi
+ AC_SUBST(USE_AMALGAMATION)
+ 
++########
++# See whether --disable
++if test "${amalgamation_line_macros+set}" = set; then :
++  enableval=$amalgamation_line_macros;
++fi
++
++if test "${amalgamation_line_macros}" = "yes" ; then
++  AMALGAMATION_LINE_MACROS=--linemacros=1
++fi
++if test "${amalgamation_line_macros}" = "no" ; then
++  AMALGAMATION_LINE_MACROS=--linemacros=0
++fi
++AC_SUBST(AMALGAMATION_LINE_MACROS)
++
+ #########
+ # Look for zlib.  Only needed by extensions and by the sqlite3.exe shell
+ AC_CHECK_HEADERS(zlib.h)