Hello community, here is the log from the commit of package knotifyconfig for openSUSE:Factory checked in at 2018-01-09 14:43:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knotifyconfig (Old) and /work/SRC/openSUSE:Factory/.knotifyconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knotifyconfig" Tue Jan 9 14:43:35 2018 rev:47 rq:559458 version:5.41.0 Changes: -------- --- /work/SRC/openSUSE:Factory/knotifyconfig/knotifyconfig.changes 2017-11-16 14:39:59.772886798 +0100 +++ /work/SRC/openSUSE:Factory/.knotifyconfig.new/knotifyconfig.changes 2018-01-09 14:43:37.254731479 +0100 @@ -1,0 +2,10 @@ +Sun Dec 17 09:43:49 CET 2017 - lbeltr...@kde.org + +- Update to 5.41.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.41.0.php +- Changes since 5.40.0: + * Build with strict compile flags + +------------------------------------------------------------------- Old: ---- knotifyconfig-5.40.0.tar.xz New: ---- knotifyconfig-5.41.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knotifyconfig.spec ++++++ --- /var/tmp/diff_new_pack.p7ooLz/_old 2018-01-09 14:43:37.802705782 +0100 +++ /var/tmp/diff_new_pack.p7ooLz/_new 2018-01-09 14:43:37.802705782 +0100 @@ -18,13 +18,13 @@ %bcond_without lang %define lname libKF5NotifyConfig5 -%define _tar_path 5.40 +%define _tar_path 5.41 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: knotifyconfig -Version: 5.40.0 +Version: 5.41.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 ++++++ knotifyconfig-5.40.0.tar.xz -> knotifyconfig-5.41.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifyconfig-5.40.0/CMakeLists.txt new/knotifyconfig-5.41.0/CMakeLists.txt --- old/knotifyconfig-5.40.0/CMakeLists.txt 2017-11-05 09:36:10.000000000 +0100 +++ new/knotifyconfig-5.41.0/CMakeLists.txt 2017-12-02 21:07:12.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.40.0") # handled by release scripts -set(KF5_DEP_VERSION "5.40.0") # handled by release scripts +set(KF5_VERSION "5.41.0") # handled by release scripts +set(KF5_DEP_VERSION "5.41.0") # handled by release scripts project(KNotifyConfig VERSION ${KF5_VERSION}) # Dependencies include(FeatureSummary) -find_package(ECM 5.40.0 NO_MODULE) +find_package(ECM 5.41.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifyconfig-5.40.0/po/zh_CN/knotifyconfig5.po new/knotifyconfig-5.41.0/po/zh_CN/knotifyconfig5.po --- old/knotifyconfig-5.40.0/po/zh_CN/knotifyconfig5.po 2017-11-05 09:36:10.000000000 +0100 +++ new/knotifyconfig-5.41.0/po/zh_CN/knotifyconfig5.po 2017-12-02 21:07:12.000000000 +0100 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:12+0100\n" -"PO-Revision-Date: 2017-10-19 10:41-0400\n" +"PO-Revision-Date: 2017-11-09 08:34-0500\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifyconfig-5.40.0/src/CMakeLists.txt new/knotifyconfig-5.41.0/src/CMakeLists.txt --- old/knotifyconfig-5.40.0/src/CMakeLists.txt 2017-11-05 09:36:10.000000000 +0100 +++ new/knotifyconfig-5.41.0/src/CMakeLists.txt 2017-12-02 21:07:12.000000000 +0100 @@ -1,8 +1,6 @@ set(HAVE_PHONON ${Phonon4Qt5_FOUND}) configure_file(knotify-config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/knotify-config.h ) -remove_definitions(-DQT_NO_CAST_FROM_ASCII) - include_directories(BEFORE ${PHONON_INCLUDES}) ########### next target ############### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifyconfig-5.40.0/src/knotifyconfigactionswidget.cpp new/knotifyconfig-5.41.0/src/knotifyconfigactionswidget.cpp --- old/knotifyconfig-5.40.0/src/knotifyconfigactionswidget.cpp 2017-11-05 09:36:10.000000000 +0100 +++ new/knotifyconfig-5.41.0/src/knotifyconfigactionswidget.cpp 2017-12-02 21:07:12.000000000 +0100 @@ -31,18 +31,18 @@ m_ui.setupUi(this); //Show sounds directory by default - QStringList soundDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "sounds", QStandardPaths::LocateDirectory); + QStringList soundDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("sounds"), QStandardPaths::LocateDirectory); if (!soundDirs.isEmpty()) { m_ui.Sound_select->setStartDir(QUrl::fromLocalFile(soundDirs.last())); } - m_ui.Sound_play->setIcon(QIcon::fromTheme("media-playback-start")); - m_ui.Sound_check->setIcon(QIcon::fromTheme("media-playback-start")); - m_ui.Popup_check->setIcon(QIcon::fromTheme("dialog-information")); - m_ui.Logfile_check->setIcon(QIcon::fromTheme("text-x-generic")); - m_ui.Execute_check->setIcon(QIcon::fromTheme("system-run")); - m_ui.Taskbar_check->setIcon(QIcon::fromTheme("services")); - m_ui.TTS_check->setIcon(QIcon::fromTheme("text-speak")); + m_ui.Sound_play->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-start"))); + m_ui.Sound_check->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-start"))); + m_ui.Popup_check->setIcon(QIcon::fromTheme(QStringLiteral("dialog-information"))); + m_ui.Logfile_check->setIcon(QIcon::fromTheme(QStringLiteral("text-x-generic"))); + m_ui.Execute_check->setIcon(QIcon::fromTheme(QStringLiteral("system-run"))); + m_ui.Taskbar_check->setIcon(QIcon::fromTheme(QStringLiteral("services"))); + m_ui.TTS_check->setIcon(QIcon::fromTheme(QStringLiteral("text-speak"))); connect(m_ui.Execute_check, SIGNAL(toggled(bool)), this, SIGNAL(changed())); connect(m_ui.Sound_check, SIGNAL(toggled(bool)), this, SIGNAL(changed())); @@ -67,20 +67,20 @@ void KNotifyConfigActionsWidget::setConfigElement(KNotifyConfigElement *config) { bool blocked = blockSignals(true); //to block the changed() signal - QString prstring = config->readEntry("Action"); - QStringList actions = prstring.split('|'); + QString prstring = config->readEntry(QStringLiteral("Action")); + QStringList actions = prstring.split(QLatin1Char('|')); - m_ui.Sound_check->setChecked(actions.contains("Sound")); - m_ui.Popup_check->setChecked(actions.contains("Popup")); - m_ui.Logfile_check->setChecked(actions.contains("Logfile")); - m_ui.Execute_check->setChecked(actions.contains("Execute")); - m_ui.Taskbar_check->setChecked(actions.contains("Taskbar")); - m_ui.TTS_check->setChecked(actions.contains("TTS")); - - m_ui.Sound_select->setUrl(QUrl(config->readEntry("Sound", true))); - m_ui.Logfile_select->setUrl(QUrl(config->readEntry("Logfile", true))); - m_ui.Execute_select->setUrl(QUrl::fromLocalFile(config->readEntry("Execute"))); - m_ui.TTS_select->setText(config->readEntry("TTS")); + m_ui.Sound_check->setChecked(actions.contains(QStringLiteral("Sound"))); + m_ui.Popup_check->setChecked(actions.contains(QStringLiteral("Popup"))); + m_ui.Logfile_check->setChecked(actions.contains(QStringLiteral("Logfile"))); + m_ui.Execute_check->setChecked(actions.contains(QStringLiteral("Execute"))); + m_ui.Taskbar_check->setChecked(actions.contains(QStringLiteral("Taskbar"))); + m_ui.TTS_check->setChecked(actions.contains(QStringLiteral("TTS"))); + + m_ui.Sound_select->setUrl(QUrl(config->readEntry(QStringLiteral("Sound"), true))); + m_ui.Logfile_select->setUrl(QUrl(config->readEntry(QStringLiteral("Logfile"), true))); + m_ui.Execute_select->setUrl(QUrl::fromLocalFile(config->readEntry(QStringLiteral("Execute")))); + m_ui.TTS_select->setText(config->readEntry(QStringLiteral("TTS"))); if (m_ui.TTS_select->text() == QLatin1String("%e")) { m_ui.TTS_combo->setCurrentIndex(1); } else if (m_ui.TTS_select->text() == QLatin1String("%m") || m_ui.TTS_select->text() == QLatin1String("%s")) { @@ -95,39 +95,39 @@ { QStringList actions; if (m_ui.Sound_check->isChecked()) { - actions << "Sound"; + actions << QStringLiteral("Sound"); } if (m_ui.Popup_check->isChecked()) { - actions << "Popup"; + actions << QStringLiteral("Popup"); } if (m_ui.Logfile_check->isChecked()) { - actions << "Logfile"; + actions << QStringLiteral("Logfile"); } if (m_ui.Execute_check->isChecked()) { - actions << "Execute"; + actions << QStringLiteral("Execute"); } if (m_ui.Taskbar_check->isChecked()) { - actions << "Taskbar"; + actions << QStringLiteral("Taskbar"); } if (m_ui.TTS_check->isChecked()) { - actions << "TTS"; + actions << QStringLiteral("TTS"); } - config->writeEntry("Action", actions.join("|")); + config->writeEntry(QStringLiteral("Action"), actions.join(QLatin1Char('|'))); - config->writeEntry("Sound", m_ui.Sound_select->text()); // don't use .url() here, .notifyrc files have predefined "static" entries with no path - config->writeEntry("Logfile", m_ui.Logfile_select->url().toString()); - config->writeEntry("Execute", m_ui.Execute_select->url().toLocalFile()); + config->writeEntry(QStringLiteral("Sound"), m_ui.Sound_select->text()); // don't use .url() here, .notifyrc files have predefined "static" entries with no path + config->writeEntry(QStringLiteral("Logfile"), m_ui.Logfile_select->url().toString()); + config->writeEntry(QStringLiteral("Execute"), m_ui.Execute_select->url().toLocalFile()); switch (m_ui.TTS_combo->currentIndex()) { case 0: - config->writeEntry("TTS", "%s"); + config->writeEntry(QStringLiteral("TTS"), QStringLiteral("%s")); break; case 1: - config->writeEntry("TTS", "%e"); + config->writeEntry(QStringLiteral("TTS"), QStringLiteral("%e")); break; case 2: default: - config->writeEntry("TTS", m_ui.TTS_select->text()); + config->writeEntry(QStringLiteral("TTS"), m_ui.TTS_select->text()); } } @@ -138,7 +138,7 @@ const auto dataLocations = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); foreach (const QString &dataLocation, dataLocations) { soundURL = QUrl::fromUserInput(soundFilename, - dataLocation + "/sounds", + dataLocation + QStringLiteral("/sounds"), QUrl::AssumeLocalFile); if (soundURL.isLocalFile() && QFile::exists(soundURL.toLocalFile())) { break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifyconfig-5.40.0/src/knotifyconfigelement.cpp new/knotifyconfig-5.41.0/src/knotifyconfigelement.cpp --- old/knotifyconfig-5.40.0/src/knotifyconfigelement.cpp 2017-11-05 09:36:10.000000000 +0100 +++ new/knotifyconfig-5.41.0/src/knotifyconfigelement.cpp 2017-12-02 21:07:12.000000000 +0100 @@ -23,7 +23,7 @@ #include <kconfig.h> KNotifyConfigElement::KNotifyConfigElement(const QString &eventid, KConfig *config) - : m_config(new KConfigGroup(config, "Event/" + eventid)) + : m_config(new KConfigGroup(config, QStringLiteral("Event/") + eventid)) , m_eventId(eventid) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifyconfig-5.40.0/src/knotifyconfigwidget.cpp new/knotifyconfig-5.41.0/src/knotifyconfigwidget.cpp --- old/knotifyconfig-5.40.0/src/knotifyconfigwidget.cpp 2017-11-05 09:36:10.000000000 +0100 +++ new/knotifyconfig-5.41.0/src/knotifyconfigwidget.cpp 2017-12-02 21:07:12.000000000 +0100 @@ -101,7 +101,7 @@ emit changed(false); //ask KNotification objects to reload their config - QDBusMessage message = QDBusMessage::createSignal("/Config", "org.kde.knotification", "reparseConfiguration"); + QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/Config"), QStringLiteral("org.kde.knotification"), QStringLiteral("reparseConfiguration")); message.setArguments(QVariantList() << d->application); QDBusConnection::sessionBus().send(message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifyconfig-5.40.0/src/knotifyeventlist.cpp new/knotifyconfig-5.41.0/src/knotifyeventlist.cpp --- old/knotifyconfig-5.40.0/src/knotifyeventlist.cpp 2017-11-05 09:36:10.000000000 +0100 +++ new/knotifyconfig-5.41.0/src/knotifyeventlist.cpp 2017-12-02 21:07:12.000000000 +0100 @@ -60,15 +60,15 @@ QRect rect = option.rect; - QStringList optionsList = prstring.split('|'); + QStringList optionsList = prstring.split(QLatin1Char('|')); QList<QIcon> iconList; - iconList << (optionsList.contains("Sound") ? QIcon::fromTheme("media-playback-start") : QIcon()); - iconList << (optionsList.contains("Popup") ? QIcon::fromTheme("dialog-information") : QIcon()); - iconList << (optionsList.contains("Logfile") ? QIcon::fromTheme("text-x-generic") : QIcon()); - iconList << (optionsList.contains("Taskbar") ? QIcon::fromTheme("services") : QIcon()); - iconList << (optionsList.contains("Execute") ? QIcon::fromTheme("system-run") : QIcon()); + iconList << (optionsList.contains(QStringLiteral("Sound")) ? QIcon::fromTheme(QStringLiteral("media-playback-start")) : QIcon()); + iconList << (optionsList.contains(QStringLiteral("Popup")) ? QIcon::fromTheme(QStringLiteral("dialog-information")) : QIcon()); + iconList << (optionsList.contains(QStringLiteral("Logfile")) ? QIcon::fromTheme(QStringLiteral("text-x-generic")) : QIcon()); + iconList << (optionsList.contains(QStringLiteral("Taskbar")) ? QIcon::fromTheme(QStringLiteral("services")) : QIcon()); + iconList << (optionsList.contains(QStringLiteral("Execute")) ? QIcon::fromTheme(QStringLiteral("system-run")) : QIcon()); if (KNotifyConfigElement::have_tts()) { - iconList << (optionsList.contains("TTS") ? QIcon::fromTheme("text-speak") : QIcon()); + iconList << (optionsList.contains(QStringLiteral("TTS")) ? QIcon::fromTheme(QStringLiteral("text-speak")) : QIcon()); } int mc_x = 0; @@ -122,7 +122,7 @@ QStringLiteral("knotifications5/") + appname + QStringLiteral(".notifyrc"))); QStringList conflist = config->groupList(); - QRegExp rx("^Event/([^/]*)$"); + QRegExp rx(QStringLiteral("^Event/([^/]*)$")); conflist = conflist.filter(rx); foreach (const QString &group, conflist) { @@ -136,13 +136,13 @@ continue; } - id = id + '/' + context_name + '/' + context_value; + id = id + QLatin1Char('/') + context_name + QLatin1Char('/') + context_value; } QString name = cg.readEntry("Name"); QString description = cg.readEntry("Comment"); if (loadDefaults) { - KConfigGroup g(config, "Event/" + id); + KConfigGroup g(config, QStringLiteral("Event/") + id); foreach(const QString &entry, g.keyList()) { g.revertToDefault(entry); } @@ -166,9 +166,9 @@ { bool changed = false; foreach (KNotifyEventListItem *it, m_elements) { - QStringList actions = it->configElement()->readEntry("Action").split('|'); - if (actions.removeAll("Sound")) { - it->configElement()->writeEntry("Action", actions.join('|')); + QStringList actions = it->configElement()->readEntry(QStringLiteral("Action")).split(QLatin1Char('|')); + if (actions.removeAll(QStringLiteral("Sound"))) { + it->configElement()->writeEntry(QStringLiteral("Action"), actions.join(QLatin1Char('|'))); changed = true; } } @@ -247,6 +247,6 @@ void KNotifyEventListItem::update() { - setData(0, Qt::UserRole, m_config.readEntry("Action")); + setData(0, Qt::UserRole, m_config.readEntry(QStringLiteral("Action"))); }
