[arch-commits] Commit in sqlite/trunk (PKGBUILD tracker-workaround.diff)

[Jan Steffens]

    Date: Wednesday, March 17, 2021 @ 21:07:01
  Author: heftig
Revision: 410193

3.35.2-1

Modified:
  sqlite/trunk/PKGBUILD
Deleted:
  sqlite/trunk/tracker-workaround.diff

-------------------------+
 PKGBUILD                |   19 ++++++-------------
 tracker-workaround.diff |   17 -----------------
 2 files changed, 6 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-17 21:01:45 UTC (rev 410192)
+++ PKGBUILD	2021-03-17 21:07:01 UTC (rev 410193)
@@ -3,11 +3,11 @@
 
 pkgbase="sqlite"
 pkgname=('sqlite' 'sqlite-tcl' 'sqlite-analyzer' 'lemon' 'sqlite-doc')
-_srcver=3350100
+_srcver=3350200
 _docver=${_srcver}
 #_docver=3330000
-pkgver=3.35.1
-pkgrel=2
+pkgver=3.35.2
+pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
 arch=('x86_64')
 license=('custom:Public Domain')
@@ -16,14 +16,12 @@
 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=('8cb60d7cc55c410fcd6990fe92802fda02760efa4fe3569a677e3e8dcdf8b107'
-            '3bb955ea75606e735955aa0b680d72d91cde367b6d3e38ee14b88a588deb6a4f'
+sha256sums=('6af39632ed596ff3294f35caff4d671745f81894135f9789ceecf696dfc38703'
+            '5ae1e29f2dc4e13b787d4a074cf3844751fedab94b4304a4e89bf6e7bdb79b8d'
             '55746d93b0df4b349c4aa4f09535746dac3530f9fd6de241c9f38e2c92e8ee97'
-            '8f2134e31d489e3eadd2564a8a950797202bddc67cae553b8694d19eb455e2c1'
             '4e57d9ac979f1c9872e69799c2597eeef4c6ce7224f3ede0bf9dc8d217b1e65d')
 
 prepare() {
@@ -33,12 +31,7 @@
   # 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
+  #autoreconf -vfi
 }
 
 build() {

Deleted: tracker-workaround.diff
===================================================================
--- tracker-workaround.diff	2021-03-17 21:01:45 UTC (rev 410192)
+++ tracker-workaround.diff	2021-03-17 21:07:01 UTC (rev 410193)
@@ -1,17 +0,0 @@
- 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) */
-     }