* sync sqlite with main arch

This commit is contained in:
Alexander Baldeck 2021-03-17 22:02:26 +01:00
parent 3982d16005
commit d75dc08bd7
2 changed files with 30 additions and 6 deletions

View File

@ -4,25 +4,27 @@
pkgbase="sqlite"
pkgname=('sqlite' 'sqlite-tcl' 'sqlite-analyzer' 'lemon' 'sqlite-doc')
_srcver=3350000
_srcver=3350100
_docver=${_srcver}
#_docver=3330000
pkgver=3.35.0
pkgrel=1
pkgver=3.35.1
pkgrel=2
pkgdesc="A C library that implements an SQL database engine"
arch=(x86_64 powerpc64le powerpc)
arch=(x86_64 powerpc64le)
license=('custom:Public Domain')
url="https://www.sqlite.org/"
makedepends=('tcl' 'readline' 'zlib')
source=(https://www.sqlite.org/2021/sqlite-src-${_srcver}.zip
https://www.sqlite.org/2021/sqlite-doc-${_docver}.zip
sqlite-lemon-system-template.patch
tracker-workaround.diff
license.txt)
options=('!emptydirs' '!makeflags') # json extensions breaks parallel build
# upstream now switched to sha3sums - currently not suppoerted by makepkg
sha256sums=('c72dea7b8148a4c1b00145c9aab52317cffbfb46b6179c476f6e41d4f87c6af2'
'27433ffad8f056c98616a2c3dd4d55a2a997e9bee068630c4f43b6ae75413602'
sha256sums=('8cb60d7cc55c410fcd6990fe92802fda02760efa4fe3569a677e3e8dcdf8b107'
'3bb955ea75606e735955aa0b680d72d91cde367b6d3e38ee14b88a588deb6a4f'
'55746d93b0df4b349c4aa4f09535746dac3530f9fd6de241c9f38e2c92e8ee97'
'8f2134e31d489e3eadd2564a8a950797202bddc67cae553b8694d19eb455e2c1'
'4e57d9ac979f1c9872e69799c2597eeef4c6ce7224f3ede0bf9dc8d217b1e65d')
prepare() {
@ -32,6 +34,11 @@ prepare() {
# https://src.fedoraproject.org/rpms/sqlite/blob/master/f/sqlite.spec
patch -Np1 -i ../sqlite-lemon-system-template.patch
# workaround
# https://www.sqlite.org/forum/forumpost/1061e627d0
# https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/161#note_1059821
patch -Np1 -i ../tracker-workaround.diff
# autoreconf -vfi
}

View File

@ -0,0 +1,17 @@
src/select.c | 3 +++
1 file changed, 3 insertions(+)
diff --git c/src/select.c i/src/select.c
index beb5c1e3b..00b709652 100644
--- c/src/select.c
+++ i/src/select.c
@@ -4003,6 +4003,9 @@ static int flattenSubquery(
** queries.
*/
if( pSub->pPrior ){
+ if( pSrc->nSrc!=1 ){
+ return 0; /* workaround https://www.sqlite.org/forum/forumpost/1061e627d0 */
+ }
if( pSub->pOrderBy ){
return 0; /* Restriction (20) */
}