Hello community, here is the log from the commit of package kate for openSUSE:Factory checked in at 2014-02-20 07:54:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kate (Old) and /work/SRC/openSUSE:Factory/.kate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kate" Changes: -------- --- /work/SRC/openSUSE:Factory/kate/kate.changes 2014-01-27 11:14:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kate.new/kate.changes 2014-02-20 07:55:01.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Feb 1 10:08:25 UTC 2014 - [email protected] + +- Update to 4.12.2 + * KDE 4.12.2 release + * See http://www.kde.org/announcements/announce-4.12.2.php + +------------------------------------------------------------------- Old: ---- kate-4.12.1.tar.xz New: ---- kate-4.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kate.spec ++++++ --- /var/tmp/diff_new_pack.YBnIFh/_old 2014-02-20 07:55:02.000000000 +0100 +++ /var/tmp/diff_new_pack.YBnIFh/_new 2014-02-20 07:55:02.000000000 +0100 @@ -17,7 +17,7 @@ Name: kate -Version: 4.12.1 +Version: 4.12.2 Release: 0 Summary: Advanced Text Editor License: GPL-2.0+ ++++++ kate-4.12.1.tar.xz -> kate-4.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.1/addons/kate/katebuild-plugin/plugin_katebuild.cpp new/kate-4.12.2/addons/kate/katebuild-plugin/plugin_katebuild.cpp --- old/kate-4.12.1/addons/kate/katebuild-plugin/plugin_katebuild.cpp 2013-12-31 10:08:58.000000000 +0100 +++ new/kate-4.12.2/addons/kate/katebuild-plugin/plugin_katebuild.cpp 2014-01-26 01:52:50.000000000 +0100 @@ -99,8 +99,12 @@ ) , m_proc(0) // NOTE this will not allow spaces in file names. - , m_filenameDetector("([a-np-zA-Z]:[\\\\/])?[a-zA-Z0-9_\\.\\-/\\\\]+\\.[a-zA-Z0-9]+:[0-9]+"), - m_newDirDetector("make\\[.+\\]: .+ `.*'") + // e.g. from gcc: "main.cpp:14: error: cannot convert ‘std::string’ to ‘int’ in return" + , m_filenameDetector("(([a-np-zA-Z]:[\\\\/])?[a-zA-Z0-9_\\.\\-/\\\\]+\\.[a-zA-Z0-9]+):([0-9]+)(.*)") + // e.g. from icpc: "main.cpp(14): error: no suitable conversion function from "std::string" to "int" exists" + , m_filenameDetectorIcpc("(([a-np-zA-Z]:[\\\\/])?[a-zA-Z0-9_\\.\\-/\\\\]+\\.[a-zA-Z0-9]+)\\(([0-9]+)\\)(:.*)") + , m_filenameDetectorGccWorked(false) + , m_newDirDetector("make\\[.+\\]: .+ `.*'") { m_targetList.append(Target()); @@ -512,6 +516,8 @@ return false; } + m_filenameDetectorGccWorked = false; + // clear previous runs m_buildUi.plainTextEdit->clear(); m_buildUi.errTreeWidget->clear(); @@ -667,26 +673,45 @@ /******************************************************************/ void KateBuildView::processLine(const QString &line) { - QString l = line; - //kDebug() << l ; + //kDebug() << line ; //look for a filename - if (l.indexOf(m_filenameDetector)<0) + int index = m_filenameDetector.indexIn(line); + + QRegExp* rx = 0; + if (index >= 0) + { + m_filenameDetectorGccWorked = true; + rx = &m_filenameDetector; + } + else { - addError(QString(), 0, QString(), l); + if (!m_filenameDetectorGccWorked) + { + // let's see whether the icpc regexp works: + // so for icpc users error detection will be a bit slower, + // since always both regexps are checked. + // But this should be the minority, for gcc and clang users + // both regexes will only be checked until the first regex + // matched the first time. + index = m_filenameDetectorIcpc.indexIn(line); + if (index >= 0) + { + rx = &m_filenameDetectorIcpc; + } + } + } + + if (!rx) + { + addError(QString(), 0, QString(), line); //kDebug() << "A filename was not found in the line "; return; } - int match_start = m_filenameDetector.indexIn(l, 0); - int match_len = m_filenameDetector.matchedLength(); - - QString file_n_line = l.mid(match_start, match_len); - - int name_end = file_n_line.lastIndexOf(':'); - QString filename = file_n_line.left(name_end); - QString line_n = file_n_line.mid(name_end+1); - QString msg = l.remove(m_filenameDetector); + QString filename = rx->cap(1); + QString line_n = rx->cap(3); + QString msg = rx->cap(4); //kDebug() << "File Name:"<<filename<< " msg:"<< msg; //add path to file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.1/addons/kate/katebuild-plugin/plugin_katebuild.h new/kate-4.12.2/addons/kate/katebuild-plugin/plugin_katebuild.h --- old/kate-4.12.1/addons/kate/katebuild-plugin/plugin_katebuild.h 2013-12-31 10:08:58.000000000 +0100 +++ new/kate-4.12.2/addons/kate/katebuild-plugin/plugin_katebuild.h 2014-01-26 01:52:50.000000000 +0100 @@ -128,6 +128,8 @@ KUrl m_make_dir; QStack<KUrl> m_make_dir_stack; QRegExp m_filenameDetector; + QRegExp m_filenameDetectorIcpc; + bool m_filenameDetectorGccWorked; QRegExp m_newDirDetector; unsigned int m_numErrors; unsigned int m_numWarnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.1/kate/filetree/katefiletreemodel.cpp new/kate-4.12.2/kate/filetree/katefiletreemodel.cpp --- old/kate-4.12.1/kate/filetree/katefiletreemodel.cpp 2013-12-31 10:08:58.000000000 +0100 +++ new/kate-4.12.2/kate/filetree/katefiletreemodel.cpp 2014-01-26 01:52:50.000000000 +0100 @@ -497,7 +497,7 @@ case Qt::ToolTipRole: { QString tooltip = item->path(); if (item->flag(ProxyItem::DeletedExternally) || item->flag(ProxyItem::ModifiedExternally)) { - tooltip = i18nc("%1 is the full path", "<p><b>%1</b></p><p>The document has been modified by another application.</p>").arg(item->path()); + tooltip = i18nc("%1 is the full path", "<p><b>%1</b></p><p>The document has been modified by another application.</p>", item->path()); } return tooltip; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.1/part/data/katepart.desktop new/kate-4.12.2/part/data/katepart.desktop --- old/kate-4.12.1/part/data/katepart.desktop 2013-12-31 10:08:58.000000000 +0100 +++ new/kate-4.12.2/part/data/katepart.desktop 2014-01-26 01:52:50.000000000 +0100 @@ -32,7 +32,7 @@ Name[pa]=ਇੰਬੈੱਡ ਮਾਹਰ ਟੈਕਸਟ ਐਡੀਟਰ Name[pl]=Zaawansowany osadzony edytor tekstu Name[pt]=Editor de Texto Avançado Incorporado -Name[pt_BR]=Editor de textos avançado integrado +Name[pt_BR]=Editor de texto avançado integrado Name[ro]=Redactor de text avansat înglobat Name[ru]=Встроенный расширенный текстовый редактор Name[si]=තිළැලි උසස් පෙළ සකසනය diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.1/part/script/data/indentation/cstyle.js new/kate-4.12.2/part/script/data/indentation/cstyle.js --- old/kate-4.12.1/part/script/data/indentation/cstyle.js 2013-12-31 10:08:58.000000000 +0100 +++ new/kate-4.12.2/part/script/data/indentation/cstyle.js 2014-01-26 01:52:50.000000000 +0100 @@ -387,7 +387,9 @@ var currentString = document.line(currentLine); - if (currentString.search(/\{[^\}]*$/) != -1) { + var matchColumn = currentString.search(/\{[^\}]*$/); + + if (matchColumn != -1 && document.isCode(currentLine, matchColumn)) { dbg("tryBrace: Closing bracket in line " + currentLine); var cursor = tryParenthesisBeforeBrace(currentLine, lastPos); if (cursor.isValid()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.1/part/script/data/indentation/xml.js new/kate-4.12.2/part/script/data/indentation/xml.js --- old/kate-4.12.1/part/script/data/indentation/xml.js 2013-12-31 10:08:58.000000000 +0100 +++ new/kate-4.12.2/part/script/data/indentation/xml.js 2014-01-26 01:52:50.000000000 +0100 @@ -70,14 +70,14 @@ if (document.isCode(lineNr, col)) code += line[col]; } - code = removeSelfClosing(code); + code = replaceSelfClosing(code); return code.trim(); } // Return given code with all self-closing tags removed. -function removeSelfClosing(code) { - return code.replace(/<[^<>]*\/>/g, ''); +function replaceSelfClosing(code) { + return code.replace(/<[^<>]*\/>/g, '<tag></tag>'); } @@ -105,7 +105,7 @@ } while ((line.countMatches(open_tag) <= line.countMatches(close_tag)) && (lineNr > 0)); var prevIndent = Math.max(document.firstVirtualColumn(lineNr), 0); - code = removeSelfClosing(code); + code = replaceSelfClosing(code); var steps = calcSteps(code); return prevIndent + indentWidth * steps; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.1/part/view/kateviewinternal.cpp new/kate-4.12.2/part/view/kateviewinternal.cpp --- old/kate-4.12.1/part/view/kateviewinternal.cpp 2013-12-31 10:08:58.000000000 +0100 +++ new/kate-4.12.2/part/view/kateviewinternal.cpp 2014-01-26 01:52:50.000000000 +0100 @@ -295,8 +295,7 @@ return KTextEditor::Cursor(thisLine.virtualLine(), thisLine.wrap() ? thisLine.endCol() - 1 : thisLine.endCol()); } - kDebug(13030) << "WARNING: could not find a lineRange at all"; - return KTextEditor::Cursor(-1, -1); + return KTextEditor::Cursor(); } int KateViewInternal::endLine() const @@ -528,7 +527,7 @@ void KateViewInternal::doUpdateView(bool changed, int viewLinesScrolled) { - if(!isVisible() && !viewLinesScrolled ) + if(!isVisible() && !viewLinesScrolled && !changed ) return; //When this view is not visible, don't do anything m_updatingView = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.1/tests/data/indent/cstyle/brace2/expected new/kate-4.12.2/tests/data/indent/cstyle/brace2/expected --- old/kate-4.12.1/tests/data/indent/cstyle/brace2/expected 1970-01-01 01:00:00.000000000 +0100 +++ new/kate-4.12.2/tests/data/indent/cstyle/brace2/expected 2014-01-26 01:52:50.000000000 +0100 @@ -0,0 +1,5 @@ +int main(void) +{ + printf("{\n"); + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.1/tests/data/indent/cstyle/brace2/input.js new/kate-4.12.2/tests/data/indent/cstyle/brace2/input.js --- old/kate-4.12.1/tests/data/indent/cstyle/brace2/input.js 1970-01-01 01:00:00.000000000 +0100 +++ new/kate-4.12.2/tests/data/indent/cstyle/brace2/input.js 2014-01-26 01:52:50.000000000 +0100 @@ -0,0 +1,2 @@ +v.setCursorPosition(3,0); +d.align(new Range(new Cursor(3, 0), new Cursor(3, 0))); \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.1/tests/data/indent/cstyle/brace2/origin new/kate-4.12.2/tests/data/indent/cstyle/brace2/origin --- old/kate-4.12.1/tests/data/indent/cstyle/brace2/origin 1970-01-01 01:00:00.000000000 +0100 +++ new/kate-4.12.2/tests/data/indent/cstyle/brace2/origin 2014-01-26 01:52:50.000000000 +0100 @@ -0,0 +1,5 @@ +int main(void) +{ + printf("{\n"); + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.1/tests/data/indent/xml/self_closing2/expected new/kate-4.12.2/tests/data/indent/xml/self_closing2/expected --- old/kate-4.12.1/tests/data/indent/xml/self_closing2/expected 1970-01-01 01:00:00.000000000 +0100 +++ new/kate-4.12.2/tests/data/indent/xml/self_closing2/expected 2014-01-26 01:52:50.000000000 +0100 @@ -0,0 +1,5 @@ +<tag1> + <tag2/> + + <tag2/> +</tag1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.1/tests/data/indent/xml/self_closing2/input.js new/kate-4.12.2/tests/data/indent/xml/self_closing2/input.js --- old/kate-4.12.1/tests/data/indent/xml/self_closing2/input.js 1970-01-01 01:00:00.000000000 +0100 +++ new/kate-4.12.2/tests/data/indent/xml/self_closing2/input.js 2014-01-26 01:52:50.000000000 +0100 @@ -0,0 +1,8 @@ +v.setCursorPosition(0,0); +v.selectAll(); + +var r = v.selection(); +if( r.isValid() ) { + d.align( r ); +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.12.1/tests/data/indent/xml/self_closing2/origin new/kate-4.12.2/tests/data/indent/xml/self_closing2/origin --- old/kate-4.12.1/tests/data/indent/xml/self_closing2/origin 1970-01-01 01:00:00.000000000 +0100 +++ new/kate-4.12.2/tests/data/indent/xml/self_closing2/origin 2014-01-26 01:52:50.000000000 +0100 @@ -0,0 +1,5 @@ +<tag1> + <tag2/> + + <tag2/> +</tag1> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
