Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 kde5-apps/kaffeine/HISTORY               |    3 +
 kde5-apps/kaffeine/PRE_BUILD             |    3 +
 kde5-apps/kaffeine/patches/qt-5.11.patch |   89 
+++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+)

New commits:
commit c35ff8683d5fe110dffe45fec92b120fa3af5205
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kaffeine - fix build with qt-5.11

diff --git a/kde5-apps/kaffeine/HISTORY b/kde5-apps/kaffeine/HISTORY
index 08d096e..77eef21 100644
--- a/kde5-apps/kaffeine/HISTORY
+++ b/kde5-apps/kaffeine/HISTORY
@@ -1,3 +1,6 @@
+2018-05-31 Treeve Jelbert <treeve AT sourcemage.org>
+       * PRE_BUILD patches/*: added, fix build with qt-5.11
+
 2018-05-03 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.0.15
 
diff --git a/kde5-apps/kaffeine/PRE_BUILD b/kde5-apps/kaffeine/PRE_BUILD
new file mode 100755
index 0000000..922c0ab
--- /dev/null
+++ b/kde5-apps/kaffeine/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build    &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/kde5-apps/kaffeine/patches/qt-5.11.patch 
b/kde5-apps/kaffeine/patches/qt-5.11.patch
new file mode 100644
index 0000000..0e6b327
--- /dev/null
+++ b/kde5-apps/kaffeine/patches/qt-5.11.patch
@@ -0,0 +1,89 @@
+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();
+