Hello community, here is the log from the commit of package cantata for openSUSE:Factory checked in at 2018-01-25 12:41:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cantata (Old) and /work/SRC/openSUSE:Factory/.cantata.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cantata" Thu Jan 25 12:41:26 2018 rev:4 rq:569397 version:2.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cantata/cantata.changes 2017-10-18 10:54:36.865241177 +0200 +++ /work/SRC/openSUSE:Factory/.cantata.new/cantata.changes 2018-01-25 12:41:31.299915395 +0100 @@ -1,0 +2,5 @@ +Wed Jan 24 18:38:52 UTC 2018 - corne...@solcon.nl + +- Added upstream patch: fix-qt-510.patch to fix boo#1077468 + +------------------------------------------------------------------- New: ---- fix-qt-510.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantata.spec ++++++ --- /var/tmp/diff_new_pack.Qzrowv/_old 2018-01-25 12:41:32.127876740 +0100 +++ /var/tmp/diff_new_pack.Qzrowv/_new 2018-01-25 12:41:32.139876180 +0100 @@ -1,7 +1,7 @@ # # spec file for package cantata # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,20 +27,12 @@ # PATCH-FIX-OPENSUSE fix-translations-with-qt5.diff -- Make sure that it finds the right lrelease and lconvert binaries with Qt5 Patch1: fix-translations-with-qt5.diff Patch2: install-libsolidlite.diff +# PATCH-FIX-UPSTREAM fix-qt-510.pach -- fix crash with Qt 5.10 (boo#1077468) +Patch3: fix-qt-510.patch #Source0: https://github.com/CDrummond/cantata/archive/v%{version}.tar.gz BuildRequires: fdupes BuildRequires: media-player-info BuildRequires: cmake(Qt5LinguistTools) -BuildRequires: pkgconfig(libcddb) -BuildRequires: pkgconfig(libcdio_paranoia) -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavutil) -BuildRequires: pkgconfig(libmpg123) -BuildRequires: pkgconfig(libmtp) -BuildRequires: pkgconfig(libmusicbrainz5) -BuildRequires: pkgconfig(taglib) -BuildRequires: pkgconfig(taglib-extras) BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) @@ -51,9 +43,19 @@ BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(libcddb) +BuildRequires: pkgconfig(libcdio_paranoia) +BuildRequires: pkgconfig(libmpg123) +BuildRequires: pkgconfig(libmtp) +BuildRequires: pkgconfig(libmusicbrainz5) BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(udisks2) BuildRequires: pkgconfig(libvlc) +BuildRequires: pkgconfig(taglib) +BuildRequires: pkgconfig(taglib-extras) +BuildRequires: pkgconfig(udisks2) BuildRequires: pkgconfig(zlib) Requires(post): hicolor-icon-theme Requires(post): update-desktop-files @@ -99,6 +101,7 @@ %setup -q %patch1 -p0 %patch2 -p0 +%patch3 -p1 %build %cmake ++++++ fix-qt-510.patch ++++++ >From 4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a Mon Sep 17 00:00:00 2001 From: Craig Drummond <craig.p.drumm...@gmail.com> 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); foreach (const QVariant &value, boundValues) { query.addBindValue(value);
