From: SeungYeup Kim Date: Tue, 21 Aug 2012 10:55:27 +0000 (+0900) Subject: tizen 2.0 merge X-Git-Tag: 2.0_alpha^0 X-Git-Url: http://review.tizen.org/git/?p=framework%2Fbase%2Fsqlite3.git;a=commitdiff_plain;h=9f913f309161a9126b0a311084ac26c11f76f03d tizen 2.0 merge --- diff --git a/Makefile.am b/Makefile.am index 524059c..9281e4d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE +AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE -DSQLITE_DEFAULT_AUTOVACUUM=1 -DSQLITE_DEFAULT_PAGE_SIZE=4096 -DSQLITE_SLP_FEATURE lib_LTLIBRARIES = libsqlite3.la libsqlite3_la_SOURCES = sqlite3.c diff --git a/debian/changelog b/debian/changelog index 0d698b0..494f371 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,153 @@ -sqlite3 (3.7.9-slp1) unstable; urgency=low +sqlite3 (3.7.9-3slp2) unstable; urgency=low + + * apply SQLITE_DEFAULT_AUTOVACUUM=1 + * apply SQLITE_THREADSAFE=1 + * move some compile option from rule file to makefile + * Git: slp/unmodified/sqlite3 + * Tag: sqlite3_3.7.9-3slp2 + + -- Hyungdeuk Kim Sat, 17 Mar 2012 18:20:40 +0900 + +sqlite3 (3.7.9-1slp2) unstable; urgency=low + + * define fdatasync option + * Git: 165.213.180.234:slp/unmodified/sqlite3 + * Tag: sqlite3_3.7.9-1slp2 + + -- Hyungdeuk Kim Fri, 11 Nov 2011 20:00:40 +0900 + +sqlite3 (3.7.9-0slp2) unstable; urgency=low + + * upgrade sqlite3 3.7.9 + * Git: 165.213.180.234:slp/unmodified/sqlite3 + * Tag: sqlite3_3.7.9-0slp2 + + -- Hyungdeuk Kim Mon, 07 Nov 2011 14:00:40 +0900 + +sqlite3 (3.7.7.1-3slp2) unstable; urgency=low + + * insert SLP Feature code to change default journalmode to 'PERSIST' + * delete code to omit 'sqlite3ReadSchema' at sqlite3Pragma + * Git: 165.213.180.234:slp/unmodified/sqlite3 + * Tag: sqlite3_3.7.7.1-3slp2 + + -- Hyungdeuk Kim Mon, 31 Oct 2011 09:00:40 +0900 + +sqlite3 (3.7.7.1-2slp2) unstable; urgency=low + + * update tag version & fix wrong changelog infor + * Git: 165.213.180.234:slp/unmodified/sqlite3 + * Tag: sqlite3_3.7.7.1-2slp2 + + -- Hyungdeuk Kim Mon, 17 Oct 2011 14:00:40 +0900 + +sqlite3 (3.7.7.1-1slp2) unstable; urgency=low + + * set SQLITE_OMIT_AUTOVACUUM & SQLITE_DEFAULT_PAGE_SIZE=4096 + * Git: 165.213.180.234:slp/unmodified/sqlite3 + * Tag: sqlite3_3.7.7.1-1slp2 + + -- Hyungdeuk Kim Mon, 17 Oct 2011 13:30:40 +0900 + +sqlite3 (3.7.7.1-0slp2) unstable; urgency=low + + * upgrade sqlite3 3.7.7.1 + * disable read schema in case of changing journal mode + * Git: 165.213.180.234:slp/unmodified/sqlite3 + * Tag: sqlite3_3.7.7.1-0slp2 + + -- Hyungdeuk Kim Tue, 4 Oct 2011 16:30:40 +0900 + +sqlite3 (3.7.5-2slp2) unstable; urgency=low + + * remove automatically generated files + * Git: 165.213.180.234:slp/unmodified/sqlite3 + * Tag: sqlite3_3.7.5-2slp2 + + -- Hyungdeuk Kim Mon, 30 Apr 2011 12:30:40 +0900 + +sqlite3 (3.7.5-1slp2) unstable; urgency=low + + * modify build dependency for sbs + * Git: 165.213.180.234:slp/unmodified/sqlite3 + * Tag: sqlite3_3.7.5-1slp2 + + -- Jinkun Jang Mon, 11 Apr 2011 12:30:40 +0900 + +sqlite3 (3.7.5-0slp2) unstable; urgency=low + + * upgrade sqlite3 3.7.5 + * Git: 165.213.180.234:slp/unmodified/sqlite3 + * Tag: sqlite3_3.7.5-0slp2 + + -- Jinkun Jang Mar, 11 Dec 2011 11:00:40 +0900 + +sqlite3 (3.7.4-0slp2) unstable; urgency=low + + * upgrade sqlite3 3.7.4 + * Git: 165.213.180.234:slp/unmodified/sqlite3 + * Tag: sqlite3_3.7.4-0slp2 + + -- Jinkun Jang Wed, 29 Dec 2010 11:00:40 +0900 + +sqlite3 (3.6.23.1-3slp2) unstable; urgency=low + + * add SQLITE_ENABLE_MEMORY_MANAGEMENT compile option + * Git: 165.213.180.234:slp/unmodified/sqlite3 + * Tag: sqlite3_3.6.23.1-3slp2 + + -- Jinkun Jang Thu, 23 Dec 2010 19:00:40 +0900 + +sqlite3 (3.6.23.1-2slp2) unstable; urgency=low + + * add maintainer + + -- Jinkun Jang Thu, 08 Jul 2010 15:53:06 +0900 + +sqlite3 (3.6.23.1-1slp2) unstable; urgency=low + + * SQLite3 Version update + + -- jinkun.jang Mon, 05 Jul 2010 11:12:28 +0900 + +sqlite3 (3.6.23-2slp2) unstable; urgency=low + + * modify version information + + -- jinkun.jang Thu, 25 Mar 2010 16:10:00 +0900 + +sqlite3 (3.6.23-1) unstable; urgency=low + + * SQLite3 Version update + + -- Sangjung Woo Tue, 16 Mar 2010 11:30:59 +0900 + +sqlite3 (3.6.21-2) unstable; urgency=low + + * Add Debug package + + -- Sangjung Woo Thu, 21 Jan 2010 11:30:59 +0900 + +sqlite3 (3.6.21-1) unstable; urgency=low + + * SQLite3 Library Version upgrade. Modify compile option to run arm scratchbox environment. + + -- Sangjung Woo Mon, 16 Nov 2009 12:59:59 +0900 + +sqlite3 (3.6.1-3) unstable; urgency=low + + * enable dh_makeshlip in rule file + + -- jongmin lee Mon, 16 Nov 2009 12:59:59 +0900 + +sqlite3 (3.6.1-2) unstable; urgency=low + + * Resolve build break + + -- jongmin lee Thu, 12 Nov 2009 22:14:00 +0900 + +sqlite3 (3.6.1-1) unstable; urgency=low * Initial Release - * Git : unmodified/sqlite3 - * Tag : sqlite3_3.7.9-slp1 - -- Hyungdeuk Kim Wed, 7 Dec 2011 20:00:40 +0900 + -- jongmin lee Tue, 10 Nov 2009 22:48:13 +0000 diff --git a/debian/rules b/debian/rules index fd23a60..3ff04c5 100755 --- a/debian/rules +++ b/debian/rules @@ -26,6 +26,8 @@ else CFLAGS += -O2 endif +#CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_MEMORY_MANAGEMENT + configure: configure.ac ./autogen.sh diff --git a/packaging/sqlite3.spec b/packaging/sqlite.spec similarity index 91% rename from packaging/sqlite3.spec rename to packaging/sqlite.spec index c354075..4fab3ef 100644 --- a/packaging/sqlite3.spec +++ b/packaging/sqlite.spec @@ -1,11 +1,11 @@ -Name: sqlite3 +Name: sqlite Summary: Library that implements an embeddable SQL database engine Version: 3.7.9 -%define tar_ver 3070900 -Release: 1 +Release: 3 Group: Applications/Databases License: Public Domain URL: http://www.sqlite.org/download.html +#%define tar_ver 3070900 #Source: http://www.sqlite.org/sqlite-autoconf-%{tar_ver}.tar.gz Source: %{name}-%{version}.tar.gz Requires(post): /sbin/ldconfig @@ -38,7 +38,7 @@ to install %{name}-devel. %build %reconfigure --prefix=%{_prefix} \ - CFLAGS="$RPM_OPT_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_MEMORY_MANAGEMENT" \ + CFLAGS="$RPM_OPT_FLAGS " \ --enable-shared=yes \ --enable-static=no \ --enable-threadsafe diff --git a/packaging/unused b/packaging/unused deleted file mode 100644 index 5364927..0000000 --- a/packaging/unused +++ /dev/null @@ -1 +0,0 @@ -this package is not used in OBS diff --git a/sqlite3.c b/sqlite3.c index 3f5ce2b..f3820af 100644 --- a/sqlite3.c +++ b/sqlite3.c @@ -41863,6 +41863,10 @@ SQLITE_PRIVATE int sqlite3PagerOpen( pPager->journalMode = PAGER_JOURNALMODE_OFF; }else if( memDb ){ pPager->journalMode = PAGER_JOURNALMODE_MEMORY; +#ifdef SQLITE_SLP_FEATURE + }else { + pPager->journalMode = PAGER_JOURNALMODE_PERSIST; +#endif } /* pPager->xBusyHandler = 0; */ /* pPager->pBusyHandlerArg = 0; */