Hello community, here is the log from the commit of package cantor for openSUSE:Factory checked in at 2017-03-16 09:36:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cantor (Old) and /work/SRC/openSUSE:Factory/.cantor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cantor" Thu Mar 16 09:36:39 2017 rev:88 rq:478108 version:16.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/cantor/cantor.changes 2017-02-14 00:48:05.860807502 +0100 +++ /work/SRC/openSUSE:Factory/.cantor.new/cantor.changes 2017-03-16 09:36:40.300071828 +0100 @@ -1,0 +2,13 @@ +Thu Mar 9 12:33:54 CET 2017 - lbeltr...@kde.org + +- Update to 16.12.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-16.12.3.php +- Changes since 16.12.2: + * [julia] Fix build with -fno-operator-names + * remove modern C++ use to fix compile with current KDE policy +- Remove patches, now upstream: + * fix-build-with-ecm-5.31.patch + +------------------------------------------------------------------- Old: ---- cantor-16.12.2.tar.xz fix-build-with-ecm-5.31.patch New: ---- cantor-16.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantor.spec ++++++ --- /var/tmp/diff_new_pack.OZE1NC/_old 2017-03-16 09:36:40.883989148 +0100 +++ /var/tmp/diff_new_pack.OZE1NC/_new 2017-03-16 09:36:40.883989148 +0100 @@ -18,18 +18,16 @@ %global libMAJOR 16 Name: cantor -Version: 16.12.2 +Version: 16.12.3 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.2 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.12.3 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Worksheet GUI for mathematical software License: GPL-2.0+ Group: Amusements/Teaching/Mathematics Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM fix-build-with-ecm-5.31.patch -Patch: fix-build-with-ecm-5.31.patch BuildRequires: R-base BuildRequires: R-base-devel BuildRequires: analitza-devel @@ -88,7 +86,6 @@ %prep %setup -q -%patch -p1 mkdir .doc cd src/backends ++++++ cantor-16.12.2.tar.xz -> cantor-16.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-16.12.2/CMakeLists.txt new/cantor-16.12.3/CMakeLists.txt --- old/cantor-16.12.2/CMakeLists.txt 2017-02-03 23:41:15.000000000 +0100 +++ new/cantor-16.12.3/CMakeLists.txt 2017-03-04 11:16:42.000000000 +0100 @@ -7,7 +7,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "12") -set (KDE_APPLICATIONS_VERSION_MICRO "2") +set (KDE_APPLICATIONS_VERSION_MICRO "3") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-16.12.2/src/backends/julia/juliaexpression.cpp new/cantor-16.12.3/src/backends/julia/juliaexpression.cpp --- old/cantor-16.12.2/src/backends/julia/juliaexpression.cpp 2017-02-03 23:41:15.000000000 +0100 +++ new/cantor-16.12.3/src/backends/julia/juliaexpression.cpp 2017-03-04 11:16:42.000000000 +0100 @@ -40,7 +40,7 @@ // Plots integration m_plot_filename.clear(); - if (juliaSession->integratePlots() and checkPlotShowingCommands()) { + if (juliaSession->integratePlots() && checkPlotShowingCommands()) { // Simply add plot saving command to the end of execution QStringList inlinePlotFormats; inlinePlotFormats << QLatin1String("svg"); @@ -73,8 +73,8 @@ setResult(new Cantor::TextResult(juliaSession->getOutput())); setStatus(Cantor::Expression::Error); } else { - if (not m_plot_filename.isEmpty() - and QFileInfo(m_plot_filename).exists()) { + if (!m_plot_filename.isEmpty() + && QFileInfo(m_plot_filename).exists()) { // If we have plot in result, show it setResult( new Cantor::ImageResult(QUrl::fromLocalFile(m_plot_filename))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-16.12.2/src/backends/julia/juliaextensions.cpp new/cantor-16.12.3/src/backends/julia/juliaextensions.cpp --- old/cantor-16.12.2/src/backends/julia/juliaextensions.cpp 2017-02-03 23:41:15.000000000 +0100 +++ new/cantor-16.12.3/src/backends/julia/juliaextensions.cpp 2017-03-04 11:16:42.000000000 +0100 @@ -138,7 +138,7 @@ { auto new_left = left; auto new_right = right; - if (new_left.isEmpty() and new_right.isEmpty()) { + if (new_left.isEmpty() && new_right.isEmpty()) { new_left = QLatin1String("-1"); new_right = QLatin1String("1"); } else if (new_left.isEmpty()) { @@ -165,7 +165,7 @@ { auto update_interval = [](Interval &interval) { - if (interval.first.isEmpty() and interval.second.isEmpty()) { + if (interval.first.isEmpty() && interval.second.isEmpty()) { interval.first = QLatin1String("-1"); interval.second = QLatin1String("1"); } else if (interval.first.isEmpty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-16.12.2/src/backends/julia/juliahighlighter.cpp new/cantor-16.12.3/src/backends/julia/juliahighlighter.cpp --- old/cantor-16.12.2/src/backends/julia/juliahighlighter.cpp 2017-02-03 23:41:15.000000000 +0100 +++ new/cantor-16.12.3/src/backends/julia/juliahighlighter.cpp 2017-03-04 11:16:42.000000000 +0100 @@ -98,7 +98,7 @@ while (pos < text.length()) { // Trying to close current environments bool triggered = false; - for (int i = 0; i < flags.size() and not triggered; i++) { + for (int i = 0; i < flags.size() && !triggered; i++) { int flag = flags[i]; QRegExp ®exp = regexps_ends[i]; QTextCharFormat &format = formats[i]; @@ -144,7 +144,7 @@ singleLineCommentStart.indexIn(text, pos); if (singleLineCommentStartPos != -1 - and singleLineCommentStartPos < minPos) { + && singleLineCommentStartPos < minPos) { // single line comment starts earlier setFormat(pos, text.length() - pos, commentFormat()); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-16.12.2/src/backends/julia/juliakeywords.cpp new/cantor-16.12.3/src/backends/julia/juliakeywords.cpp --- old/cantor-16.12.2/src/backends/julia/juliakeywords.cpp 2017-02-03 23:41:15.000000000 +0100 +++ new/cantor-16.12.3/src/backends/julia/juliakeywords.cpp 2017-03-04 11:16:42.000000000 +0100 @@ -62,11 +62,11 @@ const QStringRef name = xml.name(); if (name == QLatin1String("keywords") - or name == QLatin1String("variables") - or name == QLatin1String("plot_showing_commands")) { + || name == QLatin1String("variables") + || name == QLatin1String("plot_showing_commands")) { while (xml.readNextStartElement()) { Q_ASSERT( - xml.isStartElement() and xml.name() == QLatin1String("word") + xml.isStartElement() && xml.name() == QLatin1String("word") ); const QString text = xml.readElementText(); @@ -91,7 +91,7 @@ void JuliaKeywords::addVariable(const QString &variable) { - if (not m_variables.contains(variable)) { + if (!m_variables.contains(variable)) { m_variables << variable; } } @@ -104,7 +104,7 @@ void JuliaKeywords::addFunction(const QString &function) { - if (not m_functions.contains(function)) { + if (!m_functions.contains(function)) { m_functions << function; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-16.12.2/src/backends/julia/juliaserver/juliaserver.cpp new/cantor-16.12.3/src/backends/julia/juliaserver/juliaserver.cpp --- old/cantor-16.12.2/src/backends/julia/juliaserver/juliaserver.cpp 2017-02-03 23:41:15.000000000 +0100 +++ new/cantor-16.12.3/src/backends/julia/juliaserver/juliaserver.cpp 2017-03-04 11:16:42.000000000 +0100 @@ -47,7 +47,7 @@ { // Redirect stdout, stderr to temprorary files QTemporaryFile output, error; - if (not output.open() or not error.open()) { + if (!output.open() || !error.open()) { qFatal("Unable to create temprorary files for stdout/stderr"); return; } @@ -90,7 +90,7 @@ bool is_nothing = jl_unbox_bool( static_cast<jl_value_t *>(jl_call2(equality, nothing, val)) ); - if (not is_nothing) { + if (!is_nothing) { jl_static_show(JL_STDOUT, val); } m_was_exception = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-16.12.2/src/backends/julia/juliaserver/main.cpp new/cantor-16.12.3/src/backends/julia/juliaserver/main.cpp --- old/cantor-16.12.2/src/backends/julia/juliaserver/main.cpp 2017-02-03 23:41:15.000000000 +0100 +++ new/cantor-16.12.3/src/backends/julia/juliaserver/main.cpp 2017-03-04 11:16:42.000000000 +0100 @@ -30,7 +30,7 @@ { QCoreApplication app(argc, argv); - if (not QDBusConnection::sessionBus().isConnected()) { + if (!QDBusConnection::sessionBus().isConnected()) { qWarning() << "Can't connect to the D-Bus session bus.\n" "To start it, run: eval `dbus-launch --auto-syntax`"; return 1; @@ -39,7 +39,7 @@ const QString &serviceName = QString::fromLatin1("org.kde.Cantor.Julia-%1").arg(app.applicationPid()); - if (not QDBusConnection::sessionBus().registerService(serviceName)) { + if (!QDBusConnection::sessionBus().registerService(serviceName)) { qWarning() << QDBusConnection::sessionBus().lastError().message(); return 2; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-16.12.2/src/backends/julia/juliasession.cpp new/cantor-16.12.3/src/backends/julia/juliasession.cpp --- old/cantor-16.12.2/src/backends/julia/juliasession.cpp 2017-02-03 23:41:15.000000000 +0100 +++ new/cantor-16.12.3/src/backends/julia/juliasession.cpp 2017-03-04 11:16:42.000000000 +0100 @@ -86,7 +86,7 @@ QDBusConnection::sessionBus() ); - if (not m_interface->isValid()) { + if (!m_interface->isValid()) { qWarning() << QDBusConnection::sessionBus().lastError().message(); return; } @@ -213,7 +213,7 @@ { const QDBusReply<bool> &reply = m_interface->call(QLatin1String("getWasException")); - return reply.isValid() and reply.value(); + return reply.isValid() && reply.value(); } void JuliaSession::listVariables() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-16.12.2/src/backends/python/pythonhighlighter.cpp new/cantor-16.12.3/src/backends/python/pythonhighlighter.cpp --- old/cantor-16.12.2/src/backends/python/pythonhighlighter.cpp 2017-02-03 23:41:15.000000000 +0100 +++ new/cantor-16.12.3/src/backends/python/pythonhighlighter.cpp 2017-03-04 11:16:42.000000000 +0100 @@ -87,7 +87,7 @@ while (pos < text.length()) { // Trying to close current environments bool triggered = false; - for (int i = 0; i < flags.size() and not triggered; i++) { + for (int i = 0; i < flags.size() && !triggered; i++) { int flag = flags[i]; QRegExp ®exp = regexps[i]; QTextCharFormat &format = formats[i]; @@ -126,7 +126,7 @@ singleLineCommentStart.indexIn(text, pos); if (singleLineCommentStartPos != -1 - and singleLineCommentStartPos < minPos) { + && singleLineCommentStartPos < minPos) { setFormat(pos, text.length() - pos, commentFormat()); break; } else if (minRegexp) {
