Hello community, here is the log from the commit of package kinit for openSUSE:Factory checked in at 2019-04-19 21:23:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kinit (Old) and /work/SRC/openSUSE:Factory/.kinit.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kinit" Fri Apr 19 21:23:00 2019 rev:65 rq:695230 version:5.57.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kinit/kinit.changes 2019-03-21 09:46:27.506895354 +0100 +++ /work/SRC/openSUSE:Factory/.kinit.new.5536/kinit.changes 2019-04-19 21:23:02.503771645 +0200 @@ -1,0 +2,12 @@ +Sun Apr 14 20:21:43 UTC 2019 - [email protected] + +- Update to 5.57.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.57.0.php +- Changes since 5.56.0: + * Fix compile on windows + * Fix compile + * [Kinit] Compile without foreach + +------------------------------------------------------------------- Old: ---- kinit-5.56.0.tar.xz New: ---- kinit-5.57.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kinit.spec ++++++ --- /var/tmp/diff_new_pack.JY9TRf/_old 2019-04-19 21:23:03.111772419 +0200 +++ /var/tmp/diff_new_pack.JY9TRf/_new 2019-04-19 21:23:03.115772424 +0200 @@ -16,14 +16,14 @@ # -%define _tar_path 5.56 +%define _tar_path 5.57 # 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: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kinit -Version: 5.56.0 +Version: 5.57.0 Release: 0 Summary: Helper library to speed up start of applications on KDE workspaces License: LGPL-2.1-or-later ++++++ kinit-5.56.0.tar.xz -> kinit-5.57.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.56.0/.gitignore new/kinit-5.57.0/.gitignore --- old/kinit-5.56.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kinit-5.57.0/.gitignore 2019-04-07 09:28:59.000000000 +0200 @@ -0,0 +1,21 @@ +# Ignore the following files +*~ +*.[oa] +*.diff +*.kate-swp +*.kdev4 +.kdev_include_paths +*.kdevelop.pcs +*.moc +*.moc.cpp +*.orig +*.user +.*.swp +.swp.* +Doxyfile +Makefile +avail +random_seed +/build*/ +CMakeLists.txt.user* +*.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.56.0/CMakeLists.txt new/kinit-5.57.0/CMakeLists.txt --- old/kinit-5.56.0/CMakeLists.txt 2019-03-02 14:42:10.000000000 +0100 +++ new/kinit-5.57.0/CMakeLists.txt 2019-04-07 09:28:59.000000000 +0200 @@ -3,7 +3,7 @@ project(KInit) include(FeatureSummary) -find_package(ECM 5.56.0 NO_MODULE) +find_package(ECM 5.57.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) @@ -19,8 +19,8 @@ include(CMakePackageConfigHelpers) include(ECMSetupVersion) -set(KF5_VERSION "5.56.0") # handled by release scripts -set(KF5_DEP_VERSION "5.56.0") # handled by release scripts +set(KF5_VERSION "5.57.0") # handled by release scripts +set(KF5_DEP_VERSION "5.57.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KINIT VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kinit_version.h" @@ -80,6 +80,7 @@ kdoctools_install(po) endif() endif() +add_definitions(-DQT_NO_FOREACH) add_subdirectory(src) if (KF5DocTools_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.56.0/po/id/kinit5.po new/kinit-5.57.0/po/id/kinit5.po --- old/kinit-5.56.0/po/id/kinit5.po 2019-03-02 14:42:10.000000000 +0100 +++ new/kinit-5.57.0/po/id/kinit5.po 2019-04-07 09:28:59.000000000 +0200 @@ -16,7 +16,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 2.0\n" #: kdeinit/kinit.cpp:510 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.56.0/po/te/kinit5.po new/kinit-5.57.0/po/te/kinit5.po --- old/kinit-5.56.0/po/te/kinit5.po 2019-03-02 14:42:10.000000000 +0100 +++ new/kinit-5.57.0/po/te/kinit5.po 2019-04-07 09:28:59.000000000 +0200 @@ -22,8 +22,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.5\n" -"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : " -"4;\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: kdeinit/kinit.cpp:510 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.56.0/po/zh_CN/kinit5.po new/kinit-5.57.0/po/zh_CN/kinit5.po --- old/kinit-5.56.0/po/zh_CN/kinit5.po 2019-03-02 14:42:10.000000000 +0100 +++ new/kinit-5.57.0/po/zh_CN/kinit5.po 2019-04-07 09:28:59.000000000 +0200 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2019-02-03 03:08+0100\n" -"PO-Revision-Date: 2019-02-20 23:16\n" +"PO-Revision-Date: 2019-03-07 09:22\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.56.0/src/kdeinit/kinit.cpp new/kinit-5.57.0/src/kdeinit/kinit.cpp --- old/kinit-5.56.0/src/kdeinit/kinit.cpp 2019-03-02 14:42:10.000000000 +0100 +++ new/kinit-5.57.0/src/kdeinit/kinit.cpp 2019-04-07 09:28:59.000000000 +0200 @@ -556,7 +556,7 @@ tmp_env_count++) { unset_envs.append(environ[ tmp_env_count ]); } - foreach (const QByteArray &tmp, unset_envs) { + for (const QByteArray &tmp : qAsConst(unset_envs)) { int pos = tmp.indexOf('='); if (pos >= 0) { unsetenv(tmp.left(pos).constData()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.56.0/src/kdeinit/kinit_mac.mm new/kinit-5.57.0/src/kdeinit/kinit_mac.mm --- old/kinit-5.56.0/src/kdeinit/kinit_mac.mm 2019-03-02 14:42:10.000000000 +0100 +++ new/kinit-5.57.0/src/kdeinit/kinit_mac.mm 2019-04-07 09:28:59.000000000 +0200 @@ -228,7 +228,7 @@ tmp_env_count++) { unset_envs.append(environ[ tmp_env_count ]); } - foreach (const QByteArray &tmp, unset_envs) { + for (const QByteArray &tmp : qAsConst(unset_envs)) { int pos = tmp.indexOf('='); if (pos >= 0) { unsetenv(tmp.left(pos).constData()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.56.0/src/kdeinit/kinit_win.cpp new/kinit-5.57.0/src/kdeinit/kinit_win.cpp --- old/kinit-5.56.0/src/kdeinit/kinit_win.cpp 2019-03-02 14:42:10.000000000 +0100 +++ new/kinit-5.57.0/src/kdeinit/kinit_win.cpp 2019-04-07 09:28:59.000000000 +0200 @@ -298,9 +298,7 @@ ProcessList::~ProcessList() { - foreach (const ProcessListEntry *ple, m_processes) { - delete ple; - } + qDeleteAll(m_processes); } void ProcessList::init() @@ -343,8 +341,7 @@ ProcessListEntry *ProcessList::find(const QString &name) { - ProcessListEntry *ple; - foreach (ple, m_processes) { + for (ProcessListEntry *ple : qAsConst(m_processes)) { if (ple->pid < 0) { qDebug() << "negative pid!"; continue; @@ -438,7 +435,8 @@ { QString installPrefix = QStringLiteral(CMAKE_INSTALL_PREFIX); - foreach (const ProcessListEntry *ple, processList.list()) { + const auto list = processList.list(); + for (const ProcessListEntry *ple : list) { if (!ple->path.isEmpty() && ple->path.toLower().startsWith(installPrefix.toLower())) { fprintf(stderr, "path: %s name: %s pid: %u\n", ple->path.toLatin1().data(), ple->name.toLatin1().data(), ple->pid); } @@ -449,7 +447,8 @@ { QString installPrefix = QStringLiteral(CMAKE_INSTALL_PREFIX); - foreach (const ProcessListEntry *ple, processList.list()) { + const auto list = processList.list(); + for (const ProcessListEntry *ple : list) { if (!ple->path.isEmpty() && ple->path.toLower().startsWith(installPrefix.toLower())) { if (verbose) { fprintf(stderr, "terminating path: %s name: %s pid: %u\n", ple->path.toLatin1().data(), ple->name.toLatin1().data(), ple->pid); @@ -464,7 +463,7 @@ QDBusConnection connection = QDBusConnection::sessionBus(); QDBusConnectionInterface *bus = connection.interface(); const QStringList services = bus->registeredServiceNames(); - foreach (const QString &service, services) { + for (const QString &service : services) { if (service.startsWith(QLatin1String("org.freedesktop.DBus")) || service.startsWith(QLatin1Char(':'))) { continue; } @@ -477,7 +476,7 @@ QDBusConnection connection = QDBusConnection::sessionBus(); QDBusConnectionInterface *bus = connection.interface(); const QStringList services = bus->registeredServiceNames(); - foreach (const QString &service, services) { + for (const QString &service : services) { if (service.startsWith(QLatin1String("org.freedesktop.DBus")) || service.startsWith(QLatin1Char(':'))) { continue; } @@ -668,7 +667,7 @@ QProcess *proc; int can_exit = 1; do { - foreach (proc, startedProcesses) { + for (proc : qAsConst(startedProcesses)) { if (proc->state() != QProcess::NotRunning) { can_exit = 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.56.0/src/klauncher/autostart.cpp new/kinit-5.57.0/src/klauncher/autostart.cpp --- old/kinit-5.56.0/src/klauncher/autostart.cpp 2019-03-02 14:42:10.000000000 +0100 +++ new/kinit-5.57.0/src/klauncher/autostart.cpp 2019-04-07 09:28:59.000000000 +0200 @@ -79,10 +79,10 @@ // Make unique list of relative paths QStringList files; - QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QStringLiteral("autostart"), QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QStringLiteral("autostart"), QStandardPaths::LocateDirectory); + for (const QString &dir : dirs) { const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.desktop")); - Q_FOREACH (const QString &file, fileNames) { + for (const QString &file : fileNames) { if (!files.contains(file)) { files.append(file); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.56.0/src/klauncher/klauncher.cpp new/kinit-5.57.0/src/klauncher/klauncher.cpp --- old/kinit-5.56.0/src/klauncher/klauncher.cpp 2019-03-02 14:42:10.000000000 +0100 +++ new/kinit-5.57.0/src/klauncher/klauncher.cpp 2019-04-07 09:28:59.000000000 +0200 @@ -320,7 +320,7 @@ KLauncher::processDied(pid_t pid, long exitStatus) { qCDebug(KLAUNCHER) << pid << "exitStatus=" << exitStatus; - foreach (KLaunchRequest *request, requestList) { + for (KLaunchRequest *request : qAsConst(requestList)) { qCDebug(KLAUNCHER) << " had pending request" << request->pid; if (request->pid == pid) { if ((request->dbus_startup_type == KService::DBusUnique) @@ -383,7 +383,7 @@ } qCDebug(KLAUNCHER) << "new app" << appId; - foreach (KLaunchRequest *request, requestList) { + for (KLaunchRequest *request : qAsConst(requestList)) { if (request->status != KLaunchRequest::Launching) { continue; } @@ -487,7 +487,7 @@ request->process = process; QProcessEnvironment environment = QProcessEnvironment::systemEnvironment(); - foreach (const QString &env, request->envs) { + for (const QString &env : qAsConst(request->envs)) { const int pos = env.indexOf(QLatin1Char('=')); const QString envVariable = env.left(pos); const QString envValue = env.mid(pos + 1); @@ -496,7 +496,7 @@ process->setProcessEnvironment(environment); QStringList args; - foreach (const QString &arg, request->arg_list) { + for (const QString &arg : qAsConst(request->arg_list)) { args << arg; } @@ -532,11 +532,11 @@ appendLong(requestData, request->arg_list.count() + 1); requestData.append(request->name.toLocal8Bit()); requestData.append('\0'); - foreach (const QString &arg, request->arg_list) { + for (const QString &arg : qAsConst(request->arg_list)) { requestData.append(arg.toLocal8Bit()).append('\0'); } appendLong(requestData, request->envs.count()); - foreach (const QString &env, request->envs) { + for (const QString &env : qAsConst(request->envs)) { requestData.append(env.toLocal8Bit()).append('\0'); } appendLong(requestData, 0); // avoid_loops, always false here @@ -776,7 +776,7 @@ KStartupInfoId id; id.initId(startup_id); QByteArray dpy_str; - foreach (const QString &env, envs) { + for (const QString &env : envs) { if (env.startsWith(QLatin1String("DISPLAY="))) { dpy_str = env.mid(8).toLocal8Bit(); } @@ -820,7 +820,7 @@ } if (!startup_id.isEmpty() && startup_id != "0" && mIsX11) { QString dpy_str; - foreach (const QString &env, envs) { + for (const QString &env : envs) { if (env.startsWith(QLatin1String("DISPLAY="))) { dpy_str = env.mid(8); } @@ -905,7 +905,7 @@ { KIO::DesktopExecParser parser(*service, urls); const QStringList params = parser.resultingArguments(); - Q_FOREACH (const QString &arg, params) { + for (const QString &arg : params) { request->arg_list.append(arg); } @@ -927,7 +927,7 @@ { const QUrl url(urlStr); IdleSlave *slave = nullptr; - foreach (IdleSlave *p, mSlaveList) { + for (IdleSlave *p : qAsConst(mSlaveList)) { if (p->onHold(url)) { slave = p; break; @@ -948,14 +948,14 @@ QString &error) { IdleSlave *slave = nullptr; - foreach (IdleSlave *p, mSlaveList) { + for (IdleSlave *p : qAsConst(mSlaveList)) { if (p->match(protocol, host, true)) { slave = p; break; } } if (!slave) { - foreach (IdleSlave *p, mSlaveList) { + for (IdleSlave *p : qAsConst(mSlaveList)) { if (p->match(protocol, host, false)) { slave = p; break; @@ -963,7 +963,7 @@ } } if (!slave) { - foreach (IdleSlave *p, mSlaveList) { + for (IdleSlave *p : qAsConst(mSlaveList)) { if (p->match(protocol, QString(), false)) { slave = p; break; @@ -1065,7 +1065,7 @@ bool KLauncher::checkForHeldSlave(const QString &urlStr) { QUrl url(urlStr); - Q_FOREACH (const IdleSlave *p, mSlaveList) { + for (const IdleSlave *p : qAsConst(mSlaveList)) { if (p->onHold(url)) { return true; } @@ -1077,7 +1077,7 @@ KLauncher::waitForSlave(int pid) { Q_ASSERT(calledFromDBus()); - foreach (IdleSlave *slave, mSlaveList) { + for (IdleSlave *slave : qAsConst(mSlaveList)) { if (slave->pid() == static_cast<pid_t>(pid)) { return; // Already here. } @@ -1137,7 +1137,7 @@ { bool keepOneFileSlave = true; QDateTime now = QDateTime::currentDateTime(); - foreach (IdleSlave *slave, mSlaveList) { + for (IdleSlave *slave : qAsConst(mSlaveList)) { if ((slave->protocol() == QLatin1String("file")) && (keepOneFileSlave)) { keepOneFileSlave = false; } else if (slave->age(now) > SLAVE_MAX_IDLE) { @@ -1150,7 +1150,7 @@ void KLauncher::reparseConfiguration() { KProtocolManager::reparseConfiguration(); - foreach (IdleSlave *slave, mSlaveList) { + for (IdleSlave *slave : qAsConst(mSlaveList)) { slave->reparseConfiguration(); } } @@ -1172,7 +1172,7 @@ QProcess *p = static_cast<QProcess *>(sender()); qCDebug(KLAUNCHER) << "process finished exitcode=" << exitCode << "exitStatus=" << exitStatus; - foreach (KLaunchRequest *request, requestList) { + for (KLaunchRequest *request : qAsConst(requestList)) { if (request->process == p) { qCDebug(KLAUNCHER) << "found KProcess, request done"; if (exitCode == 0 && exitStatus == QProcess::NormalExit) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.56.0/src/kwrapper/kwrapper_win.cpp new/kinit-5.57.0/src/kwrapper/kwrapper_win.cpp --- old/kinit-5.56.0/src/kwrapper/kwrapper_win.cpp 2019-03-02 14:42:10.000000000 +0100 +++ new/kinit-5.57.0/src/kwrapper/kwrapper_win.cpp 2019-04-07 09:28:59.000000000 +0200 @@ -91,7 +91,8 @@ - all to client path environment - pathes not ending with lib to application search path */ - foreach (const QString &a, path.split(QLatin1Char(';'))) { + const auto lst = path.split(QLatin1Char(';')); + for (const QString &a : lst) { if (!envPath.contains(a)) { envPath << a; } @@ -143,7 +144,7 @@ kdedirsCacheList << rootPath + QStringLiteral("/kdedirs.cache"); bool found = false; - foreach (const QString &kdedirsCachePath, kdedirsCacheList) { + for (const QString &kdedirsCachePath : qAsConst(kdedirsCacheList)) { QFile f(kdedirsCachePath); if (f.exists()) { f.open(QIODevice::ReadOnly); @@ -172,7 +173,7 @@ qDebug() << "found KDEDIRS\n\t" << kdedirs.join(QStringLiteral("\n\t")); } - foreach (const QString &a, kdedirs) { + for (const QString &a : qAsConst(kdedirs)) { if (!envPath.contains(a + QStringLiteral("/bin"))) { envPath << a + QStringLiteral("/bin"); } @@ -192,7 +193,7 @@ } bool found = false; - foreach (const QString &a, searchPath) { + for (const QString &a : qAsConst(searchPath)) { if (verbose) { qDebug() << "\t" << a; }
