Index: head/multimedia/kaffeine/files/patch-git =================================================================== --- head/multimedia/kaffeine/files/patch-git (revision 490625) +++ head/multimedia/kaffeine/files/patch-git (nonexistent) @@ -1,720 +0,0 @@ -This patch contains the amalgamated diff of upstream commits post-v2.0.15: - -a9f09d4d84509259b92153f39e99e036bfcbcb61 - only use qPrintable() for debug messages -06b78c5f24891fd38d25ed64f5029106eec7c4fb - Fix breakages with qt5.11-rc2 -2bd25c928579a443f260f79a0fd65bffe18d54de - Fix minor EBN issues -3b6052eeb82516b7acb0e1280059b2201dc6636e - Fix minor typos and EBN issues -114a1016b3261d07de992b4c368b70e98a20bd59 - Fix compile on FreeBSD -c40e3c17d90b5bfc9df579cef992800578cc0a54 - Don't assume someone else pulls in errno.h -06d54c9310455168dfbf5d711705ddfbae6b72f5 - Don't delete what was new[]'ed - -These are mashed together because they touch the same files multiple times. - ---- include/dmx.h.orig 2018-05-01 12:51:57 UTC -+++ include/dmx.h -@@ -24,7 +24,7 @@ - #ifndef _DVBDMX_H_ - #define _DVBDMX_H_ - --#include -+#include "linuxtypes.h" - #include - - ---- include/frontend.h.orig 2018-05-01 12:51:57 UTC -+++ include/frontend.h -@@ -26,7 +26,7 @@ - #ifndef _DVBFRONTEND_H_ - #define _DVBFRONTEND_H_ - --#include -+#include "linuxtypes.h" - - enum fe_type { - FE_QPSK, ---- include/linuxtypes.h.orig 2018-12-22 19:38:00 UTC -+++ include/linuxtypes.h -@@ -0,0 +1,13 @@ -+#ifdef __linux__ -+#include -+#else -+#ifndef LINUX_TYPES_ADDED -+#define LINUX_TYPES_ADDED -+#include -+typedef uint64_t __u64; -+typedef uint32_t __u32; -+typedef uint16_t __u16; -+typedef uint8_t __u8; -+typedef int64_t __s64; -+#endif -+#endif ---- src/backend-vlc/vlcmediawidget.cpp.orig 2018-05-01 12:51:57 UTC -+++ src/backend-vlc/vlcmediawidget.cpp -@@ -64,18 +64,18 @@ bool VlcMediaWidget::init() - - if (vlcInstance == NULL) { - qFatal("Cannot create vlc instance %s", qPrintable(libvlc_errmsg())); -- delete argv; -+ delete[] argv; - return false; - } - - if (argc) { - QString log = "Using libVLC with args:"; - for (int i = 0; i < argc; i++) -- log += " " + QLatin1String(argv[i]); -+ log += ' ' + QLatin1String(argv[i]); - - qCDebug(logVlc, "%s", qPrintable(log)); - } -- delete argv; -+ delete[] argv; - - vlcMediaPlayer = libvlc_media_player_new(vlcInstance); - -@@ -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 MediaSou - - 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]); - } - } - -@@ -427,7 +427,7 @@ void VlcMediaWidget::setExternalSubtitle - qCWarning(logMediaWidget, "Cannot set subtitle file %s", qPrintable(fname)); - #else - if (libvlc_video_set_subtitle_file(vlcMediaPlayer, -- qPrintable(fname)) == 0) -+ fname.toLocal8Bit().constData()) == 0) - qCWarning(logMediaWidget, "Cannot set subtitle file %s", qPrintable(fname)); - #endif - } ---- src/dvb/dvbchannel.cpp.orig 2018-05-01 12:51:57 UTC -+++ src/dvb/dvbchannel.cpp -@@ -293,7 +293,7 @@ void DvbChannelModel::cloneFrom(DvbChann - addChannel(newChannel); - } - } else { -- qCWarning(logDvb, "Iillegal type of clone"); -+ qCWarning(logDvb, "Illegal type of clone"); - } - } - ---- src/dvb/dvbconfigdialog.cpp.orig 2018-05-01 12:51:57 UTC -+++ src/dvb/dvbconfigdialog.cpp -@@ -1539,7 +1539,7 @@ void DvbSLnbConfigObject::configure() - - for (i = 0; i < size; i++) { - struct lnbSat lnb = device->getLnbSatModels().at(i); -- QRadioButton *radioButton = new QRadioButton(i18nd("libdvbv5", qPrintable(lnb.name)), mainWidget); -+ QRadioButton *radioButton = new QRadioButton(i18nd("libdvbv5", lnb.name.toLocal8Bit().constData()), mainWidget); - mainLayout->addWidget(radioButton); - lnbSelectionGroup->addButton(radioButton, i + 1); - gridLayout->addWidget(radioButton, i % ((size + 1) / 2), i / ((size + 1) / 2)); ---- src/dvb/dvbdevice_linux.cpp.orig 2018-05-01 12:51:57 UTC -+++ src/dvb/dvbdevice_linux.cpp -@@ -1245,7 +1245,7 @@ bool DvbLinuxDevice::getProps(DvbTranspo - 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; ---- src/dvb/dvbepg.cpp.orig 2018-05-01 12:51:57 UTC -+++ src/dvb/dvbepg.cpp -@@ -289,7 +289,7 @@ DvbSharedEpgEntry DvbEpgModel::addEntry( - } - - if (hasPendingOperation) { -- qCWarning(logEpg, "Iillegal recursive call"); -+ qCWarning(logEpg, "Illegal recursive call"); - return DvbSharedEpgEntry(); - } - -@@ -859,13 +859,13 @@ QString DvbEpgFilter::getContent(DvbCont - if (s == "") - s = braNibble1Str[nibble1]; - if (s != "") -- content += i18n(s) + "\n"; -+ content += i18n(s) + '\n'; - } else { - s = contentStr[nibble1][nibble2]; - if (s == "") - s = nibble1Str[nibble1]; - if (s != "") -- content += i18n(s) + "\n"; -+ content += i18n(s) + '\n'; - } - } - -@@ -926,7 +926,7 @@ QString DvbEpgFilter::getParental(DvbPar - GenStr = i18n("drugs / "); - if (genre) { - GenStr.truncate(GenStr.size() - 2); -- GenStr = " (" + GenStr + ")"; -+ GenStr = " (" + GenStr + ')'; - } - - QString ratingStr = i18n(braRating[entry.rating()]); ---- src/dvb/dvbepgdialog.cpp.orig 2018-05-01 12:51:57 UTC -+++ src/dvb/dvbepgdialog.cpp -@@ -89,10 +89,10 @@ DvbEpgDialog::DvbEpgDialog(DvbManager *m - } - } - langLayout->addWidget(languageBox); -- connect(languageBox, SIGNAL(currentTextChanged(QString)), -- this, SLOT(languageChanged(QString))); -- connect(manager_->getEpgModel(), SIGNAL(languageAdded(const QString)), -- this, SLOT(languageAdded(const QString))); -+ connect(languageBox, &QComboBox::currentTextChanged, -+ this, &DvbEpgDialog::languageChanged); -+ connect(manager_->getEpgModel(), &DvbEpgModel::languageAdded, -+ this, &DvbEpgDialog::languageAdded); - - languageLabel = new QLabel(mainWidget); - langLayout->addWidget(languageLabel); -@@ -100,7 +100,7 @@ DvbEpgDialog::DvbEpgDialog(DvbManager *m - QString languageString; - if (IsoCodes::getLanguage(currentLanguage, &languageString)) - languageLabel->setText(languageString); -- else if (currentLanguage == "") -+ else if (currentLanguage.isEmpty()) - languageLabel->setText(i18n("Any language")); - else - languageLabel->setText(""); -@@ -188,10 +188,10 @@ void DvbEpgDialog::languageChanged(const - QString languageString; - if (IsoCodes::getLanguage(currentLanguage, &languageString)) - languageLabel->setText(languageString); -- else if (currentLanguage == "") -+ else if (currentLanguage.isEmpty()) - languageLabel->setText(i18n("Any language")); - else -- languageLabel->setText(""); -+ languageLabel->setText(QString()); - - epgTableModel->setLanguage(currentLanguage); - epgView->setCurrentIndex(epgTableModel->index(0, 0)); ---- src/dvb/dvbrecording.cpp.orig 2018-05-01 12:51:57 UTC -+++ src/dvb/dvbrecording.cpp -@@ -20,6 +20,8 @@ - - #include "../log.h" - -+#include -+ - #include - #include - #include -@@ -473,7 +475,7 @@ DvbSharedRecording DvbRecordingModel::ge - 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; - } -@@ -789,7 +791,7 @@ bool DvbRecordingFile::start(DvbRecordin - filename = filename.replace("%channel", recording.channel->name); - filename = filename.replace("%title", QString(recording.name)); - filename = filename.replace(QLatin1Char('/'), QLatin1Char('_')); -- if (filename == "") { -+ if (filename.isEmpty()) { - filename = QString(recording.name); - } - ---- src/dvb/dvbscan.cpp.orig 2018-05-01 12:51:57 UTC -+++ src/dvb/dvbscan.cpp -@@ -883,7 +883,7 @@ void DvbScan::processPmt(const DvbPmtSec - break; - } - case DvbBackendDevice::Percentage: { -- channel.snr = QString::number(snr, 'f', 0) + "%"; -+ channel.snr = QString::number(snr, 'f', 0) + '%'; - break; - } - case DvbBackendDevice::Decibel: { -@@ -1283,7 +1283,7 @@ void DvbScan::processNitDescriptor(const - } - case DvbTransponderBase::DvbT2: - // FIXME: Implement T2_delivery_system_descriptor -- // decriptor 0x7f, extension descriptor 0x04 or use libdvbv5 -+ // descriptor 0x7f, extension descriptor 0x04 or use libdvbv5 - - case DvbTransponderBase::DvbT: { - if (descriptor.descriptorTag() != 0x5a) { ---- src/dvb/dvbscandialog.cpp.orig 2018-05-01 12:51:57 UTC -+++ src/dvb/dvbscandialog.cpp -@@ -59,13 +59,13 @@ void DvbGradProgress::setValue(float val - - switch(scale) { - case DvbBackendDevice::NotSupported: { -- text = "-"; -+ text = '-'; - max = 100; - min = 0; - break; - } - case DvbBackendDevice::Percentage: { -- text = QString::number(value, 'f', 0) + "%"; -+ text = QString::number(value, 'f', 0) + '%'; - max = 100; - min = 0; - break; -@@ -77,7 +77,7 @@ void DvbGradProgress::setValue(float val - break; - } - case DvbBackendDevice::dBuV: { -- text = QString::number(value, 'f', 2) + " dB" + QString((QChar) 0x00b5) + "V"; -+ text = QString::number(value, 'f', 2) + " dB" + QString((QChar) 0x00b5) + 'V'; - max = 80; - min = 20; - break; ---- src/dvb/dvbsi.cpp.orig 2018-05-01 12:51:57 UTC -+++ src/dvb/dvbsi.cpp -@@ -481,7 +481,7 @@ QString AtscPsipText::convertText(const - result += - AtscHuffmanString::convertText(comp_string, num_bytes, comp_type); - } else { -- qCInfo(logDvbSi, "Usupported compression / mode %d %d", comp_type, mode); -+ qCInfo(logDvbSi, "Unsupported compression / mode %d %d", comp_type, mode); - } - - offset += num_bytes; ---- src/iso-codes.h.orig 2018-05-01 12:51:57 UTC -+++ src/iso-codes.h -@@ -14,6 +14,9 @@ - * GNU General Public License for more details. - */ - -+#ifndef ISO_CODES_H -+#define ISO_CODES_H -+ - class QString; - - namespace IsoCodes -@@ -21,3 +24,5 @@ namespace IsoCodes - bool getLanguage(const QString &code, QString *language); - bool getCountry(const QString &code, QString *country); - } -+ -+#endif ---- src/log.h.orig 2018-05-01 12:51:57 UTC -+++ src/log.h -@@ -18,6 +18,9 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -+#ifndef LOG_H -+#define LOG_H -+ - #include - - #include -@@ -40,3 +43,5 @@ Q_DECLARE_LOGGING_CATEGORY(logMediaWidge - Q_DECLARE_LOGGING_CATEGORY(logPlaylist) - Q_DECLARE_LOGGING_CATEGORY(logSql) - Q_DECLARE_LOGGING_CATEGORY(logVlc) -+ -+#endif ---- src/playlist/playlistmodel.cpp.orig 2018-05-01 12:51:57 UTC -+++ src/playlist/playlistmodel.cpp -@@ -172,8 +172,8 @@ QString Playlist::toRelativeUrl(const QU - if (trackPath.startsWith(playlistPath)) { - trackPath.remove(0, index + 1); - QUrl absolute (playlistPath); -- QStringList sBase = trackUrl.toString().split("/"); -- QStringList sAbsolute = absolute.toString().split("/"); -+ QStringList sBase = trackUrl.toString().split('/'); -+ QStringList sAbsolute = absolute.toString().split('/'); - QStringList res = QStringList(sAbsolute); - - if (trackUrl.isParentOf(absolute)) { ---- src/sqlinterface.cpp.orig 2018-05-01 12:51:57 UTC -+++ 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(); ---- tools/convertscanfiles.cpp.orig 2018-05-01 12:51:57 UTC -+++ tools/convertscanfiles.cpp -@@ -106,7 +106,7 @@ private: - QString rollOff = ""; - QString plscode = ""; - QString plsmode = ""; -- QString bandwith = ""; -+ QString bandwidth = ""; - QString fec_hi = ""; - QString fec_lo = ""; - QString t_mode = ""; -@@ -164,7 +164,7 @@ void parseDvbv5::resetParser() - rollOff = ""; - plscode = ""; - plsmode = ""; -- bandwith = ""; -+ bandwidth = ""; - fec_hi = ""; - fec_lo = ""; - t_mode = ""; -@@ -282,7 +282,7 @@ bool parseDvbv5::parseInputLine(QString - return false; - } - if (line.contains("BANDWIDTH_HZ")) { -- bandwith = line.split(" = ")[1]; -+ bandwidth = line.split(" = ")[1]; - return false; - } - if (line.contains("TRANSMISSION_MODE")) { -@@ -425,12 +425,12 @@ QString parseDvbv5::outputLine() - << lineno << " file" << name; - return line; - } -- line = "C " + frq + " " + symbolRate + " " + fec + " " + modulation.replace("/", ""); -+ line = "C " + frq + ' ' + symbolRate + ' ' + fec + ' ' + modulation.remove("/"); - return line; - } - case DvbTransponderBase::DvbS: { - if (rollOff.isEmpty() && (modulation.isEmpty() || !modulation.compare("QPSK"))) { -- line = "S " + frq + " " + polar[0] + " " + symbolRate + " " + fec; -+ line = "S " + frq + ' ' + polar[0] + ' ' + symbolRate + ' ' + fec; - return line; - } - type = DvbTransponderBase::DvbS2; -@@ -445,49 +445,49 @@ QString parseDvbv5::outputLine() - if (modulation.isEmpty()) { - modulation = "AUTO"; - } if (modulation.contains("/")) { -- QString temp1 = modulation.split("/")[0]; -- QString temp2 = modulation.split("/")[1]; -+ QString temp1 = modulation.split('/')[0]; -+ QString temp2 = modulation.split('/')[1]; - modulation = temp2 + temp1; - } - -- line = "S2 " + frq + " " + polar[0] + " " + symbolRate + " " + fec + " " + rollOff + " " + modulation; -+ line = "S2 " + frq + ' ' + polar[0] + ' ' + symbolRate + ' ' + fec + ' ' + rollOff + ' ' + modulation; - - return line; - } - case DvbTransponderBase::DvbT: { - line = "T " + frq; -- if (!bandwith.isEmpty()) { -- int number = bandwith.toInt(); -+ if (!bandwidth.isEmpty()) { -+ int number = bandwidth.toInt(); - number = number / 1000000; -- line += " " + QString::number(number) + "MHz"; -+ line += ' ' + QString::number(number) + "MHz"; - } - if (!fec_hi.isEmpty()) { -- line += " " + fec_hi; -+ line += ' ' + fec_hi; - } else { - line += " AUTO"; - } - if (!fec_lo.isEmpty()) { -- line += " " + fec_lo; -+ line += ' ' + fec_lo; - } else { - line += " AUTO"; - } - if (!modulation.isEmpty()) { -- line += " " + modulation.replace("/", "").replace("QAMAUTO", "AUTO"); -+ line += ' ' + modulation.remove("/").replace("QAMAUTO", "AUTO"); - } else { - line += " AUTO"; - } - if (!t_mode.isEmpty()) { -- line += " " + t_mode.replace("K", "k"); -+ line += ' ' + t_mode.replace("K", "k"); - } else { - line += " AUTO"; - } - if (!g_interval.isEmpty()) { -- line += " " + g_interval; -+ line += ' ' + g_interval; - } else { - line += " AUTO"; - } - if (!hierarchy.isEmpty()) { -- line += " " + hierarchy; -+ line += ' ' + hierarchy; - } else { - line += " AUTO"; - } -@@ -495,53 +495,53 @@ QString parseDvbv5::outputLine() - } - case DvbTransponderBase::DvbT2: { - line = "T2 " + frq; -- if (!bandwith.isEmpty()) { -- int number = bandwith.toInt(); -+ if (!bandwidth.isEmpty()) { -+ int number = bandwidth.toInt(); - number = number / 1000000; -- line += " " + QString::number(number) + "MHz"; -+ line += ' ' + QString::number(number) + "MHz"; - } - if (!fec_hi.isEmpty()) { -- line += " " + fec_hi; -+ line += ' ' + fec_hi; - } else { - line += " AUTO"; - } - if (!fec_lo.isEmpty()) { -- line += " " + fec_lo; -+ line += ' ' + fec_lo; - } else { - line += " AUTO"; - } - if (!modulation.isEmpty()) { -- line += " " + modulation.replace("/", "").replace("QAMAUTO", "AUTO"); -+ line += ' ' + modulation.remove("/").replace("QAMAUTO", "AUTO"); - } else { - line += " AUTO"; - } - if (!t_mode.isEmpty()) { -- line += " " + t_mode.replace("K", "k"); -+ line += ' ' + t_mode.replace("K", "k"); - } else { - line += " AUTO"; - } - if (!g_interval.isEmpty()) { -- line += " " + g_interval; -+ line += ' ' + g_interval; - } else { - line += " AUTO"; - } - if (!hierarchy.isEmpty()) { -- line += " " + hierarchy; -+ line += ' ' + hierarchy; - } else { - line += " AUTO"; - } -- line += " " + QString::number(streamid); -+ line += ' ' + QString::number(streamid); - return line; - } - case DvbTransponderBase::Atsc: { - line = "A " + frq; - if (!modulation.isEmpty()) { -- QString temp1 = modulation.split("/")[0]; -- QString temp2 = modulation.split("/")[1]; -+ QString temp1 = modulation.split('/')[0]; -+ QString temp2 = modulation.split('/')[1]; - if (!(temp1 == "QAM")) { -- line += " " + temp2 + temp1; -+ line += ' ' + temp2 + temp1; - } else { -- line += " " + temp1 + temp2; -+ line += ' ' + temp1 + temp2; - } - } else { - line += " AUTO"; -@@ -550,111 +550,111 @@ QString parseDvbv5::outputLine() - } - case DvbTransponderBase::IsdbT: { - line = "I " + frq; -- if (!bandwith.isEmpty()) { -- int number = bandwith.toInt(); -+ if (!bandwidth.isEmpty()) { -+ int number = bandwidth.toInt(); - number = number / 1000000; -- line += " " + QString::number(number) + "MHz"; -+ line += ' ' + QString::number(number) + "MHz"; - } else { - line += " 6MHz"; - } - if (!t_mode.isEmpty()) { -- line += " " + t_mode.replace("K", "k"); -+ line += ' ' + t_mode.replace("K", "k"); - } else { - line += " AUTO"; - } - if (!g_interval.isEmpty()) { -- line += " " + g_interval; -+ line += ' ' + g_interval; - } else { - line += " AUTO"; - } - if (!isdbtPartialReception.isEmpty()) { -- line += " " + isdbtPartialReception; -+ line += ' ' + isdbtPartialReception; - } else { - line += " AUTO"; - } - if (!isdbtSb.isEmpty()) { -- line += " " + isdbtSb; -+ line += ' ' + isdbtSb; - } else { - line += " AUTO"; - } - if (!isdbtSbSubchId.isEmpty()) { -- line += " " + isdbtSbSubchId; -+ line += ' ' + isdbtSbSubchId; - } else { - line += " AUTO"; - } - if (!isdbtSbSegCount.isEmpty()) { -- line += " " + isdbtSbSegCount; -+ line += ' ' + isdbtSbSegCount; - } else { - line += " AUTO"; - } - if (!isdbtSbSegIdx.isEmpty()) { -- line += " " + isdbtSbSegIdx; -+ line += ' ' + isdbtSbSegIdx; - } else { - line += " AUTO"; - } - -- line += " " + QString::number(isdbtLayers); -+ line += ' ' + QString::number(isdbtLayers); - - // Layer A - if (!isdbtLayerAModulation.isEmpty()) { -- line += " " + isdbtLayerAModulation.replace("/", "").replace("QAMAUTO", "AUTO"); -+ line += ' ' + isdbtLayerAModulation.remove("/").replace("QAMAUTO", "AUTO"); - } else { - line += " AUTO"; - } - if (!isdbtLayerAFec.isEmpty()) { -- line += " " + isdbtLayerAFec; -+ line += ' ' + isdbtLayerAFec; - } else { - line += " AUTO"; - } - if (!isdbtLayerASegCount.isEmpty()) { -- line += " " + isdbtLayerASegCount; -+ line += ' ' + isdbtLayerASegCount; - } else { - line += " AUTO"; - } - if (!isdbtLayerAInterleaving.isEmpty()) { -- line += " " + isdbtLayerAInterleaving; -+ line += ' ' + isdbtLayerAInterleaving; - } else { - line += " AUTO"; - } - // Layer B - if (!isdbtLayerBModulation.isEmpty()) { -- line += " " + isdbtLayerBModulation.replace("/", "").replace("QAMAUTO", "AUTO"); -+ line += ' ' + isdbtLayerBModulation.remove("/").replace("QAMAUTO", "AUTO"); - } else { - line += " AUTO"; - } - if (!isdbtLayerBFec.isEmpty()) { -- line += " " + isdbtLayerBFec; -+ line += ' ' + isdbtLayerBFec; - } else { - line += " AUTO"; - } - if (!isdbtLayerBSegCount.isEmpty()) { -- line += " " + isdbtLayerBSegCount; -+ line += ' ' + isdbtLayerBSegCount; - } else { - line += " AUTO"; - } - if (!isdbtLayerBInterleaving.isEmpty()) { -- line += " " + isdbtLayerBInterleaving; -+ line += ' ' + isdbtLayerBInterleaving; - } else { - line += " AUTO"; - } - // Layer C - if (!isdbtLayerCModulation.isEmpty()) { -- line += " " + isdbtLayerCModulation.replace("/", "").replace("QAMAUTO", "AUTO"); -+ line += ' ' + isdbtLayerCModulation.remove("/").replace("QAMAUTO", "AUTO"); - } else { - line += " AUTO"; - } - if (!isdbtLayerCFec.isEmpty()) { -- line += " " + isdbtLayerCFec; -+ line += ' ' + isdbtLayerCFec; - } else { - line += " AUTO"; - } - if (!isdbtLayerCSegCount.isEmpty()) { -- line += " " + isdbtLayerCSegCount; -+ line += ' ' + isdbtLayerCSegCount; - } else { - line += " AUTO"; - } - if (!isdbtLayerCInterleaving.isEmpty()) { -- line += " " + isdbtLayerCInterleaving; -+ line += ' ' + isdbtLayerCInterleaving; - } else { - line += " AUTO"; - } ---- tools/updatemimetypes.cpp.orig 2018-05-01 12:51:57 UTC -+++ tools/updatemimetypes.cpp -@@ -290,6 +290,6 @@ int main(int argc, char *argv[]) - file.close(); - } - -- qInfo() << "file extensions updated successfuly."; -+ qInfo() << "file extensions updated successfully."; - return 0; - } ---- tools/updatesource.cpp.orig 2018-05-01 12:51:57 UTC -+++ tools/updatesource.cpp -@@ -74,7 +74,7 @@ int main(int argc, char *argv[]) - return 1; - } - -- if (path.endsWith(".png") || path.endsWith(".svgz")) { -+ if (path.endsWith(QLatin1String(".png")) || path.endsWith(QLatin1String(".svgz"))) { - continue; - } - Property changes on: head/multimedia/kaffeine/files/patch-git ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/kaffeine/Makefile =================================================================== --- head/multimedia/kaffeine/Makefile (revision 490625) +++ head/multimedia/kaffeine/Makefile (revision 490626) @@ -1,36 +1,35 @@ # Created by: arved # $FreeBSD$ PORTNAME= kaffeine -PORTVERSION= 2.0.15 -PORTREVISION= 2 +DISTVERSION= 2.0.16-2 CATEGORIES= multimedia kde MASTER_SITES= KDE/stable/${PORTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Multimedia player based on KDE and VLC LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat LIB_DEPENDS= libvlc.so:multimedia/vlc \ libdvbv5.so:multimedia/libv4l USES= cmake cpe desktop-file-utils gettext pkgconfig \ kde:5 qt:5 tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons i18n itemviews kio solid dbusaddons jobwidgets \ service widgetsaddons windowsystem xmlgui USE_QT= concurrent core dbus gui network phonon4 sql svg x11extras xml \ widgets qmake_build buildtools_build USE_XORG= xscrnsaver CPE_VENDOR= kaffeine CPE_PRODUCT= kaffeine_player post-build: # Cleanup translated manpages, we don't want them ${RM} ${STAGEDIR}/man/{ca,id,it,nl,pt,pt_BR,sv,uk}/man1/kaffeine.1.gz .include Index: head/multimedia/kaffeine/distinfo =================================================================== --- head/multimedia/kaffeine/distinfo (revision 490625) +++ head/multimedia/kaffeine/distinfo (revision 490626) @@ -1,3 +1,3 @@ -TIMESTAMP = 1545489876 -SHA256 (kaffeine-2.0.15.tar.xz) = e61573199fe4e04377679a5cf8b32b3aa0bb4201c56371e11820d3a3ae41904d -SIZE (kaffeine-2.0.15.tar.xz) = 5988584 +TIMESTAMP = 1547753621 +SHA256 (kaffeine-2.0.16-2.tar.xz) = 8659189d907c2512321dd2c0d0c47176229c344970d633e33f29ce82432deee5 +SIZE (kaffeine-2.0.16-2.tar.xz) = 5995824 Index: head/multimedia/kaffeine/pkg-plist =================================================================== --- head/multimedia/kaffeine/pkg-plist (revision 490625) +++ head/multimedia/kaffeine/pkg-plist (revision 490626) @@ -1,295 +1,257 @@ bin/kaffeine man/ca/man1/kaffeine.1.gz man/id/man1/kaffeine.1.gz man/it/man1/kaffeine.1.gz man/man1/kaffeine.1.gz man/nl/man1/kaffeine.1.gz man/pt/man1/kaffeine.1.gz man/pt_BR/man1/kaffeine.1.gz man/sv/man1/kaffeine.1.gz man/uk/man1/kaffeine.1.gz share/applications/org.kde.kaffeine.desktop share/doc/HTML/ca/kaffeine/application-x-subrip.png share/doc/HTML/ca/kaffeine/audio-volume-high.png share/doc/HTML/ca/kaffeine/audio-volume-low.png share/doc/HTML/ca/kaffeine/audio-volume-medium.png share/doc/HTML/ca/kaffeine/audio-volume-muted.png share/doc/HTML/ca/kaffeine/configure-shortcuts.png share/doc/HTML/ca/kaffeine/configure.png share/doc/HTML/ca/kaffeine/dialog-information.png share/doc/HTML/ca/kaffeine/document-open-folder.png share/doc/HTML/ca/kaffeine/document-open-recent.png share/doc/HTML/ca/kaffeine/document-save-as.png share/doc/HTML/ca/kaffeine/document-save.png share/doc/HTML/ca/kaffeine/edit-clear-list.png share/doc/HTML/ca/kaffeine/edit-delete.png share/doc/HTML/ca/kaffeine/edit-rename.png share/doc/HTML/ca/kaffeine/format-justify-center.png share/doc/HTML/ca/kaffeine/go-jump.png share/doc/HTML/ca/kaffeine/gtk-quit.png share/doc/HTML/ca/kaffeine/index.cache.bz2 share/doc/HTML/ca/kaffeine/index.docbook share/doc/HTML/ca/kaffeine/kaffeine_configure_tv_dvbc_dvbt2_device.png share/doc/HTML/ca/kaffeine/kaffeine_configure_tv_dvbs2_device.png share/doc/HTML/ca/kaffeine/kaffeine_configure_tv_general_opts.png share/doc/HTML/ca/kaffeine/kaffeine_configure_tv_isdb_device.png share/doc/HTML/ca/kaffeine/kaffeine_configure_tv_lnbf.png share/doc/HTML/ca/kaffeine/kaffeine_initial.png share/doc/HTML/ca/kaffeine/kaffeine_live_tv.png share/doc/HTML/ca/kaffeine/kaffeine_play_file.png share/doc/HTML/ca/kaffeine/kaffeine_program_guide.png share/doc/HTML/ca/kaffeine/kaffeine_recording_schedule_enabled.png share/doc/HTML/ca/kaffeine/kaffeine_scan_channel_edit.png share/doc/HTML/ca/kaffeine/kaffeine_scan_finished_channels_added.png share/doc/HTML/ca/kaffeine/list-add.png share/doc/HTML/ca/kaffeine/media-optical-audio.png share/doc/HTML/ca/kaffeine/media-optical-video.png share/doc/HTML/ca/kaffeine/media-optical.png share/doc/HTML/ca/kaffeine/media-playback-pause-circular.png share/doc/HTML/ca/kaffeine/media-playback-pause.png share/doc/HTML/ca/kaffeine/media-playback-start-circular.png share/doc/HTML/ca/kaffeine/media-playback-start.png share/doc/HTML/ca/kaffeine/media-playback-stop.png share/doc/HTML/ca/kaffeine/media-playlist-repeat.png share/doc/HTML/ca/kaffeine/media-playlist-shuffle.png share/doc/HTML/ca/kaffeine/media-record.png share/doc/HTML/ca/kaffeine/media-skip-backward.png share/doc/HTML/ca/kaffeine/media-skip-forward.png share/doc/HTML/ca/kaffeine/playlistwindow.png -share/doc/HTML/ca/kaffeine/startwindow.png share/doc/HTML/ca/kaffeine/text-html.png share/doc/HTML/ca/kaffeine/video-television.png share/doc/HTML/ca/kaffeine/view-fullscreen.png share/doc/HTML/ca/kaffeine/view-list-details.png share/doc/HTML/ca/kaffeine/view-pim-calendar.png share/doc/HTML/ca/kaffeine/view-restore.png share/doc/HTML/en/kaffeine/application-x-subrip.png share/doc/HTML/en/kaffeine/audio-volume-high.png share/doc/HTML/en/kaffeine/audio-volume-low.png share/doc/HTML/en/kaffeine/audio-volume-medium.png share/doc/HTML/en/kaffeine/audio-volume-muted.png share/doc/HTML/en/kaffeine/configure-shortcuts.png share/doc/HTML/en/kaffeine/configure.png share/doc/HTML/en/kaffeine/dialog-information.png share/doc/HTML/en/kaffeine/document-open-folder.png share/doc/HTML/en/kaffeine/document-open-recent.png share/doc/HTML/en/kaffeine/document-save-as.png share/doc/HTML/en/kaffeine/document-save.png share/doc/HTML/en/kaffeine/edit-clear-list.png share/doc/HTML/en/kaffeine/edit-delete.png share/doc/HTML/en/kaffeine/edit-rename.png share/doc/HTML/en/kaffeine/format-justify-center.png share/doc/HTML/en/kaffeine/go-jump.png share/doc/HTML/en/kaffeine/gtk-quit.png share/doc/HTML/en/kaffeine/index.cache.bz2 share/doc/HTML/en/kaffeine/index.docbook share/doc/HTML/en/kaffeine/kaffeine_configure_tv_dvbc_dvbt2_device.png share/doc/HTML/en/kaffeine/kaffeine_configure_tv_dvbs2_device.png share/doc/HTML/en/kaffeine/kaffeine_configure_tv_general_opts.png share/doc/HTML/en/kaffeine/kaffeine_configure_tv_isdb_device.png share/doc/HTML/en/kaffeine/kaffeine_configure_tv_lnbf.png share/doc/HTML/en/kaffeine/kaffeine_initial.png share/doc/HTML/en/kaffeine/kaffeine_live_tv.png share/doc/HTML/en/kaffeine/kaffeine_play_file.png share/doc/HTML/en/kaffeine/kaffeine_program_guide.png share/doc/HTML/en/kaffeine/kaffeine_recording_schedule_enabled.png share/doc/HTML/en/kaffeine/kaffeine_scan_channel_edit.png share/doc/HTML/en/kaffeine/kaffeine_scan_finished_channels_added.png share/doc/HTML/en/kaffeine/list-add.png share/doc/HTML/en/kaffeine/media-optical-audio.png share/doc/HTML/en/kaffeine/media-optical-video.png share/doc/HTML/en/kaffeine/media-optical.png share/doc/HTML/en/kaffeine/media-playback-pause-circular.png share/doc/HTML/en/kaffeine/media-playback-pause.png share/doc/HTML/en/kaffeine/media-playback-start-circular.png share/doc/HTML/en/kaffeine/media-playback-start.png share/doc/HTML/en/kaffeine/media-playback-stop.png share/doc/HTML/en/kaffeine/media-playlist-repeat.png share/doc/HTML/en/kaffeine/media-playlist-shuffle.png share/doc/HTML/en/kaffeine/media-record.png share/doc/HTML/en/kaffeine/media-skip-backward.png share/doc/HTML/en/kaffeine/media-skip-forward.png share/doc/HTML/en/kaffeine/playlistwindow.png share/doc/HTML/en/kaffeine/text-html.png share/doc/HTML/en/kaffeine/video-television.png share/doc/HTML/en/kaffeine/view-fullscreen.png share/doc/HTML/en/kaffeine/view-list-details.png share/doc/HTML/en/kaffeine/view-pim-calendar.png share/doc/HTML/en/kaffeine/view-restore.png share/doc/HTML/id/kaffeine/index.cache.bz2 share/doc/HTML/id/kaffeine/index.docbook share/doc/HTML/it/kaffeine/index.cache.bz2 share/doc/HTML/it/kaffeine/index.docbook share/doc/HTML/nl/kaffeine/index.cache.bz2 share/doc/HTML/nl/kaffeine/index.docbook share/doc/HTML/pt/kaffeine/index.cache.bz2 share/doc/HTML/pt/kaffeine/index.docbook -share/doc/HTML/pt_BR/kaffeine/application-x-subrip.png -share/doc/HTML/pt_BR/kaffeine/audio-volume-high.png -share/doc/HTML/pt_BR/kaffeine/audio-volume-low.png -share/doc/HTML/pt_BR/kaffeine/audio-volume-medium.png -share/doc/HTML/pt_BR/kaffeine/audio-volume-muted.png -share/doc/HTML/pt_BR/kaffeine/configure-shortcuts.png -share/doc/HTML/pt_BR/kaffeine/configure.png -share/doc/HTML/pt_BR/kaffeine/dialog-information.png -share/doc/HTML/pt_BR/kaffeine/document-open-folder.png -share/doc/HTML/pt_BR/kaffeine/document-open-recent.png -share/doc/HTML/pt_BR/kaffeine/document-save-as.png share/doc/HTML/pt_BR/kaffeine/document-save.png -share/doc/HTML/pt_BR/kaffeine/edit-clear-list.png -share/doc/HTML/pt_BR/kaffeine/edit-delete.png -share/doc/HTML/pt_BR/kaffeine/edit-rename.png -share/doc/HTML/pt_BR/kaffeine/format-justify-center.png -share/doc/HTML/pt_BR/kaffeine/go-jump.png -share/doc/HTML/pt_BR/kaffeine/gtk-quit.png share/doc/HTML/pt_BR/kaffeine/index.cache.bz2 share/doc/HTML/pt_BR/kaffeine/index.docbook share/doc/HTML/pt_BR/kaffeine/kaffeine_configure_tv_dvbc_dvbt2_device.png share/doc/HTML/pt_BR/kaffeine/kaffeine_configure_tv_dvbs2_device.png share/doc/HTML/pt_BR/kaffeine/kaffeine_configure_tv_general_opts.png share/doc/HTML/pt_BR/kaffeine/kaffeine_configure_tv_isdb_device.png share/doc/HTML/pt_BR/kaffeine/kaffeine_configure_tv_lnbf.png share/doc/HTML/pt_BR/kaffeine/kaffeine_initial.png share/doc/HTML/pt_BR/kaffeine/kaffeine_live_tv.png share/doc/HTML/pt_BR/kaffeine/kaffeine_play_file.png share/doc/HTML/pt_BR/kaffeine/kaffeine_program_guide.png share/doc/HTML/pt_BR/kaffeine/kaffeine_recording_schedule_enabled.png share/doc/HTML/pt_BR/kaffeine/kaffeine_scan_channel_edit.png share/doc/HTML/pt_BR/kaffeine/kaffeine_scan_finished_channels_added.png -share/doc/HTML/pt_BR/kaffeine/list-add.png -share/doc/HTML/pt_BR/kaffeine/media-optical-audio.png -share/doc/HTML/pt_BR/kaffeine/media-optical-video.png -share/doc/HTML/pt_BR/kaffeine/media-optical.png -share/doc/HTML/pt_BR/kaffeine/media-playback-pause-circular.png -share/doc/HTML/pt_BR/kaffeine/media-playback-pause.png -share/doc/HTML/pt_BR/kaffeine/media-playback-start-circular.png -share/doc/HTML/pt_BR/kaffeine/media-playback-start.png -share/doc/HTML/pt_BR/kaffeine/media-playback-stop.png -share/doc/HTML/pt_BR/kaffeine/media-playlist-repeat.png -share/doc/HTML/pt_BR/kaffeine/media-playlist-shuffle.png share/doc/HTML/pt_BR/kaffeine/media-record.png -share/doc/HTML/pt_BR/kaffeine/media-skip-backward.png -share/doc/HTML/pt_BR/kaffeine/media-skip-forward.png share/doc/HTML/pt_BR/kaffeine/playlistwindow.png share/doc/HTML/pt_BR/kaffeine/startwindow.png -share/doc/HTML/pt_BR/kaffeine/text-html.png -share/doc/HTML/pt_BR/kaffeine/video-television.png -share/doc/HTML/pt_BR/kaffeine/view-fullscreen.png -share/doc/HTML/pt_BR/kaffeine/view-list-details.png -share/doc/HTML/pt_BR/kaffeine/view-pim-calendar.png -share/doc/HTML/pt_BR/kaffeine/view-restore.png share/doc/HTML/sv/kaffeine/index.cache.bz2 share/doc/HTML/sv/kaffeine/index.docbook share/doc/HTML/uk/kaffeine/index.cache.bz2 share/doc/HTML/uk/kaffeine/index.docbook share/icons/hicolor/scalable/actions/arrow-left.svg share/icons/hicolor/scalable/actions/arrow-right.svg share/icons/hicolor/scalable/actions/audio-radio-encrypted.svg share/icons/hicolor/scalable/actions/configure.svg share/icons/hicolor/scalable/actions/dialog-cancel.svg share/icons/hicolor/scalable/actions/dialog-ok-apply.svg share/icons/hicolor/scalable/actions/document-open-folder.svg share/icons/hicolor/scalable/actions/document-save.svg share/icons/hicolor/scalable/actions/edit-clear-list.svg share/icons/hicolor/scalable/actions/edit-delete.svg share/icons/hicolor/scalable/actions/edit-find.svg share/icons/hicolor/scalable/actions/edit-rename.svg share/icons/hicolor/scalable/actions/edit-undo.svg share/icons/hicolor/scalable/actions/format-justify-center.svg share/icons/hicolor/scalable/actions/go-jump.svg share/icons/hicolor/scalable/actions/list-add.svg share/icons/hicolor/scalable/actions/media-playback-pause.svg share/icons/hicolor/scalable/actions/media-playback-start.svg share/icons/hicolor/scalable/actions/media-playback-stop.svg share/icons/hicolor/scalable/actions/media-record.svg share/icons/hicolor/scalable/actions/media-skip-backward.svg share/icons/hicolor/scalable/actions/media-skip-forward.svg share/icons/hicolor/scalable/actions/page-zoom.svg share/icons/hicolor/scalable/actions/player-time.svg share/icons/hicolor/scalable/actions/text-speak.svg share/icons/hicolor/scalable/actions/video-television-encrypted.svg share/icons/hicolor/scalable/actions/view-fullscreen.svg share/icons/hicolor/scalable/actions/view-list-details.svg share/icons/hicolor/scalable/actions/view-media-playlist.svg share/icons/hicolor/scalable/actions/view-pim-calendar.svg share/icons/hicolor/scalable/actions/view-refresh.svg share/icons/hicolor/scalable/actions/view-restore.svg share/icons/hicolor/scalable/apps/kaffeine.svg share/icons/hicolor/scalable/devices/audio-card.svg share/icons/hicolor/scalable/devices/media-optical-audio.svg share/icons/hicolor/scalable/devices/media-optical-video.svg share/icons/hicolor/scalable/devices/media-optical.svg share/icons/hicolor/scalable/devices/video-television.svg share/icons/hicolor/scalable/mimetypes/application-x-subrip.svg share/icons/hicolor/scalable/mimetypes/text-html.svg share/icons/hicolor/scalable/mimetypes/video-x-generic.svg share/icons/hicolor/scalable/places/start-here-kde.svg share/icons/hicolor/scalable/status/audio-volume-high.svg share/icons/hicolor/scalable/status/audio-volume-low.svg share/icons/hicolor/scalable/status/audio-volume-medium.svg share/icons/hicolor/scalable/status/audio-volume-muted.svg share/icons/hicolor/scalable/status/dialog-error.svg share/icons/hicolor/scalable/status/dialog-information.svg %%DATADIR%%/scanfile.dvb share/locale/ar/LC_MESSAGES/kaffeine.mo -share/locale/ast/LC_MESSAGES/kaffeine.mo share/locale/be/LC_MESSAGES/kaffeine.mo share/locale/bg/LC_MESSAGES/kaffeine.mo share/locale/bs/LC_MESSAGES/kaffeine.mo share/locale/ca/LC_MESSAGES/kaffeine.mo share/locale/ca@valencia/LC_MESSAGES/kaffeine.mo share/locale/cs/LC_MESSAGES/kaffeine.mo share/locale/da/LC_MESSAGES/kaffeine.mo share/locale/de/LC_MESSAGES/kaffeine.mo share/locale/el/LC_MESSAGES/kaffeine.mo share/locale/en_GB/LC_MESSAGES/kaffeine.mo share/locale/eo/LC_MESSAGES/kaffeine.mo share/locale/es/LC_MESSAGES/kaffeine.mo share/locale/et/LC_MESSAGES/kaffeine.mo share/locale/eu/LC_MESSAGES/kaffeine.mo share/locale/fi/LC_MESSAGES/kaffeine.mo share/locale/fr/LC_MESSAGES/kaffeine.mo share/locale/ga/LC_MESSAGES/kaffeine.mo share/locale/gl/LC_MESSAGES/kaffeine.mo share/locale/hr/LC_MESSAGES/kaffeine.mo share/locale/hu/LC_MESSAGES/kaffeine.mo share/locale/ia/LC_MESSAGES/kaffeine.mo share/locale/id/LC_MESSAGES/kaffeine.mo share/locale/it/LC_MESSAGES/kaffeine.mo share/locale/ja/LC_MESSAGES/kaffeine.mo share/locale/km/LC_MESSAGES/kaffeine.mo share/locale/ko/LC_MESSAGES/kaffeine.mo share/locale/ku/LC_MESSAGES/kaffeine.mo share/locale/lt/LC_MESSAGES/kaffeine.mo share/locale/mai/LC_MESSAGES/kaffeine.mo share/locale/mr/LC_MESSAGES/kaffeine.mo share/locale/nb/LC_MESSAGES/kaffeine.mo share/locale/nds/LC_MESSAGES/kaffeine.mo share/locale/nl/LC_MESSAGES/kaffeine.mo share/locale/nn/LC_MESSAGES/kaffeine.mo share/locale/pa/LC_MESSAGES/kaffeine.mo share/locale/pl/LC_MESSAGES/kaffeine.mo share/locale/pt/LC_MESSAGES/kaffeine.mo share/locale/pt_BR/LC_MESSAGES/kaffeine.mo share/locale/ro/LC_MESSAGES/kaffeine.mo share/locale/ru/LC_MESSAGES/kaffeine.mo share/locale/se/LC_MESSAGES/kaffeine.mo share/locale/sk/LC_MESSAGES/kaffeine.mo share/locale/sl/LC_MESSAGES/kaffeine.mo share/locale/sq/LC_MESSAGES/kaffeine.mo share/locale/sr/LC_MESSAGES/kaffeine.mo share/locale/sr@ijekavian/LC_MESSAGES/kaffeine.mo share/locale/sr@ijekavianlatin/LC_MESSAGES/kaffeine.mo share/locale/sr@latin/LC_MESSAGES/kaffeine.mo share/locale/sv/LC_MESSAGES/kaffeine.mo share/locale/th/LC_MESSAGES/kaffeine.mo share/locale/tr/LC_MESSAGES/kaffeine.mo share/locale/ug/LC_MESSAGES/kaffeine.mo share/locale/uk/LC_MESSAGES/kaffeine.mo share/locale/zh_CN/LC_MESSAGES/kaffeine.mo share/locale/zh_TW/LC_MESSAGES/kaffeine.mo share/metainfo/org.kde.kaffeine.appdata.xml share/profiles/kaffeine.profile.xml share/solid/actions/kaffeine_play_audiocd.desktop share/solid/actions/kaffeine_play_dvd.desktop share/solid/actions/kaffeine_play_videocd.desktop