Codebase list kaffeine / 5c60862
update the patches - upstream-Fix-breakages-with-qt5.11-rc2.patch: drop, backported from upstream Pino Toscano 4 years ago
3 changed file(s) with 3 addition(s) and 114 deletion(s). Raw diff Collapse all Expand all
+3
-0
debian/changelog less more
11
22 [ Pino Toscano ]
33 * New upstream release.
4 * Update the patches:
5 - upstream-Fix-breakages-with-qt5.11-rc2.patch: drop, backported
6 from upstream
47
58 -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Sat, 06 Jul 2019 12:36:13 +0200
69
+0
-1
debian/patches/series less more
0 upstream-Fix-breakages-with-qt5.11-rc2.patch
+0
-113
debian/patches/upstream-Fix-breakages-with-qt5.11-rc2.patch less more
0 From 06b78c5f24891fd38d25ed64f5029106eec7c4fb Mon Sep 17 00:00:00 2001
1 From: Fabian Vogt <fabian@ritter-vogt.de>
2 Date: Wed, 16 May 2018 16:38:04 -0300
3 Subject: [PATCH] Fix breakages with qt5.11-rc2
4
5 On Qt5.11, there was a change at the way qPrintable() works.
6 There, the var using it should be already a QString() type,
7 not allowing implicit conversions.
8
9 With that, some usages of qPrintable() are invalid for qt5.11,
10 as the vars to be printed are either enums or integers.
11
12 BUG: 393222
13
14 Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
15 ---
16 src/backend-vlc/vlcmediawidget.cpp | 4 ++--
17 src/dvb/dvbdevice_linux.cpp | 2 +-
18 src/dvb/dvbrecording.cpp | 2 +-
19 src/sqlinterface.cpp | 8 ++++----
20 4 files changed, 8 insertions(+), 8 deletions(-)
21
22 diff --git a/src/backend-vlc/vlcmediawidget.cpp b/src/backend-vlc/vlcmediawidget.cpp
23 index 9be6263..60666d2 100644
24 --- a/src/backend-vlc/vlcmediawidget.cpp
25 +++ b/src/backend-vlc/vlcmediawidget.cpp
26 @@ -95,7 +95,7 @@ bool VlcMediaWidget::init()
27
28 for (uint i = 0; i < (sizeof(eventTypes) / sizeof(eventTypes[0])); ++i) {
29 if (libvlc_event_attach(eventManager, eventTypes[i], vlcEventHandler, this) != 0) {
30 - qCCritical(logMediaWidget, "Cannot attach event handler %s", qPrintable(eventTypes[i]));
31 + qCCritical(logMediaWidget, "Cannot attach event handler %d", eventTypes[i]);
32 return false;
33 }
34 }
35 @@ -328,7 +328,7 @@ void VlcMediaWidget::play(const MediaSource &source)
36
37 for (uint i = 0; i < (sizeof(eventTypes) / sizeof(eventTypes[0])); ++i) {
38 if (libvlc_event_attach(eventManager, eventTypes[i], vlcEventHandler, this) != 0) {
39 - qCWarning(logMediaWidget, "Cannot attach event handler %s", qPrintable(eventTypes[i]));
40 + qCWarning(logMediaWidget, "Cannot attach event handler %d", eventTypes[i]);
41 }
42 }
43
44 diff --git a/src/dvb/dvbdevice_linux.cpp b/src/dvb/dvbdevice_linux.cpp
45 index 1f6c4ad..aa7fd34 100644
46 --- a/src/dvb/dvbdevice_linux.cpp
47 +++ b/src/dvb/dvbdevice_linux.cpp
48 @@ -1245,7 +1245,7 @@ bool DvbLinuxDevice::getProps(DvbTransponder &transponder)
49 qCWarning(logDev, "Invalid transmission type");
50 return false;
51 default:
52 - qCWarning(logDev, "Unknown transmission type %s", qPrintable(transponder.getTransmissionType()));
53 + qCWarning(logDev, "Unknown transmission type %d", transponder.getTransmissionType());
54 return false;
55 }
56 return true;
57 diff --git a/src/dvb/dvbrecording.cpp b/src/dvb/dvbrecording.cpp
58 index 1018455..1f1bf07 100644
59 --- a/src/dvb/dvbrecording.cpp
60 +++ b/src/dvb/dvbrecording.cpp
61 @@ -473,7 +473,7 @@ DvbSharedRecording DvbRecordingModel::getLeastImportant(QList<DvbSharedRecording
62 DvbSharedRecording leastImportant = recList.value(0);
63 foreach(DvbSharedRecording listRec, recList)
64 {
65 - qCDebug(logDvb, "name and priority %s %s", qPrintable(listRec->name), qPrintable(listRec->priority));
66 + qCDebug(logDvb, "name and priority %s %d", qPrintable(listRec->name), listRec->priority);
67 if (listRec->priority < leastImportant->priority) {
68 leastImportant = listRec;
69 }
70 diff --git a/src/sqlinterface.cpp b/src/sqlinterface.cpp
71 index 8cc3bbd..d78d997 100644
72 --- a/src/sqlinterface.cpp
73 +++ b/src/sqlinterface.cpp
74 @@ -135,7 +135,7 @@ void SqlInterface::sqlInsert(SqlKey key)
75 break;
76 }
77
78 - qCWarning(logSql, "Invalid pending statement '%s'", qPrintable(pendingStatement));
79 + qCWarning(logSql, "Invalid pending statement '%d'", pendingStatement);
80 }
81
82 void SqlInterface::sqlUpdate(SqlKey key)
83 @@ -155,7 +155,7 @@ void SqlInterface::sqlUpdate(SqlKey key)
84 break;
85 }
86
87 - qCWarning(logSql, "Invalid pending statement '%s'", qPrintable(pendingStatement));
88 + qCWarning(logSql, "Invalid pending statement '%d'", pendingStatement);
89 }
90
91 void SqlInterface::sqlRemove(SqlKey key)
92 @@ -176,7 +176,7 @@ void SqlInterface::sqlRemove(SqlKey key)
93 break;
94 }
95
96 - qCWarning(logSql, "Invalid pending statement %s", qPrintable(pendingStatement));
97 + qCWarning(logSql, "Invalid pending statement %d", pendingStatement);
98 }
99
100 void SqlInterface::requestSubmission()
101 @@ -226,7 +226,7 @@ void SqlInterface::sqlSubmit()
102 continue;
103 }
104
105 - qCWarning(logSql, "Invalid pending statement %s", qPrintable(pendingStatement));
106 + qCWarning(logSql, "Invalid pending statement %d", pendingStatement);
107 }
108
109 pendingStatements.clear();
110 --
111 2.18.0
112