[arch-commits] Commit in sqlite/trunk (PKGBUILD sqlite-lemon-system-template.patch)

[Andreas Radke]

    Date: Wednesday, January 20, 2021 @ 19:28:55
  Author: andyrtr
Revision: 406473

upgpkg: sqlite 3.34.1-1: upstream update 3.34.1; reenable updated sqlite-lemon-system-template patch

Modified:
  sqlite/trunk/PKGBUILD
  sqlite/trunk/sqlite-lemon-system-template.patch

------------------------------------+
 PKGBUILD                           |   16 ++++++++--------
 sqlite-lemon-system-template.patch |   20 ++++++--------------
 2 files changed, 14 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-20 19:21:32 UTC (rev 406472)
+++ PKGBUILD	2021-01-20 19:28:55 UTC (rev 406473)
@@ -3,10 +3,10 @@
 
 pkgbase="sqlite"
 pkgname=('sqlite' 'sqlite-tcl' 'sqlite-analyzer' 'lemon' 'sqlite-doc')
-_srcver=3340000
+_srcver=3340100
 _docver=${_srcver}
 #_docver=3330000
-pkgver=3.34.0
+pkgver=3.34.1
 pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
 arch=('x86_64')
@@ -13,15 +13,15 @@
 license=('custom:Public Domain')
 url="https://www.sqlite.org/"
 makedepends=('tcl' 'readline' 'zlib')
-source=(https://www.sqlite.org/2020/sqlite-src-${_srcver}.zip
-        https://www.sqlite.org/2020/sqlite-doc-${_docver}.zip
+source=(https://www.sqlite.org/2021/sqlite-src-${_srcver}.zip
+        https://www.sqlite.org/2021/sqlite-doc-${_docver}.zip
         sqlite-lemon-system-template.patch
         license.txt)
 options=('!emptydirs' '!makeflags') # json extensions breaks parallel build
 # upstream now switched to sha3sums - currently not suppoerted by makepkg
-sha256sums=('a5c2000ece56d2de13c474658b9cdba6b7f2608a4d711e245518ea02a2a2333e'
-            '1e86e24d3c1217b7ef10e67a9ff7f395d1e19a8beee732a46445b493c22979a8'
-            '9ffb899a28b74b5b1fcb6f1cf50a34d53c98e41f2cbcf60838a8a890cdb595e8'
+sha256sums=('dddd237996b096dee8b37146c7a37a626a80306d6695103d2ec16ee3b852ff49'
+            '03d41ff85e49b78f53c8297b37b1f287b4f3df5294f168150c7b8fb2a1a8530d'
+            '55746d93b0df4b349c4aa4f09535746dac3530f9fd6de241c9f38e2c92e8ee97'
             '4e57d9ac979f1c9872e69799c2597eeef4c6ce7224f3ede0bf9dc8d217b1e65d')
 
 prepare() {
@@ -29,7 +29,7 @@
 
   # patch taken from Fedora
   # https://src.fedoraproject.org/rpms/sqlite/blob/master/f/sqlite.spec
-#  patch -Np1 -i ../sqlite-lemon-system-template.patch
+  patch -Np1 -i ../sqlite-lemon-system-template.patch
 
 #  autoreconf -vfi
 }

Modified: sqlite-lemon-system-template.patch
===================================================================
--- sqlite-lemon-system-template.patch	2021-01-20 19:21:32 UTC (rev 406472)
+++ sqlite-lemon-system-template.patch	2021-01-20 19:28:55 UTC (rev 406473)
@@ -1,7 +1,8 @@
-diff -up sqlite-3.6.23/tool/lemon.c.system-template sqlite-3.6.23/tool/lemon.c
---- sqlite-3.6.23/tool/lemon.c.system-template	2010-03-10 16:40:35.000000000 +0200
-+++ sqlite-3.6.23/tool/lemon.c	2010-03-10 16:40:39.000000000 +0200
-@@ -3363,6 +3363,8 @@ PRIVATE FILE *tplt_open(struct lemon *le
+diff --git a/tool/lemon.c b/tool/lemon.c
+index 54c8946..ac14a06 100644
+--- a/tool/lemon.c
++++ b/tool/lemon.c
+@@ -3668,6 +3668,8 @@ PRIVATE FILE *tplt_open(struct lemon *lemp)
      tpltname = buf;
    }else if( access(templatename,004)==0 ){
      tpltname = templatename;
@@ -8,14 +9,5 @@
 +  }else if( access("/usr/share/lemon/lempar.c", R_OK)==0){
 +    tpltname = "/usr/share/lemon/lempar.c";
    }else{
-     tpltname = pathsearch(lemp->argv0,templatename,0);
+     toFree = tpltname = pathsearch(lemp->argv0,templatename,0);
    }
-@@ -3374,7 +3376,7 @@ PRIVATE FILE *tplt_open(struct lemon *le
-   }
-   in = fopen(tpltname,"rb");
-   if( in==0 ){
--    fprintf(stderr,"Can't open the template file \"%s\".\n",templatename);
-+    fprintf(stderr,"Can't open the template file \"%s\".\n",tpltname);
-     lemp->errorcnt++;
-     return 0;
-   }