Prepare release of wxSQLite3 4.7.7

- Update to SQLite3 Multiple Ciphers 1.3.8 (based on SQLite 3.38.0)
utelle · Feb 26, 2022 · bb39806 · bb39806
1 parent 37ddecb
commit bb39806
Show file tree

Hide file tree

Showing 23 changed files with 235 additions and 210 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -11,7 +11,8 @@ X86_FLAGS =
 endif
 
 if HOST_ARM
-ARM_FLAGS = -march=native 
+#ARM_FLAGS = -march=native 
+ARM_FLAGS =
 else
 ARM_FLAGS =
 endif
@@ -24,11 +25,9 @@ AM_CXXFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src $(WX_CXXFLAGS)
 AM_CFLAGS   = -I$(top_srcdir)/include -I$(top_srcdir)/src $(WX_CXXFLAGS)
 
 AM_CXXFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_USER_AUTHENTICATION=1
-AM_CFLAGS += -std=c99 -DSQLITE_THREADSAFE=1 -DSQLITE_DQS=0 -DSQLITE_MAX_ATTACHED=10 -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1 -DSQLITE_SOUNDEX=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_DESERIALIZE=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_ENABLE_JSON1=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_GEOPOLY=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_EXTFUNC=1 -DSQLITE_ENABLE_MATH_FUNCTIONS=1 -DSQLITE_ENABLE_CSV=1 -DSQLITE_ENABLE_VSV=1 -DSQLITE_ENABLE_SHA3=1 -DSQLITE_ENABLE_CARRAY=1 -DSQLITE_ENABLE_FILEIO=1 -DSQLITE_ENABLE_SERIES=1 -DSQLITE_ENABLE_UUID=1 -DSQLITE_ENABLE_REGEXP=1 -DSQLITE_TEMP_STORE=2 -DSQLITE_USE_URI=1 -DSQLITE_USER_AUTHENTICATION=1 $(X86_FLAGS) $(ARM_FLAGS)
+AM_CFLAGS += -std=c99 -DSQLITE_THREADSAFE=1 -DSQLITE_DQS=0 -DSQLITE_MAX_ATTACHED=10 -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1 -DSQLITE_SOUNDEX=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_DESERIALIZE=1 -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_GEOPOLY=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_EXTFUNC=1 -DSQLITE_ENABLE_MATH_FUNCTIONS=1 -DSQLITE_ENABLE_CSV=1 -DSQLITE_ENABLE_VSV=1 -DSQLITE_ENABLE_SHA3=1 -DSQLITE_ENABLE_CARRAY=1 -DSQLITE_ENABLE_FILEIO=1 -DSQLITE_ENABLE_SERIES=1 -DSQLITE_ENABLE_UUID=1 -DSQLITE_ENABLE_REGEXP=1 -DSQLITE_TEMP_STORE=2 -DSQLITE_USE_URI=1 -DSQLITE_USER_AUTHENTICATION=1 $(X86_FLAGS) $(ARM_FLAGS)
 
-if HAVE_LIBDL
 AM_LDFLAGS = -pthread -ldl -lm
-endif
 
 LDADD = lib@WXSQLITE3_LIBNAME@.la $(WX_LIBS)
 

diff --git a/build/wxsqlite3.make b/build/wxsqlite3.make
diff --git a/build/wxsqlite3_mono.make b/build/wxsqlite3_mono.make
diff --git a/build/wxsqlite3_vc10_wxsqlite3.vcxproj b/build/wxsqlite3_vc10_wxsqlite3.vcxproj
diff --git a/build/wxsqlite3_vc10_wxsqlite3.vcxproj.filters b/build/wxsqlite3_vc10_wxsqlite3.vcxproj.filters
@@ -24,6 +24,9 @@
     <ClInclude Include="..\src\sqlite3mc_amalgamation.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\sqlite3mc_config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\sqlite3mc_amalgamation.c">

diff --git a/build/wxsqlite3_vc11_wxsqlite3.vcxproj b/build/wxsqlite3_vc11_wxsqlite3.vcxproj
diff --git a/build/wxsqlite3_vc11_wxsqlite3.vcxproj.filters b/build/wxsqlite3_vc11_wxsqlite3.vcxproj.filters
@@ -24,6 +24,9 @@
     <ClInclude Include="..\src\sqlite3mc_amalgamation.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\sqlite3mc_config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\sqlite3mc_amalgamation.c">

diff --git a/build/wxsqlite3_vc12_wxsqlite3.vcxproj b/build/wxsqlite3_vc12_wxsqlite3.vcxproj
diff --git a/build/wxsqlite3_vc12_wxsqlite3.vcxproj.filters b/build/wxsqlite3_vc12_wxsqlite3.vcxproj.filters
@@ -24,6 +24,9 @@
     <ClInclude Include="..\src\sqlite3mc_amalgamation.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\sqlite3mc_config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\sqlite3mc_amalgamation.c">

diff --git a/build/wxsqlite3_vc14_wxsqlite3.vcxproj b/build/wxsqlite3_vc14_wxsqlite3.vcxproj
diff --git a/build/wxsqlite3_vc14_wxsqlite3.vcxproj.filters b/build/wxsqlite3_vc14_wxsqlite3.vcxproj.filters
@@ -24,6 +24,9 @@
     <ClInclude Include="..\src\sqlite3mc_amalgamation.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\sqlite3mc_config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\sqlite3mc_amalgamation.c">

diff --git a/build/wxsqlite3_vc15_wxsqlite3.vcxproj b/build/wxsqlite3_vc15_wxsqlite3.vcxproj
diff --git a/build/wxsqlite3_vc15_wxsqlite3.vcxproj.filters b/build/wxsqlite3_vc15_wxsqlite3.vcxproj.filters
@@ -24,6 +24,9 @@
     <ClInclude Include="..\src\sqlite3mc_amalgamation.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\sqlite3mc_config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\sqlite3mc_amalgamation.c">

diff --git a/build/wxsqlite3_vc16_wxsqlite3.vcxproj b/build/wxsqlite3_vc16_wxsqlite3.vcxproj
diff --git a/build/wxsqlite3_vc16_wxsqlite3.vcxproj.filters b/build/wxsqlite3_vc16_wxsqlite3.vcxproj.filters
@@ -24,6 +24,9 @@
     <ClInclude Include="..\src\sqlite3mc_amalgamation.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\sqlite3mc_config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\sqlite3mc_amalgamation.c">

diff --git a/build/wxsqlite3_vc17_wxsqlite3.vcxproj b/build/wxsqlite3_vc17_wxsqlite3.vcxproj
diff --git a/build/wxsqlite3_vc17_wxsqlite3.vcxproj.filters b/build/wxsqlite3_vc17_wxsqlite3.vcxproj.filters
@@ -24,6 +24,9 @@
     <ClInclude Include="..\src\sqlite3mc_amalgamation.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\sqlite3mc_config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\sqlite3mc_amalgamation.c">

diff --git a/configure.ac b/configure.ac
@@ -1,10 +1,10 @@
 dnl Process this script with autoconf to create configure for wxsqlite3 library
 dnl
-dnl Copyright (C) 2017-2022 Ulrich Telle <ulrich@telle-online.de>, Vadim Zeitlin <vadim@wxwidgets.org>
+dnl Copyright (C) 2017-2021 Ulrich Telle <ulrich@telle-online.de>, Vadim Zeitlin <vadim@wxwidgets.org>
 dnl
 dnl This file is covered by the same licence as the entire wxSQLite3 package.
 
-AC_INIT([wxsqlite3], [4.7.6], [ulrich@telle-online.de])
+AC_INIT([wxsqlite3], [4.7.7], [ulrich@telle-online.de])
 
 dnl This is the version tested with, might work with earlier ones.
 AC_PREREQ([2.69])
@@ -115,14 +115,6 @@ AS_IF([test "x$with_aes128cbc" = xno &&
        test "x$with_rc4" = xno],
        [AC_DEFINE([WXSQLITE3_HAVE_CODEC], [0], [All ciphers disabled so encryption is disabled])])
 
-dnl check for dlopen() in libdl
-HAVE_DLOPEN=false
-AC_CHECK_LIB(dl, dlopen,
-  [
-    HAVE_DLOPEN=true
-  ])
-AM_CONDITIONAL([HAVE_LIBDL], [test x$HAVE_DLOPEN = xtrue])
-
 dnl We only need the libraries above for the main library itself, but the
 dnl pdfdc sample has additional requirements, check for them too (notice that
 dnl we can't use "--optional-libs" wx-config option to do it all in one check

diff --git a/docs/Doxyfile b/docs/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = wxSQLite3
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.7.6
+PROJECT_NUMBER         = 4.7.7
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/include/wx/wxsqlite3_version.h b/include/wx/wxsqlite3_version.h
@@ -14,8 +14,8 @@
 
 #define WXSQLITE3_MAJOR_VERSION      4
 #define WXSQLITE3_MINOR_VERSION      7
-#define WXSQLITE3_RELEASE_NUMBER     6
+#define WXSQLITE3_RELEASE_NUMBER     7
 #define WXSQLITE3_SUBRELEASE_NUMBER  0
-#define WXSQLITE3_VERSION_STRING     "wxSQLite3 4.7.6"
+#define WXSQLITE3_VERSION_STRING     "wxSQLite3 4.7.7"
 
 #endif // WXSQLITE3_VERSION_H_
diff --git a/include/wx/wxsqlite3def.h b/include/wx/wxsqlite3def.h
@@ -46,6 +46,11 @@
 
 <dl>
 
+<dt><b>4.7.7</b> - <i>February 2022</i></dt>
+<dd>
+Upgrade to <i>SQLite3 Multiple Ciphers version 1.3.8 (SQLite version 3.38.0)</i><br>
+
+</dd>
 <dt><b>4.7.6</b> - <i>January 2022</i></dt>
 <dd>
 Upgrade to <i>SQLite3 Multiple Ciphers version 1.3.7 (SQLite version 3.37.2)</i><br>

diff --git a/premake5.lua b/premake5.lua
@@ -61,7 +61,6 @@ project "wxsqlite3"
     "SQLITE_ENABLE_FTS3_PARENTHESIS=1",
     "SQLITE_ENABLE_FTS4=1",
     "SQLITE_ENABLE_FTS5=1",
-    "SQLITE_ENABLE_JSON1=1",
     "SQLITE_ENABLE_RTREE=1",
     "SQLITE_ENABLE_GEOPOLY=1",
     "SQLITE_CORE=1",

diff --git a/readme.md b/readme.md
@@ -48,6 +48,8 @@ Since August 2020 a new implementation of an encryption extension, capable of su
 
 ## <a name="history"></a>Version history
 
+* 4.7.7 - *February 2022*
+  - Upgrade to SQLite3 Multiple Ciphers version 1.3.8 (SQLite version 3.38.0)
 * 4.7.6 - *January 2022*
   - Upgrade to SQLite3 Multiple Ciphers version 1.3.7 (SQLite version 3.37.2)
 * 4.7.5 - *November 2021*