diff options
| -rw-r--r-- | data/javasqlite/_metadata/version | 2 | ||||
| -rw-r--r-- | data/javasqlite/dylib.diff | 30 | ||||
| -rw-r--r-- | data/javasqlite/javasqlite-20071108.tar.gz | bin | 354808 -> 0 bytes | |||
| -rw-r--r-- | data/javasqlite/javasqlite-20080130.tar.gz | bin | 0 -> 358195 bytes | |||
| -rw-r--r-- | data/javasqlite/make.sh | 4 | ||||
| -rw-r--r-- | data/javasqlite/null16.diff | 14 | ||||
| -rw-r--r-- | data/javasqlite/port.diff | 14 | ||||
| -rw-r--r-- | data/javasqlite/typo.diff | 12 |
8 files changed, 42 insertions, 34 deletions
diff --git a/data/javasqlite/_metadata/version b/data/javasqlite/_metadata/version index c30809d4c..134ca3130 100644 --- a/data/javasqlite/_metadata/version +++ b/data/javasqlite/_metadata/version @@ -1 +1 @@ -20071108 +20080130 diff --git a/data/javasqlite/dylib.diff b/data/javasqlite/dylib.diff index b921f9117..e4e306e42 100644 --- a/data/javasqlite/dylib.diff +++ b/data/javasqlite/dylib.diff @@ -1,15 +1,15 @@ -diff -ru javasqlite-20071108/configure.in javasqlite-20071108+iPhone/configure.in ---- javasqlite-20071108/configure.in 2007-10-25 06:29:14.000000000 +0000 -+++ javasqlite-20071108+iPhone/configure.in 2007-11-22 05:04:05.000000000 +0000 -@@ -155,6 +155,11 @@ - SQLITE3_LIB="$i/lib/libsqlite3.la" - SQLITE3_LIBDIR="$i/lib" - break -+ elif test -r $i/lib/libsqlite3.dylib ; then -+ SQLITE3_INC="$i/include" -+ SQLITE3_LIB="$i/lib/libsqlite3.dylib" -+ SQLITE3_LIBDIR="$i/lib" -+ break; - elif test -r $i/lib/libsqlite3.a ; then - SQLITE3_INC="$i/include" - SQLITE3_LIB="$i/lib/libsqlite3.a" +diff -ru javasqlite-20080130/configure.in javasqlite-20080130+iPhone/configure.in +--- javasqlite-20080130/configure.in 2008-01-07 18:21:33.000000000 +0000 ++++ javasqlite-20080130+iPhone/configure.in 2008-03-11 02:53:50.000000000 +0000 +@@ -166,6 +166,11 @@ + SQLITE3_LIB="$i/$lib/libsqlite3.a" + SQLITE3_LIBDIR="$i/$lib" + break ++ elif test -r $i/$lib/libsqlite3.dylib ; then ++ SQLITE3_INC="$i/include" ++ SQLITE3_LIB="-lsqlite3" ++ SQLITE3_LIBDIR="$i/$lib" ++ break + elif test -r $i/$lib/libsqlite3.so ; then + SQLITE3_INC="$i/include" + SQLITE3_LIB="-lsqlite3" diff --git a/data/javasqlite/javasqlite-20071108.tar.gz b/data/javasqlite/javasqlite-20071108.tar.gz Binary files differdeleted file mode 100644 index ffebc0576..000000000 --- a/data/javasqlite/javasqlite-20071108.tar.gz +++ /dev/null diff --git a/data/javasqlite/javasqlite-20080130.tar.gz b/data/javasqlite/javasqlite-20080130.tar.gz Binary files differnew file mode 100644 index 000000000..39d23e96d --- /dev/null +++ b/data/javasqlite/javasqlite-20080130.tar.gz diff --git a/data/javasqlite/make.sh b/data/javasqlite/make.sh index 327a45dbc..9b67a553f 100644 --- a/data/javasqlite/make.sh +++ b/data/javasqlite/make.sh @@ -1,5 +1,5 @@ -tar -zxvf "${PKG_DATA}/javasqlite-20071108.tar.gz" -cd javasqlite-20071108 +pkg:extract +cd * pkg:patch autoconf pkg:configure --with-sqlite="${PKG_ROOT}/usr" --with-sqlite3="${PKG_ROOT}/usr" diff --git a/data/javasqlite/null16.diff b/data/javasqlite/null16.diff index 64c2905c0..a61aaa56c 100644 --- a/data/javasqlite/null16.diff +++ b/data/javasqlite/null16.diff @@ -1,7 +1,7 @@ -diff -ru javasqlite-20071108/native/sqlite_jni.c javasqlite-20071108+iPhone/native/sqlite_jni.c ---- javasqlite-20071108/native/sqlite_jni.c 2007-10-27 06:58:54.000000000 +0000 -+++ javasqlite-20071108+iPhone/native/sqlite_jni.c 2008-02-06 01:18:37.000000000 +0000 -@@ -3346,6 +3346,8 @@ +diff -ru javasqlite-20080130/native/sqlite_jni.c javasqlite-20080130+iPhone/native/sqlite_jni.c +--- javasqlite-20080130/native/sqlite_jni.c 2008-01-29 09:23:25.000000000 +0000 ++++ javasqlite-20080130+iPhone/native/sqlite_jni.c 2008-03-10 23:15:41.000000000 +0000 +@@ -3360,6 +3360,8 @@ jsize len16; const jchar *sql16, *tail = 0; int ret; @@ -10,7 +10,7 @@ diff -ru javasqlite-20071108/native/sqlite_jni.c javasqlite-20071108+iPhone/nati if (!h) { throwclosed(env); -@@ -3371,11 +3373,15 @@ +@@ -3385,11 +3387,15 @@ } h->env = env; sql16 = (*env)->GetStringChars(env, sql, 0); @@ -28,7 +28,7 @@ diff -ru javasqlite-20071108/native/sqlite_jni.c javasqlite-20071108+iPhone/nati (sqlite3_stmt **) &svm, (const void **) &tail); #endif if (ret != SQLITE_OK) { -@@ -3387,22 +3393,23 @@ +@@ -3401,22 +3407,23 @@ if (ret != SQLITE_OK) { const char *err = sqlite3_errmsg(h->sqlite); @@ -56,7 +56,7 @@ diff -ru javasqlite-20071108/native/sqlite_jni.c javasqlite-20071108+iPhone/nati sqlite3_finalize((sqlite3_stmt *) svm); throwoom(env, "unable to get SQLite handle"); return; -@@ -3418,7 +3425,7 @@ +@@ -3432,7 +3439,7 @@ memcpy(v->tail, tail, len16); len16 /= sizeof (jchar); ((jchar *) v->tail)[len16 - 1] = 0; diff --git a/data/javasqlite/port.diff b/data/javasqlite/port.diff index fc4036f43..086fdcfba 100644 --- a/data/javasqlite/port.diff +++ b/data/javasqlite/port.diff @@ -1,12 +1,8 @@ -diff -ru javasqlite-20071108/Makefile.in javasqlite-20071108+iPhone/Makefile.in ---- javasqlite-20071108/Makefile.in 2007-10-25 06:30:12.000000000 +0000 -+++ javasqlite-20071108+iPhone/Makefile.in 2008-03-03 06:42:20.000000000 +0000 -@@ -122,12 +122,12 @@ - - libsqlite_jni.la: sqlite_jni.lo - $(LIBTOOL) $(CC) -o libsqlite_jni.la sqlite_jni.lo \ -- -rpath $(NATIVE_LIB_DIR) $(LIBS) -+ $(LIBS) +diff -ru javasqlite-20080130/Makefile.in javasqlite-20080130+iPhone/Makefile.in +--- javasqlite-20080130/Makefile.in 2008-01-07 18:14:29.000000000 +0000 ++++ javasqlite-20080130+iPhone/Makefile.in 2008-03-11 02:54:34.000000000 +0000 +@@ -126,9 +126,9 @@ + -rpath $(NATIVE_LIB_DIR) $(LIBS) native/mkconst: native/mkconst.c - $(LIBTOOL) $(CC) $(SQLITE_INC) $(SQLITE3_INC) \ diff --git a/data/javasqlite/typo.diff b/data/javasqlite/typo.diff new file mode 100644 index 000000000..b0575f776 --- /dev/null +++ b/data/javasqlite/typo.diff @@ -0,0 +1,12 @@ +diff -ru javasqlite-20080130/SQLite/JDBC2z/JDBCResultSet.java javasqlite-20080130+iPhone/SQLite/JDBC2z/JDBCResultSet.java +--- javasqlite-20080130/SQLite/JDBC2z/JDBCResultSet.java 2008-01-08 10:03:08.000000000 +0000 ++++ javasqlite-20080130+iPhone/SQLite/JDBC2z/JDBCResultSet.java 2008-03-11 02:55:52.000000000 +0000 +@@ -74,7 +74,7 @@ + public JDBCResultSet(SQLite.TableResult tr, JDBCStatement s) { + this.tr = tr; + this.s = s; +- this.m = null; ++ this.md = null; + this.lastg = null; + this.row = -1; + this.updatable = UPD_UNKNOWN; |