diff options
Diffstat (limited to 'media-sound/clementine/files')
-rw-r--r-- | media-sound/clementine/files/clementine-fts3-tokenizer.patch | 36 | ||||
-rw-r--r-- | media-sound/clementine/files/clementine-qt5-lconvert.patch | 28 |
2 files changed, 64 insertions, 0 deletions
diff --git a/media-sound/clementine/files/clementine-fts3-tokenizer.patch b/media-sound/clementine/files/clementine-fts3-tokenizer.patch new file mode 100644 index 000000000000..41a5cd76c992 --- /dev/null +++ b/media-sound/clementine/files/clementine-fts3-tokenizer.patch @@ -0,0 +1,36 @@ +From 77b6d72a3e8d841977a3e30ea435cd9e9289fc96 Mon Sep 17 00:00:00 2001 +From: Alexander Golubev <fatzer2@gmail.com> +Date: Thu, 16 Mar 2017 14:54:55 +0300 +Subject: [PATCH] core/database: configure fts3 tokenizer support + +Original patch by Arfrever +This fixes https://github.com/clementine-player/Clementine/issues/5297 +--- + src/core/database.cpp | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/core/database.cpp b/src/core/database.cpp +index 86e8a1052..36113d8c1 100644 +--- a/src/core/database.cpp ++++ b/src/core/database.cpp +@@ -265,6 +265,20 @@ QSqlDatabase Database::Connect() { + StaticInit(); + + { ++ ++#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER ++ // In case sqlite>=3.12 is compiled without -DSQLITE_ENABLE_FTS3_TOKENIZER (generally a good idea ++ // due to security reasons) the fts3 support should be enabled explicitly. ++ // see https://github.com/clementine-player/Clementine/issues/5297 ++ QVariant v = db.driver()->handle(); ++ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) { ++ sqlite3* handle = *static_cast<sqlite3**>(v.data()); ++ if (handle) { ++ sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL); ++ } ++ } ++#endif ++ + QSqlQuery set_fts_tokenizer(db); + set_fts_tokenizer.prepare("SELECT fts3_tokenizer(:name, :pointer)"); + set_fts_tokenizer.bindValue(":name", "unicode"); diff --git a/media-sound/clementine/files/clementine-qt5-lconvert.patch b/media-sound/clementine/files/clementine-qt5-lconvert.patch new file mode 100644 index 000000000000..8565f30cee05 --- /dev/null +++ b/media-sound/clementine/files/clementine-qt5-lconvert.patch @@ -0,0 +1,28 @@ +From 5f75801a08a606073c700bd829ea694950de0729 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 19 Nov 2017 16:00:55 +0100 +Subject: [PATCH] Properly find Qt5LinguistTools + +--- + CMakeLists.txt | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4022c383b..5bdb2a00e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -45,9 +45,8 @@ if(NOT APPLE) + find_package(Qt5 COMPONENTS WebKitWidgets) + endif(NOT APPLE) + +-# Find Qt's lconvert binary. Try qt's binary dir first, fall back to looking in PATH +-find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH) +-find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5) ++find_package(Qt5LinguistTools CONFIG REQUIRED) ++set(QT_LCONVERT_EXECUTABLE Qt5::lconvert) + + if(APPLE) + if(NOT QT_MAC_USE_COCOA) +-- +2.15.0 + |