Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eca5f26218c2ad89bc664c1db7b039698a0b4316
commit eca5f26218c2ad89bc664c1db7b039698a0b4316 Author: DeX77 <[email protected]> Date: Tue Jan 30 11:01:16 2018 +0100 cantata-2.2.0-4-x86_64 * fix crash with qt 5.10 diff --git a/source/kde5-extra/cantata/FrugalBuild b/source/kde5-extra/cantata/FrugalBuild index d066f5a..35453a4 100644 --- a/source/kde5-extra/cantata/FrugalBuild +++ b/source/kde5-extra/cantata/FrugalBuild @@ -3,7 +3,7 @@ pkgname=cantata pkgver=2.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="QTx5 and KDE based Client for MPD" archs=('x86_64') depends=("qt5-svg>=5.10.0" "qt5-multimedia>=5.10.0" "libmtp>=1.1.12-2" "libmpg123" \ @@ -16,7 +16,9 @@ _F_cmake_confopts+=" -ENABLE_QT5=ON \ -DENABLE_LIBVLC=ON" Finclude github kf5 groups=('kde5-extra') -sha1sums=('71ff14b1c0b3ae9baacb60309850d4c3dfe4afa9') +source+=(fix-qt5.10-crash.patch) +sha1sums=('71ff14b1c0b3ae9baacb60309850d4c3dfe4afa9' \ + 'a0e2dc3c3f8e5fd8a56036fbf629546bfbbe91b2') makedepends+=('qt5-tools>=5.10.0' 'x11-protos') # optimization OK diff --git a/source/kde5-extra/cantata/fix-qt5.10-crash.patch b/source/kde5-extra/cantata/fix-qt5.10-crash.patch new file mode 100644 index 0000000..16cb6d8 --- /dev/null +++ b/source/kde5-extra/cantata/fix-qt5.10-crash.patch @@ -0,0 +1,23 @@ +From 4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a Mon Sep 17 00:00:00 2001 +From: Craig Drummond <[email protected]> +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); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
