From 3f71901f8c228f4de570abed1831ce3ee425343e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Sep 2018 10:50:14 +0100 Subject: gentoo resync 08.09.2018 --- .../cantata/files/cantata-2.2.0-qtsql-5.10.patch | 23 ---------------------- .../cantata/files/cantata-2.3.2-opusfile.patch | 22 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 23 deletions(-) delete mode 100644 media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch create mode 100644 media-sound/cantata/files/cantata-2.3.2-opusfile.patch (limited to 'media-sound/cantata/files') diff --git a/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch b/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch deleted file mode 100644 index 16cb6d8c2d1f..000000000000 --- a/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a Mon Sep 17 00:00:00 2001 -From: Craig Drummond -Date: Tue, 28 Nov 2017 22:37:01 +0000 -Subject: [PATCH] Create QSqlQuery, then call prepare Issue #1130 - ---- - db/librarydb.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/db/librarydb.cpp b/db/librarydb.cpp -index 603d8abc1..4f75dc28f 100644 ---- a/db/librarydb.cpp -+++ b/db/librarydb.cpp -@@ -453,7 +453,8 @@ class SqlQuery - if (limit>0) { - sql+=" LIMIT "+QString::number(limit); - } -- query=QSqlQuery(sql, db); -+ query = QSqlQuery(db); -+ query.prepare(sql); - - for (const QVariant &value: boundValues) { - query.addBindValue(value); diff --git a/media-sound/cantata/files/cantata-2.3.2-opusfile.patch b/media-sound/cantata/files/cantata-2.3.2-opusfile.patch new file mode 100644 index 000000000000..956edf1d5133 --- /dev/null +++ b/media-sound/cantata/files/cantata-2.3.2-opusfile.patch @@ -0,0 +1,22 @@ +From cdf4363df91475b091ad20000078ca8ef21ce91f Mon Sep 17 00:00:00 2001 +From: Craig Drummond +Date: Sat, 11 Aug 2018 08:31:40 +0100 +Subject: [PATCH] Add '.opus' to list of recognised extensions for local files. + +--- + models/playqueuemodel.cpp | 2 +- + 1 file changed, 1 insertions(+), 1 deletion(-) + +diff --git a/models/playqueuemodel.cpp b/models/playqueuemodel.cpp +index deaaa78f3..c6c4c4130 100644 +--- a/models/playqueuemodel.cpp ++++ b/models/playqueuemodel.cpp +@@ -89,7 +89,7 @@ QSet PlayQueueModel::constFileExtensions = QSet() + << QLatin1String("m4b") << QLatin1String("mp4") << QLatin1String("m4p") << QLatin1String("wav") << QLatin1String("wv") + << QLatin1String("wvp") << QLatin1String("aiff") << QLatin1String("aif") << QLatin1String("aifc") << QLatin1String("ape") + << QLatin1String("spx") << QLatin1String("tta") << QLatin1String("mpc") << QLatin1String("mpp") << QLatin1String("mp+") +- << QLatin1String("dff") << QLatin1String("dsf") ++ << QLatin1String("dff") << QLatin1String("dsf") << QLatin1String("opus") + // And playlists... + << QLatin1String("m3u") << QLatin1String("m3u8") << constPlsPlaylist << constXspfPlaylist; + -- cgit v1.2.3