From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A7D8659CB2 for ; Sun, 17 Apr 2016 04:41:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08EEB21C019; Sun, 17 Apr 2016 04:41:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8682A21C019 for ; Sun, 17 Apr 2016 04:41:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 25BCF340A9D for ; Sun, 17 Apr 2016 04:41:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4EE9E7E for ; Sun, 17 Apr 2016 04:41:29 +0000 (UTC) From: "Jason Donenfeld" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Donenfeld" Message-ID: <1460868075.d9b0d9b1b437b7b130549e5b683cf4afc8a865e2.zx2c4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/clementine/clementine-1.3.ebuild media-sound/clementine/clementine-9999.ebuild media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch X-VCS-Directories: media-sound/clementine/files/ media-sound/clementine/ X-VCS-Committer: zx2c4 X-VCS-Committer-Name: Jason Donenfeld X-VCS-Revision: d9b0d9b1b437b7b130549e5b683cf4afc8a865e2 X-VCS-Branch: master Date: Sun, 17 Apr 2016 04:41:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6f4fb67b-4524-414c-9396-b777bb2c26ef X-Archives-Hash: c9c682fbc208f36ed3c4348282bdcc0d commit: d9b0d9b1b437b7b130549e5b683cf4afc8a865e2 Author: Jason A. Donenfeld gentoo org> AuthorDate: Sun Apr 17 04:41:15 2016 +0000 Commit: Jason Donenfeld gentoo org> CommitDate: Sun Apr 17 04:41:15 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9b0d9b1 media-sound/clementine: needs patch for tokenizer Package-Manager: portage-2.2.28 media-sound/clementine/clementine-1.3.ebuild | 2 ++ media-sound/clementine/clementine-9999.ebuild | 5 ++--- .../files/clementine-1.3-fix-tokenizer.patch | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/media-sound/clementine/clementine-1.3.ebuild b/media-sound/clementine/clementine-1.3.ebuild index 3eb1742..bfac234 100644 --- a/media-sound/clementine/clementine-1.3.ebuild +++ b/media-sound/clementine/clementine-1.3.ebuild @@ -93,6 +93,8 @@ MY_P="${P/_}" [[ ${PV} == *9999* ]] || \ S="${WORKDIR}/C${MY_P:1}" +PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch ) + src_prepare() { cmake-utils_src_prepare diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild index 79b9c7d..bfac234 100644 --- a/media-sound/clementine/clementine-9999.ebuild +++ b/media-sound/clementine/clementine-9999.ebuild @@ -56,6 +56,7 @@ COMMON_DEPEND=" mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) + >=dev-libs/crypto++-5.6.2-r4 " # now only presets are used, libprojectm is internal # https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches @@ -92,9 +93,7 @@ MY_P="${P/_}" [[ ${PV} == *9999* ]] || \ S="${WORKDIR}/C${MY_P:1}" -PATCHES=( - "${FILESDIR}"/${PN}-1.3_rc1-cmake.patch -) +PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch ) src_prepare() { cmake-utils_src_prepare diff --git a/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch b/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch new file mode 100644 index 0000000..6413bf7 --- /dev/null +++ b/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch @@ -0,0 +1,21 @@ +https://github.com/clementine-player/Clementine/issues/5297 + +--- src/core/database.cpp ++++ src/core/database.cpp +@@ -265,6 +265,16 @@ + StaticInit(); + + { ++#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER ++ QVariant v = db.driver()->handle(); ++ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) { ++ sqlite3* handle = *static_cast(v.data()); ++ if (handle) { ++ sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL); ++ } ++ } ++#endif ++ + QSqlQuery set_fts_tokenizer("SELECT fts3_tokenizer(:name, :pointer)", db); + set_fts_tokenizer.bindValue(":name", "unicode"); + set_fts_tokenizer.bindValue(