OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   07-Aug-2008 09:12:55
  Branch: HEAD                             Handle: 2008080708125400

  Modified files:
    openpkg-src/sqlite      sqlite.patch sqlite.spec

  Log:
    upgrading package: sqlite 3.6.0 -> 3.6.1

  Summary:
    Revision    Changes     Path
    1.56        +34 -6      openpkg-src/sqlite/sqlite.patch
    1.184       +2  -2      openpkg-src/sqlite/sqlite.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/sqlite/sqlite.patch
  ============================================================================
  $ cvs diff -u -r1.55 -r1.56 sqlite.patch
  --- openpkg-src/sqlite/sqlite.patch   17 Jul 2008 07:35:24 -0000      1.55
  +++ openpkg-src/sqlite/sqlite.patch   7 Aug 2008 07:12:54 -0000       1.56
  @@ -1,7 +1,7 @@
   Index: Makefile.in
  ---- Makefile.in.orig 2008-07-09 01:36:13 +0200
  -+++ Makefile.in      2008-07-17 09:33:03 +0200
  -@@ -172,6 +172,30 @@
  +--- Makefile.in.orig 2008-08-05 21:58:48 +0200
  ++++ Makefile.in      2008-08-07 09:09:15 +0200
  +@@ -178,6 +178,30 @@
    LIBOBJ = $(OBJS$(USE_AMALGAMATION))
    
    
  @@ -32,7 +32,7 @@
    # All of the source code files.
    #
    SRC = \
  -@@ -754,3 +778,38 @@
  +@@ -764,3 +788,38 @@
    sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
        $(TCC) -shared -o $@ sqlite3.def \
                -Wl,"--strip-all" $(REAL_LIBOBJ)
  @@ -72,8 +72,8 @@
   +    $(LTCOMPILE) -c $(TOP)/ext/rtree/rtree.c
   +
   Index: sqlite3.pc.in
  ---- sqlite3.pc.in.orig       2008-06-24 03:29:58 +0200
  -+++ sqlite3.pc.in    2008-07-17 09:32:21 +0200
  +--- sqlite3.pc.in.orig       2008-07-16 17:50:43 +0200
  ++++ sqlite3.pc.in    2008-08-07 09:09:15 +0200
   @@ -8,6 +8,5 @@
    Name: SQLite
    Description: SQL database engine
  @@ -82,3 +82,31 @@
   -Libs.private: @LIBS@
   +Libs: -L${libdir} -lsqlite3 @LIBS@
    Cflags: -I${includedir}
  +
  +-----------------------------------------------------------------------------
  +
  +Upstream Vendor CVS Patches (can be removed with SQLite 3.6.2)
  +
  +Index: src/build.c
  +--- src/build.c      2008/08/04 04:39:49     1.493
  ++++ src/build.c      2008/08/06 13:47:41     1.494
  +@@ -2136,6 +2136,7 @@
  +   ExprList *pToCol,    /* Columns in the other table */
  +   int flags            /* Conflict resolution algorithms. */
  + ){
  ++  sqlite3 *db = pParse->db;
  + #ifndef SQLITE_OMIT_FOREIGN_KEY
  +   FKey *pFKey = 0;
  +   Table *p = pParse->pNewTable;
  +@@ -2143,10 +2144,8 @@
  +   int i;
  +   int nCol;
  +   char *z;
  +-  sqlite3 *db;
  + 
  +   assert( pTo!=0 );
  +-  db = pParse->db;
  +   if( p==0 || pParse->nErr || IN_DECLARE_VTAB ) goto fk_end;
  +   if( pFromCol==0 ){
  +     int iCol = p->nCol-1;
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sqlite/sqlite.spec
  ============================================================================
  $ cvs diff -u -r1.183 -r1.184 sqlite.spec
  --- openpkg-src/sqlite/sqlite.spec    17 Jul 2008 07:35:24 -0000      1.183
  +++ openpkg-src/sqlite/sqlite.spec    7 Aug 2008 07:12:54 -0000       1.184
  @@ -22,7 +22,7 @@
   ##
   
   #   package version
  -%define       V_sqlite   3.6.0
  +%define       V_sqlite   3.6.1
   %define       V_odbc     0.77
   %define       V_jdbc     20080420
   
  @@ -37,7 +37,7 @@
   Group:        Database
   License:      PD
   Version:      %{V_sqlite}
  -Release:      20080717
  +Release:      20080807
   
   #   package options
   %option       with_debug           no
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to