[arch-commits] Commit in sqlite3/repos (4 files)

[andyrtr at archlinux.org]

    Date: Sunday, October 19, 2008 @ 16:21:47
  Author: andyrtr
Revision: 15993

Merged revisions 15967 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/sqlite3/trunk

........
  r15967 | andyrtr | 2008-10-19 19:55:36 +0000 (So, 19 Okt 2008) | 1 line
  
  upgpkg: sqlite3 3.6.4-1
........

Modified:
  sqlite3/repos/extra-i686/	(properties)
  sqlite3/repos/extra-i686/PKGBUILD
Deleted:
  sqlite3/repos/extra-i686/sqlite-3.5.8-pkgconfig-version.patch
  sqlite3/repos/extra-i686/tclsqlite.patch

--------------------------------------+
 PKGBUILD                             |   12 +++---------
 sqlite-3.5.8-pkgconfig-version.patch |   12 ------------
 tclsqlite.patch                      |   20 --------------------
 3 files changed, 3 insertions(+), 41 deletions(-)


Property changes on: sqlite3/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /sqlite3/trunk:1-14886
   + /sqlite3/trunk:1-15992

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-19 20:11:37 UTC (rev 15992)
+++ extra-i686/PKGBUILD	2008-10-19 20:21:47 UTC (rev 15993)
@@ -3,8 +3,8 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=sqlite3
-pkgver=3.6.3
-pkgrel=2
+pkgver=3.6.4
+pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -14,19 +14,13 @@
 conflicts=('sqlite')
 replaces=('sqlite')
 source=(http://www.sqlite.org/sqlite-$pkgver.tar.gz
-	sqlite-3.5.8-pkgconfig-version.patch
-	tclsqlite.patch
 	license.txt)
 options=(!libtool)
-md5sums=('671d2715f33158abc47a7a2ddd6066c5'
-         '025965a176173eaf21877f6daed088d4'
-         'fb443dfba2aeb1d4cd07212bb64c534c'
+md5sums=('b9832cd8734d4568e384e1c60b50c92f'
          'c1cdbc5544034d9012e421e75a5e4890')
 
 build() {
   cd ${srcdir}/sqlite-${pkgver}
-  patch -Np1 -i ${srcdir}/sqlite-3.5.8-pkgconfig-version.patch || return 1
-  patch -Np1 -i ${srcdir}/tclsqlite.patch || return 1
   ./configure --prefix=/usr --enable-threadsafe  --disable-static || return 1
   make || return 1
   make DESTDIR=${pkgdir} install

Deleted: extra-i686/sqlite-3.5.8-pkgconfig-version.patch
===================================================================
--- extra-i686/sqlite-3.5.8-pkgconfig-version.patch	2008-10-19 20:11:37 UTC (rev 15992)
+++ extra-i686/sqlite-3.5.8-pkgconfig-version.patch	2008-10-19 20:21:47 UTC (rev 15993)
@@ -1,12 +0,0 @@
-diff -up sqlite-3.5.8/sqlite3.pc.in.release sqlite-3.5.8/sqlite3.pc.in
---- sqlite-3.5.8/sqlite3.pc.in.release	2008-04-23 09:11:38.000000000 +0300
-+++ sqlite-3.5.8/sqlite3.pc.in	2008-04-23 09:11:48.000000000 +0300
-@@ -7,7 +7,7 @@ includedir=@includedir@
- 
- Name: SQLite
- Description: SQL database engine
--Version: @VERSION@
-+Version: @RELEASE@
- Libs: -L${libdir} -lsqlite3
- Libs.private: @LIBS@
- Cflags: -I${includedir}

Deleted: extra-i686/tclsqlite.patch
===================================================================
--- extra-i686/tclsqlite.patch	2008-10-19 20:11:37 UTC (rev 15992)
+++ extra-i686/tclsqlite.patch	2008-10-19 20:21:47 UTC (rev 15993)
@@ -1,20 +0,0 @@
-diff -Naur sqlite-3.6.3-old/src/tclsqlite.c sqlite-3.6.3/src/tclsqlite.c
---- sqlite-3.6.3-old/src/tclsqlite.c	2008-09-09 22:31:34.000000000 +1000
-+++ sqlite-3.6.3/src/tclsqlite.c	2008-10-11 14:32:34.000000000 +1000
-@@ -1343,11 +1343,11 @@
-       Tcl_AppendResult(interp,"Error: non-null separator required for copy",0);
-       return TCL_ERROR;
-     }
--    if(sqlite3StrICmp(zConflict, "rollback") != 0 &&
--       sqlite3StrICmp(zConflict, "abort"   ) != 0 &&
--       sqlite3StrICmp(zConflict, "fail"    ) != 0 &&
--       sqlite3StrICmp(zConflict, "ignore"  ) != 0 &&
--       sqlite3StrICmp(zConflict, "replace" ) != 0 ) {
-+    if(strcmp(zConflict, "rollback") != 0 &&
-+       strcmp(zConflict, "abort"   ) != 0 &&
-+       strcmp(zConflict, "fail"    ) != 0 &&
-+       strcmp(zConflict, "ignore"  ) != 0 &&
-+       strcmp(zConflict, "replace" ) != 0 ) {
-       Tcl_AppendResult(interp, "Error: \"", zConflict, 
-             "\", conflict-algorithm must be one of: rollback, "
-             "abort, fail, ignore, or replace", 0);