Merge branch 'wip/fix-fedora-sqlite-tokeniser' into 'master'

Fix fedora sqlite tokeniser

See merge request GNOME/geary!5

.gitlab-ci.yml

@@ -17,6 +17,7 @@ variables:
                webkitgtk4-devel libsecret-devel libxml2-devel vala-tools
                gcr-devel enchant-devel libunwind-devel
                gnome-online-accounts-devel itstool
+  FEDORA_TEST_DEPS: tar xz
   UBUNTU_DEPS: valac libgirepository1.0-dev
                meson desktop-file-utils libcanberra-dev
                libgee-0.8-dev libglib2.0-dev libgmime-2.6-dev libgtk-3-dev
@@ -34,12 +35,11 @@ fedora:
   image: fedora:latest
   before_script:
     - dnf update -y --nogpgcheck
-    - dnf install -y --nogpgcheck $FEDORA_DEPS
+    - dnf install -y --nogpgcheck $FEDORA_DEPS $FEDORA_TEST_DEPS
   script:
     - $CONFIG_CMD
     - $BUILD_CMD
-    # Disable tests while SQLite issue is being sorted out
-    #- $TEST_CMD
+    - $TEST_CMD
     - $INSTALL_CMD
 
 ubuntu:

src/sqlite3-unicodesn/static.c

@@ -28,13 +28,11 @@ static int registerTokenizer(
   sqlite3_stmt *pStmt;
   const char *zSql = "SELECT fts3_tokenizer(?, ?)";
 
-#ifdef HAVE_FTS3_TOKENIZER
   /* Enable the 2-argument form of fts3_tokenizer in SQLite >= 3.12 */
   rc = sqlite3_db_config(db,SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER,1,0);
   if( rc!=SQLITE_OK ){
     return rc;
   }
-#endif
 
   rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
   if( rc!=SQLITE_OK ){