commit ef4342e37051a317e0e33151246a745fc6bd822a Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Fri Jun 1 07:39:02 2018 +0100 update to 2.0.15 release buildfix_qt511.patch | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++ kaffeine.spec | 25 ++++++------ sources | 2 +- 3 files changed, 123 insertions(+), 14 deletions(-) --- diff --git a/buildfix_qt511.patch b/buildfix_qt511.patch new file mode 100644 index 0000000..ac39879 --- /dev/null +++ b/buildfix_qt511.patch @@ -0,0 +1,110 @@ +From 06b78c5f24891fd38d25ed64f5029106eec7c4fb Mon Sep 17 00:00:00 2001 +From: Fabian Vogt <fabian(a)ritter-vogt.de&gt; +Date: Wed, 16 May 2018 16:38:04 -0300 +Subject: [PATCH] Fix breakages with qt5.11-rc2 + +On Qt5.11, there was a change at the way qPrintable() works. +There, the var using it should be already a QString() type, +not allowing implicit conversions. + +With that, some usages of qPrintable() are invalid for qt5.11, +as the vars to be printed are either enums or integers. + +BUG: 393222 + +Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org&gt; +--- + src/backend-vlc/vlcmediawidget.cpp | 4 ++-- + src/dvb/dvbdevice_linux.cpp | 2 +- + src/dvb/dvbrecording.cpp | 2 +- + src/sqlinterface.cpp | 8 ++++---- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/backend-vlc/vlcmediawidget.cpp b/src/backend-vlc/vlcmediawidget.cpp +index 9be6263..60666d2 100644 +--- a/src/backend-vlc/vlcmediawidget.cpp ++++ b/src/backend-vlc/vlcmediawidget.cpp +@@ -95,7 +95,7 @@ bool VlcMediaWidget::init() + + for (uint i = 0; i < (sizeof(eventTypes) / sizeof(eventTypes[0])); ++i) { + if (libvlc_event_attach(eventManager, eventTypes[i], vlcEventHandler, this) != 0) { +- qCCritical(logMediaWidget, "Cannot attach event handler %s", qPrintable(eventTypes[i])); ++ qCCritical(logMediaWidget, "Cannot attach event handler %d", eventTypes[i]); + return false; + } + } +@@ -328,7 +328,7 @@ void VlcMediaWidget::play(const MediaSource &source) + + for (uint i = 0; i < (sizeof(eventTypes) / sizeof(eventTypes[0])); ++i) { + if (libvlc_event_attach(eventManager, eventTypes[i], vlcEventHandler, this) != 0) { +- qCWarning(logMediaWidget, "Cannot attach event handler %s", qPrintable(eventTypes[i])); ++ qCWarning(logMediaWidget, "Cannot attach event handler %d", eventTypes[i]); + } + } + +diff --git a/src/dvb/dvbdevice_linux.cpp b/src/dvb/dvbdevice_linux.cpp +index 1f6c4ad..aa7fd34 100644 +--- a/src/dvb/dvbdevice_linux.cpp ++++ b/src/dvb/dvbdevice_linux.cpp +@@ -1245,7 +1245,7 @@ bool DvbLinuxDevice::getProps(DvbTransponder &transponder) + qCWarning(logDev, "Invalid transmission type"); + return false; + default: +- qCWarning(logDev, "Unknown transmission type %s", qPrintable(transponder.getTransmissionType())); ++ qCWarning(logDev, "Unknown transmission type %d", transponder.getTransmissionType()); + return false; + } + return true; +diff --git a/src/dvb/dvbrecording.cpp b/src/dvb/dvbrecording.cpp +index 1018455..1f1bf07 100644 +--- a/src/dvb/dvbrecording.cpp ++++ b/src/dvb/dvbrecording.cpp +@@ -473,7 +473,7 @@ DvbSharedRecording DvbRecordingModel::getLeastImportant(QList<DvbSharedRecording + DvbSharedRecording leastImportant = recList.value(0); + foreach(DvbSharedRecording listRec, recList) + { +- qCDebug(logDvb, "name and priority %s %s", qPrintable(listRec->name), qPrintable(listRec->priority)); ++ qCDebug(logDvb, "name and priority %s %d", qPrintable(listRec->name), listRec->priority); + if (listRec->priority < leastImportant->priority) { + leastImportant = listRec; + } +diff --git a/src/sqlinterface.cpp b/src/sqlinterface.cpp +index 8cc3bbd..d78d997 100644 +--- a/src/sqlinterface.cpp ++++ b/src/sqlinterface.cpp +@@ -135,7 +135,7 @@ void SqlInterface::sqlInsert(SqlKey key) + break; + } + +- qCWarning(logSql, "Invalid pending statement '%s'", qPrintable(pendingStatement)); ++ qCWarning(logSql, "Invalid pending statement '%d'", pendingStatement); + } + + void SqlInterface::sqlUpdate(SqlKey key) +@@ -155,7 +155,7 @@ void SqlInterface::sqlUpdate(SqlKey key) + break; + } + +- qCWarning(logSql, "Invalid pending statement '%s'", qPrintable(pendingStatement)); ++ qCWarning(logSql, "Invalid pending statement '%d'", pendingStatement); + } + + void SqlInterface::sqlRemove(SqlKey key) +@@ -176,7 +176,7 @@ void SqlInterface::sqlRemove(SqlKey key) + break; + } + +- qCWarning(logSql, "Invalid pending statement %s", qPrintable(pendingStatement)); ++ qCWarning(logSql, "Invalid pending statement %d", pendingStatement); + } + + void SqlInterface::requestSubmission() +@@ -226,7 +226,7 @@ void SqlInterface::sqlSubmit() + continue; + } + +- qCWarning(logSql, "Invalid pending statement %s", qPrintable(pendingStatement)); ++ qCWarning(logSql, "Invalid pending statement %d", pendingStatement); + } + + pendingStatements.clear(); diff --git a/kaffeine.spec b/kaffeine.spec index 6caa134..b6f418e 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -1,6 +1,6 @@ Name: kaffeine -Version: 2.0.14 -Release: 4%{?dist} +Version: 2.0.15 +Release: 1%{?dist} License: GPLv2+ Summary: KDE media player @@ -13,6 +13,10 @@ Source0: https://download.kde.org/%{stable}/%{name}/%{name}-%{version}.tar.xz %global stable stable %endif +# Fix breakages with qt5.11-rc2 +# https://github.com/KDE/kaffeine/commit/06b78c5f24891fd38d25ed64f5029106ee... +Patch0: buildfix_qt511.patch + BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: gettext @@ -45,7 +49,7 @@ Kaffeine is a KDE Frameworks media player. %prep -%setup -q +%autosetup -p1 # Remove broken locale, they can use pt instead till upstream fixes it. rm -rf po/pt_BR @@ -66,11 +70,7 @@ popd %check desktop-file-validate %{buildroot}/%{_kf5_datadir}/applications/org.kde.kaffeine.desktop -%if 0%{?fedora} > 27 -appstream-util validate-relax --nonet %{buildroot}/%{_kf5_datadir}/metainfo/org.kde.kaffeine.appdata.xml -%else -appstream-util validate-relax --nonet %{buildroot}/%{_kf5_datadir}/appdata/org.kde.kaffeine.appdata.xml -%endif +appstream-util validate-relax --nonet %{buildroot}/%{_kf5_metainfodir}/org.kde.kaffeine.appdata.xml %files -f %{name}.lang %doc README.md @@ -80,16 +80,15 @@ appstream-util validate-relax --nonet %{buildroot}/%{_kf5_datadir}/appdata/org.k %{_kf5_datadir}/solid/actions/*.desktop %{_kf5_datadir}/applications/org.kde.kaffeine.desktop %{_kf5_datadir}/icons/hicolor/*/*/* -%if 0%{?fedora} > 27 -%{_kf5_datadir}/metainfo/org.kde.kaffeine.appdata.xml -%else -%{_kf5_datadir}/appdata/org.kde.kaffeine.appdata.xml -%endif +%{_kf5_metainfodir}/org.kde.kaffeine.appdata.xml %{_kf5_datadir}/profiles/kaffeine.profile.xml %{_kf5_docdir}/HTML/*/kaffeine/ %{_kf5_mandir}/man1/kaffeine.1.* %changelog +* Fri Jun 01 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 2.0.15-1 +- update to 2.0.15 release + * Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com&gt; - 2.0.14-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index aaf3e24..1db434c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3316d52d0e57ef844ee36b82f97630b kaffeine-2.0.14.tar.xz +931da4fb86018619110e0f7bec9f3769 kaffeine-2.0.15.tar.xz