From 00de13b8097341c961d8d71667ba9fd5a17cd367 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 9 Dec 2010 12:39:21 +0000 Subject: [PATCH] 2010-12-09 13:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) - contrib/3rd/sqlite3/sqlite3ext.h + contrib/3rd/sqlite3/sqlite3x.h - contrib/3rd/sqlite3/sqlite3.dif * contrib/3rd/sqlite3/sqlite3.hbp ! Fixed original source URL to point to new version. ! Fixed to rename newly added header with long filename to 8.3. And this pretty much defeats its whole purpose, and I can't see a reson to host this file in SVN, sincet the sole purpose of this locally hosted source is to serve as dependency for _Harbour sources_. Other non-Harbour sources should not use this source, therefore hosting sqlite3ext.h has no point until Harbour SVN itself needs it. (and in such case our own code should refer to it using short filename) ! Updated .dif, which means deletion, since sqlite team applied this patch. --- harbour/ChangeLog | 17 +++++++++++++++++ harbour/contrib/3rd/sqlite3/sqlite3.dif | 12 ------------ harbour/contrib/3rd/sqlite3/sqlite3.hbp | 6 +++--- .../3rd/sqlite3/{sqlite3ext.h => sqlite3x.h} | 0 4 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 harbour/contrib/3rd/sqlite3/sqlite3.dif rename harbour/contrib/3rd/sqlite3/{sqlite3ext.h => sqlite3x.h} (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e9ebb2772f..f572205211 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,23 @@ The license applies to all entries newer than 2009-04-28. */ +2010-12-09 13:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + - contrib/3rd/sqlite3/sqlite3ext.h + + contrib/3rd/sqlite3/sqlite3x.h + - contrib/3rd/sqlite3/sqlite3.dif + * contrib/3rd/sqlite3/sqlite3.hbp + ! Fixed original source URL to point to new version. + ! Fixed to rename newly added header with long filename to 8.3. + And this pretty much defeats its whole purpose, and + I can't see a reson to host this file in SVN, + sincet the sole purpose of this locally hosted source is + to serve as dependency for _Harbour sources_. Other non-Harbour + sources should not use this source, therefore hosting sqlite3ext.h + has no point until Harbour SVN itself needs it. (and in such + case our own code should refer to it using short filename) + ! Updated .dif, which means deletion, since sqlite team + applied this patch. + 2010-12-09 11:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hblzf/hblzf.c * contrib/hblzf/tests/test.prg diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.dif b/harbour/contrib/3rd/sqlite3/sqlite3.dif deleted file mode 100644 index 36a733a6a6..0000000000 --- a/harbour/contrib/3rd/sqlite3/sqlite3.dif +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN sqlite3.orig/sqlite3.c sqlite3/sqlite3.c ---- sqlite3.orig/sqlite3.c 2010-10-07 22:36:26.000000000 +0300 -+++ sqlite3/sqlite3.c 2010-10-17 13:33:22.796875000 +0300 -@@ -27730,7 +27730,7 @@ - ** error message. - */ - static void unixDlError(sqlite3_vfs *NotUsed, int nBuf, char *zBufOut){ -- char *zErr; -+ const char *zErr; - UNUSED_PARAMETER(NotUsed); - unixEnterMutex(); - zErr = dlerror(); diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.hbp b/harbour/contrib/3rd/sqlite3/sqlite3.hbp index 6c7cabefaf..82b8d17408 100644 --- a/harbour/contrib/3rd/sqlite3/sqlite3.hbp +++ b/harbour/contrib/3rd/sqlite3/sqlite3.hbp @@ -33,9 +33,9 @@ sqlite3.c # ORIGIN http://www.sqlite.org/ # VER 3.7.4 -# URL http://www.sqlite.org/sqlite-amalgamation-3_7_3.zip -# DIFF +# URL http://www.sqlite.org/sqlite-amalgamation-3070400.zip +# DIFF # # MAP sqlite3.c # MAP sqlite3.h -# MAP sqlite3ext.h +# MAP sqlite3ext.h sqlite3x.h diff --git a/harbour/contrib/3rd/sqlite3/sqlite3ext.h b/harbour/contrib/3rd/sqlite3/sqlite3x.h similarity index 100% rename from harbour/contrib/3rd/sqlite3/sqlite3ext.h rename to harbour/contrib/3rd/sqlite3/sqlite3x.h