Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=backporting.git;a=commitdiff;h=5c184112c17487b1b21e92c24dbc901637270907

commit 5c184112c17487b1b21e92c24dbc901637270907
Author: kikadf <[email protected]>
Date:   Sun Apr 20 12:48:16 2014 +0200

sqlite3-3.8.4-1arcturus1-x86_64

* Version bump
* Backport from -current

diff --git a/source/base/sqlite3/FrugalBuild b/source/base/sqlite3/FrugalBuild
index 5761e15..53b88d9 100644
--- a/source/base/sqlite3/FrugalBuild
+++ b/source/base/sqlite3/FrugalBuild
@@ -3,9 +3,9 @@
# Maintainer: Marius Cirsta <[email protected]>

pkgname=sqlite3
-pkgver=3.7.17
-origver=3071700
-pkgrel=1
+pkgver=3.8.4
+origver=3080400
+pkgrel=1arcturus1
pkgdesc="A C library that implements an SQL database engine"
url="http://www.sqlite.org/";
depends=('readline')
@@ -14,8 +14,15 @@ groups=('base' 'devel-core')
archs=('i686' 'x86_64' 'arm')
_F_cd_path="sqlite-$pkgver"
up2date="lynx -dump http://www.sqlite.org/ |grep Version |sed 's/.*n \(.*\) 
of.*/\1/'"
-source=(http://www.sqlite.org/2013/sqlite-src-${origver}.zip)
-sha1sums=('0b0a8676690b1e4d879643d065f771d4a1fa919f')
+#lemon and lempar files are from here: http://www.sqlite.org/src/tree?name=tool
+source=(http://www.sqlite.org/2014/sqlite-autoconf-${origver}.tar.gz
+       
http://www.sqlite.org/src/raw/tool/lemon.c?name=07aba6270d5a5016ba8107b09e431eea4ecdc123
+       
http://www.sqlite.org/src/raw/tool/lempar.c?name=01ca97f87610d1dac6d8cd96ab109ab1130e76dc
+       lemon_share.diff)
+sha1sums=('19249a798456f88b3a99ef27fa4119d08d89682f' \
+          '07aba6270d5a5016ba8107b09e431eea4ecdc123' \
+          '01ca97f87610d1dac6d8cd96ab109ab1130e76dc' \
+          '6082e8659d842237c9fc9c3edfa76ea4abc33503')

subpkgs=('lemon')
subdescs=('The Lemon program is an LALR(1) parser generator.')
@@ -25,7 +32,10 @@ subarchs=('i686 x86_64 arm')

build()
{
-       Fcd sqlite-src-${origver}
+       Fcd sqlite-autoconf-${origver}
+       mkdir lemon
+       mv ../lemon.c* ./lemon/lemon.c || Fdie
+       mv ../lempar.c* ./lemon/lempar.c || Fdie
## to see what this does see : http://www.sqlite.org/compile.html
## also tbird need that .. without it does weird crap.
export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 
-DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_SECURE_DELETE=1 
-DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_ENABLE_COLUMN_METADATA=1"
@@ -35,9 +45,10 @@ build()
--enable-tempstore=yes \
--enable-cross-thread-connections \
--enable-load-extension
+       cd lemon
+       make lemon
Fexerel /usr/bin/lemon
-       Ffilerel tool/lempar.c /usr/share/lemon/lempar.c
-       Ffilerel /usr/share/man/man1/$pkgname.1
+       Ffilerel lempar.c /usr/share/lemon/lempar.c
Frm /usr/lib/tcl8.?

Fsplit lemon /usr/share/lemon/lempar.c
diff --git a/source/base/sqlite3/lemon_share.diff 
b/source/base/sqlite3/lemon_share.diff
new file mode 100644
index 0000000..66f1d44
--- /dev/null
+++ b/source/base/sqlite3/lemon_share.diff
@@ -0,0 +1,31 @@
+--- sqlite-autoconf-3080400/lemon/lemon.c      2014-03-10 22:34:43.000000000 
+0200
++++ sqlite-autoconf-3080400.new/lemon/lemon.c  2014-03-10 22:34:14.000000000 
+0200
+@@ -3245,6 +3245,10 @@
+     tpltname = pathsearch(lemp->argv0,templatename,0);
+   }
+   if( tpltname==0 ){
++    sprintf(buf,"/usr/share/lemon/%s",templatename);
++    tpltname = buf;
++  }
++  if( tpltname==0 ){
+     fprintf(stderr,"Can't find the parser driver template file \"%s\".\n",
+     templatename);
+     lemp->errorcnt++;
+@@ -3252,9 +3256,14 @@
+   }
+   in = fopen(tpltname,"rb");
+   if( in==0 ){
+-    fprintf(stderr,"Can't open the template file \"%s\".\n",templatename);
+-    lemp->errorcnt++;
+-    return 0;
++      sprintf(buf,"/usr/share/lemon/%s",templatename);
++      tpltname = buf;
++      in = fopen(tpltname,"rb");
++    if( in==0 ){
++      fprintf(stderr,"Can't open the template file \"%s\".\n",tpltname);
++      lemp->errorcnt++;
++      return 0;
++    }
+   }
+   return in;
+ }
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to