Hello community, here is the log from the commit of package cantor for openSUSE:Factory checked in at 2017-02-14 00:48:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cantor (Old) and /work/SRC/openSUSE:Factory/.cantor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cantor" Changes: -------- --- /work/SRC/openSUSE:Factory/cantor/cantor.changes 2017-01-18 21:45:30.093226108 +0100 +++ /work/SRC/openSUSE:Factory/.cantor.new/cantor.changes 2017-02-14 00:48:05.860807502 +0100 @@ -1,0 +2,13 @@ +Fri Feb 10 22:45:35 UTC 2017 - [email protected] + +- Add fix-build-with-ecm-5.31.patch + +------------------------------------------------------------------- +Thu Feb 9 06:40:51 UTC 2017 - [email protected] + +- Update to KDE Applications 16.12.2 + * KDE Applications 16.12.2 + * https://www.kde.org/announcements/announce-applications-16.12.2.php + + +------------------------------------------------------------------- Old: ---- cantor-16.12.1.tar.xz New: ---- cantor-16.12.2.tar.xz fix-build-with-ecm-5.31.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantor.spec ++++++ --- /var/tmp/diff_new_pack.YRMNM2/_old 2017-02-14 00:48:06.700688937 +0100 +++ /var/tmp/diff_new_pack.YRMNM2/_new 2017-02-14 00:48:06.700688937 +0100 @@ -18,16 +18,18 @@ %global libMAJOR 16 Name: cantor -Version: 16.12.1 +Version: 16.12.2 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.1 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.12.2 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 @@ -86,6 +88,7 @@ %prep %setup -q +%patch -p1 mkdir .doc cd src/backends ++++++ cantor-16.12.1.tar.xz -> cantor-16.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-16.12.1/CMakeLists.txt new/cantor-16.12.2/CMakeLists.txt --- old/cantor-16.12.1/CMakeLists.txt 2017-01-07 19:48:55.000000000 +0100 +++ new/cantor-16.12.2/CMakeLists.txt 2017-02-03 23:41:15.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 "1") +set (KDE_APPLICATIONS_VERSION_MICRO "2") 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.1/src/backends/julia/juliabackend.json new/cantor-16.12.2/src/backends/julia/juliabackend.json --- old/cantor-16.12.1/src/backends/julia/juliabackend.json 2017-01-07 19:48:55.000000000 +0100 +++ new/cantor-16.12.2/src/backends/julia/juliabackend.json 2017-02-03 23:41:15.000000000 +0100 @@ -14,6 +14,7 @@ "Description[nn]": "Julia-motor for Cantor", "Description[pl]": "Silnik Julii dla Cantora", "Description[pt]": "Infra-estrutura do Julia para o Cantor", + "Description[pt_BR]": "Infraestrutura Julia para o Cantor", "Description[ru]": "Модуль поддержки языка Julia", "Description[sk]": "Julia backend pre Cantor", "Description[sl]": "Zaledje Julia za Cantor", ++++++ fix-build-with-ecm-5.31.patch ++++++ >From 4b8ef6bed62daced90c7826985650c2a813d2996 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell <[email protected]> Date: Wed, 8 Feb 2017 14:56:48 +0000 Subject: remove modern C++ use to fix compile with current KDE policy --- src/backends/python/pythonhighlighter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backends/python/pythonhighlighter.cpp b/src/backends/python/pythonhighlighter.cpp index 4064524..87b10dd 100644 --- a/src/backends/python/pythonhighlighter.cpp +++ b/src/backends/python/pythonhighlighter.cpp @@ -87,7 +87,7 @@ void PythonHighlighter::highlightBlock(const QString &text) 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 @@ void PythonHighlighter::highlightBlock(const QString &text) singleLineCommentStart.indexIn(text, pos); if (singleLineCommentStartPos != -1 - and singleLineCommentStartPos < minPos) { + && singleLineCommentStartPos < minPos) { setFormat(pos, text.length() - pos, commentFormat()); break; } else if (minRegexp) { -- cgit v0.11.2
