Browse Source

upgrading package: sqlite 3.7.9.0 -> 3.7.10.0

Ralf S. Engelschall 14 years ago
parent
commit
6c45e17b58
2 changed files with 36 additions and 23 deletions
  1. 33 20
      sqlite/sqlite.patch
  2. 3 3
      sqlite/sqlite.spec

+ 33 - 20
sqlite/sqlite.patch

@@ -1,6 +1,6 @@
 Index: Makefile.in
---- Makefile.in.orig	2011-11-01 13:31:18.000000000 +0100
-+++ Makefile.in	2011-11-03 09:34:18.000000000 +0100
+--- Makefile.in.orig	2012-01-16 15:04:50.000000000 +0100
++++ Makefile.in	2012-01-17 19:18:40.000000000 +0100
 @@ -188,6 +188,21 @@
  #
  LIBOBJ = $(LIBOBJS$(USE_AMALGAMATION))
@@ -32,7 +32,7 @@ Index: Makefile.in
  
  
  # Generated source code files
-@@ -856,6 +873,8 @@
+@@ -862,6 +879,8 @@
  rtree.lo:	$(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
  	$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/rtree/rtree.c
  
@@ -42,23 +42,24 @@ Index: Makefile.in
  # Rules to build the 'testfixture' application.
  #
 Index: configure
---- configure.orig	2011-11-01 13:31:18.000000000 +0100
-+++ configure	2011-11-03 09:34:45.000000000 +0100
-@@ -5979,10 +5979,7 @@
- if $ac_preproc_ok; then :
- 
+--- configure.orig	2012-01-16 15:04:50.000000000 +0100
++++ configure	2012-01-17 19:18:40.000000000 +0100
+@@ -6008,11 +6008,7 @@
+ if $ac_preproc_ok; then
+   :
  else
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details" "$LINENO" 5 ; }
-+    :
+-  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++  :
  fi
  
  ac_ext=c
 Index: ext/regexp/regexp.c
---- ext/regexp/regexp.c.orig	2011-11-03 09:34:22.000000000 +0100
-+++ ext/regexp/regexp.c	2011-11-03 09:34:22.000000000 +0100
+--- ext/regexp/regexp.c.orig	2012-01-17 19:18:40.000000000 +0100
++++ ext/regexp/regexp.c	2012-01-17 19:18:40.000000000 +0100
 @@ -0,0 +1,147 @@
 +/*
 + * SQLite REGEXP(regex, string) function
@@ -208,8 +209,8 @@ Index: ext/regexp/regexp.c
 +#endif
 +
 Index: sqlite3.pc.in
---- sqlite3.pc.in.orig	2011-11-01 13:31:18.000000000 +0100
-+++ sqlite3.pc.in	2011-11-03 09:34:22.000000000 +0100
+--- sqlite3.pc.in.orig	2012-01-16 15:04:49.000000000 +0100
++++ sqlite3.pc.in	2012-01-17 19:18:40.000000000 +0100
 @@ -8,6 +8,5 @@
  Name: SQLite
  Description: SQL database engine
@@ -219,9 +220,9 @@ Index: sqlite3.pc.in
 +Libs: -L${libdir} -lsqlite3 @LIBS@
  Cflags: -I${includedir}
 Index: src/main.c
---- src/main.c.orig	2011-11-01 13:31:18.000000000 +0100
-+++ src/main.c	2011-11-03 09:34:22.000000000 +0100
-@@ -2257,6 +2257,13 @@
+--- src/main.c.orig	2012-01-16 15:04:50.000000000 +0100
++++ src/main.c	2012-01-17 19:18:40.000000000 +0100
+@@ -2286,6 +2286,13 @@
    }
  #endif
  
@@ -235,3 +236,15 @@ Index: src/main.c
    sqlite3Error(db, rc, 0);
  
    /* -DSQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking
+Index: src/mem1.c
+--- src/mem1.c.orig	2012-01-16 15:04:50.000000000 +0100
++++ src/mem1.c	2012-01-17 19:20:27.000000000 +0100
+@@ -59,7 +59,7 @@
+ #define SQLITE_REALLOC(x,y) realloc((x),(y))
+ 
+ #ifdef HAVE_MALLOC_USABLE_SIZE
+-#include <malloc.h>
++#include <stdlib.h>
+ #define SQLITE_MALLOCSIZE(x) malloc_usable_size(x)
+ #else
+ #undef SQLITE_MALLOCSIZE

+ 3 - 3
sqlite/sqlite.spec

@@ -22,8 +22,8 @@
 ##
 
 #   package version
-%define       V_sqlite   3.7.9.0
-%define       V_dist     3070900
+%define       V_sqlite   3.7.10.0
+%define       V_dist     3071000
 %define       V_odbc     0.93
 %define       V_jdbc     20110827
 
@@ -38,7 +38,7 @@ Class:        BASE
 Group:        Database
 License:      PD
 Version:      %{V_sqlite}
-Release:      20111116
+Release:      20120117
 
 #   package options
 %option       with_debug           no