commit konsole for openSUSE:13.1

Hello community, here is the log from the commit of package konsole for openSUSE:13.1 checked in at 2013-10-03 15:59:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/konsole (Old) and /work/SRC/openSUSE:13.1/.konsole.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "konsole" Changes: -------- --- /work/SRC/openSUSE:13.1/konsole/konsole.changes 2013-09-23 10:56:07.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.konsole.new/konsole.changes 2013-10-03 16:00:00.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Sep 28 15:06:38 UTC 2013 - tittiatcoke@gmail.com + +- Update to 4.11.2 + * KDE 4.11.2 bugfix release + * See http://www.kde.org/announcements/announce-4.11.2.php + +------------------------------------------------------------------- Old: ---- konsole-4.11.1.tar.xz New: ---- konsole-4.11.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konsole.spec ++++++ --- /var/tmp/diff_new_pack.4yHKdw/_old 2013-10-03 16:00:00.000000000 +0200 +++ /var/tmp/diff_new_pack.4yHKdw/_new 2013-10-03 16:00:00.000000000 +0200 @@ -17,7 +17,7 @@ Name: konsole -Version: 4.11.1 +Version: 4.11.2 Release: 0 Summary: KDE Terminal License: GPL-2.0+ ++++++ konsole-4.11.1.tar.xz -> konsole-4.11.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.11.1/src/EditProfileDialog.cpp new/konsole-4.11.2/src/EditProfileDialog.cpp --- old/konsole-4.11.1/src/EditProfileDialog.cpp 2013-08-28 19:00:45.000000000 +0200 +++ new/konsole-4.11.2/src/EditProfileDialog.cpp 2013-09-26 21:19:01.000000000 +0200 @@ -708,10 +708,6 @@ this, SLOT(saveColorScheme(ColorScheme,bool))); _colorDialog->setup(colors, isNewScheme); - // Hide the parent dialog while ColorScheme is open - this->hide(); - connect(_colorDialog, SIGNAL(finished()), this, SLOT(show())); - _colorDialog->show(); } void EditProfileDialog::closeColorSchemeEditor() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.11.1/src/LineFont.h new/konsole-4.11.2/src/LineFont.h --- old/konsole-4.11.1/src/LineFont.h 2013-06-28 19:14:47.000000000 +0200 +++ new/konsole-4.11.2/src/LineFont.h 2013-09-26 21:19:01.000000000 +0200 @@ -1,21 +1,21 @@ -// WARNING: Autogenerated by "fontembedder ./linefont.src". +// WARNING: Autogenerated by "fontembedder /Volumes/Projects/KDE/src/kde/applications/konsole/src/LineFont.src". // You probably do not want to hand-edit this! static const quint32 LineChars[] = { - 0x00007c00, 0x000fffe0, 0x00421084, 0x00e739ce, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00427000, 0x004e7380, 0x00e77800, 0x00ef7bc0, - 0x00421c00, 0x00439ce0, 0x00e73c00, 0x00e7bde0, 0x00007084, 0x000e7384, 0x000079ce, 0x000f7bce, - 0x00001c84, 0x00039ce4, 0x00003dce, 0x0007bdee, 0x00427084, 0x004e7384, 0x004279ce, 0x00e77884, - 0x00e779ce, 0x004f7bce, 0x00ef7bc4, 0x00ef7bce, 0x00421c84, 0x00439ce4, 0x00423dce, 0x00e73c84, - 0x00e73dce, 0x0047bdee, 0x00e7bde4, 0x00e7bdee, 0x00427c00, 0x0043fce0, 0x004e7f80, 0x004fffe0, - 0x004fffe0, 0x00e7fde0, 0x006f7fc0, 0x00efffe0, 0x00007c84, 0x0003fce4, 0x000e7f84, 0x000fffe4, - 0x00007dce, 0x0007fdee, 0x000f7fce, 0x000fffee, 0x00427c84, 0x0043fce4, 0x004e7f84, 0x004fffe4, - 0x00427dce, 0x00e77c84, 0x00e77dce, 0x0047fdee, 0x004e7fce, 0x00e7fde4, 0x00ef7f84, 0x004fffee, - 0x00efffe4, 0x00e7fdee, 0x00ef7fce, 0x00efffee, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x000f83e0, 0x00a5294a, 0x004e1380, 0x00a57800, 0x00ad0bc0, 0x004390e0, 0x00a53c00, 0x00a5a1e0, - 0x000e1384, 0x0000794a, 0x000f0b4a, 0x000390e4, 0x00003d4a, 0x0007a16a, 0x004e1384, 0x00a5694a, - 0x00ad2b4a, 0x004390e4, 0x00a52d4a, 0x00a5a16a, 0x004f83e0, 0x00a57c00, 0x00ad83e0, 0x000f83e4, - 0x00007d4a, 0x000f836a, 0x004f93e4, 0x00a57d4a, 0x00ad836a, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0x00001084, 0x00007000, 0x00421000, - 0x00039ce0, 0x000039ce, 0x000e7380, 0x00e73800, 0x000e7f80, 0x00e73884, 0x0003fce0, 0x004239ce + 0x00007c00, 0x000fffe0, 0x00421084, 0x00e739ce, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00427000, 0x004e7380, 0x00e77800, 0x00ef7bc0, + 0x00421c00, 0x00439ce0, 0x00e73c00, 0x00e7bde0, 0x00007084, 0x000e7384, 0x000079ce, 0x000f7bce, + 0x00001c84, 0x00039ce4, 0x00003dce, 0x0007bdee, 0x00427084, 0x004e7384, 0x004279ce, 0x00e77884, + 0x00e779ce, 0x004f7bce, 0x00ef7bc4, 0x00ef7bce, 0x00421c84, 0x00439ce4, 0x00423dce, 0x00e73c84, + 0x00e73dce, 0x0047bdee, 0x00e7bde4, 0x00e7bdee, 0x00427c00, 0x0043fce0, 0x004e7f80, 0x004fffe0, + 0x00e77c00, 0x00e7fde0, 0x006f7fc0, 0x00efffe0, 0x00007c84, 0x0003fce4, 0x000e7f84, 0x000fffe4, + 0x00007dce, 0x0007fdee, 0x000f7fce, 0x000fffee, 0x00427c84, 0x0043fce4, 0x004e7f84, 0x004fffe4, + 0x00427dce, 0x00e77c84, 0x00e77dce, 0x0047fdee, 0x004e7fce, 0x00e7fde4, 0x00ef7f84, 0x004fffee, + 0x00efffe4, 0x00e7fdee, 0x00ef7fce, 0x00efffee, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x000f83e0, 0x00a5294a, 0x004e1380, 0x00a57800, 0x00ad0bc0, 0x004390e0, 0x00a53c00, 0x00a5a1e0, + 0x000e1384, 0x0000794a, 0x000f0b4a, 0x000390e4, 0x00003d4a, 0x0007a16a, 0x004e1384, 0x00a5694a, + 0x00ad2b4a, 0x004390e4, 0x00a52d4a, 0x00a5a16a, 0x004f83e0, 0x00a57c00, 0x00ad83e0, 0x000f83e4, + 0x00007d4a, 0x000f836a, 0x004f93e4, 0x00a57d4a, 0x00ad836a, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0x00001084, 0x00007000, 0x00421000, + 0x00039ce0, 0x000039ce, 0x000e7380, 0x00e73800, 0x000e7f80, 0x00e73884, 0x0003fce0, 0x004239ce }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.11.1/src/LineFont.src new/konsole-4.11.2/src/LineFont.src --- old/konsole-4.11.1/src/LineFont.src 2013-06-28 19:14:47.000000000 +0200 +++ new/konsole-4.11.2/src/LineFont.src 2013-09-26 21:19:01.000000000 +0200 @@ -299,10 +299,10 @@ 2530 + ===== -===== -==|== - | + ||| + ||| 2531 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.11.1/src/TerminalCharacterDecoder.cpp new/konsole-4.11.2/src/TerminalCharacterDecoder.cpp --- old/konsole-4.11.1/src/TerminalCharacterDecoder.cpp 2013-06-28 19:14:47.000000000 +0200 +++ new/konsole-4.11.2/src/TerminalCharacterDecoder.cpp 2013-09-26 21:19:01.000000000 +0200 @@ -150,6 +150,16 @@ QString text; + text.append("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n"); + text.append("\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n"); + text.append("http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">\n"); + text.append("<head>\n"); + text.append("<title>Konsole output</title>\n"); + text.append("\n"); + text.append("</head>\n"); + text.append("<body>\n"); + text.append("<div>\n"); + //open monospace span openSpan(text, "font-family:monospace"); @@ -163,6 +173,9 @@ QString text; closeSpan(text); + text.append("</div>\n"); + text.append("</body>\n"); + text.append("</html>\n"); *_output << text; @@ -184,8 +197,10 @@ if (characters[i].rendition != _lastRendition || characters[i].foregroundColor != _lastForeColor || characters[i].backgroundColor != _lastBackColor) { - if (_innerSpanOpen) + if (_innerSpanOpen) { closeSpan(text); + _innerSpanOpen = false; + } _lastRendition = characters[i].rendition; _lastForeColor = characters[i].foregroundColor; @@ -244,16 +259,20 @@ text.append(ch); } } else { - text.append(" "); //HTML truncates multiple spaces, so use a space marker instead + // HTML truncates multiple spaces, so use a space marker instead + // Use   instead of   so xmllint will work. + text.append(" "); } } //close any remaining open inner spans - if (_innerSpanOpen) + if (_innerSpanOpen) { closeSpan(text); + _innerSpanOpen = false; + } //start new line - text.append("<br>"); + text.append("<br />"); *_output << text; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.11.1/src/main.cpp new/konsole-4.11.2/src/main.cpp --- old/konsole-4.11.1/src/main.cpp 2013-08-29 20:32:20.000000000 +0200 +++ new/konsole-4.11.2/src/main.cpp 2013-09-26 21:19:01.000000000 +0200 @@ -29,7 +29,7 @@ #include <KCmdLineArgs> #include <KLocale> -#define KONSOLE_VERSION "2.11.1" +#define KONSOLE_VERSION "2.11.2" using Konsole::Application; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.11.1/src/tests/TerminalCharacterDecoderTest.cpp new/konsole-4.11.2/src/tests/TerminalCharacterDecoderTest.cpp --- old/konsole-4.11.1/src/tests/TerminalCharacterDecoderTest.cpp 2013-06-28 19:14:47.000000000 +0200 +++ new/konsole-4.11.2/src/tests/TerminalCharacterDecoderTest.cpp 2013-09-26 21:19:01.000000000 +0200 @@ -1,5 +1,6 @@ /* Copyright 2008 by Robert Knight + Copyright 2013 by Kurt Hindenburg This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,6 +25,9 @@ #include #include +#include <QFile> +#include <QXmlSimpleReader> + // KDE #include @@ -57,6 +61,20 @@ delete decoder; } +void TerminalCharacterDecoderTest::testHTMLFileForValidity() +{ + QString fileName = "konsole.html"; + QFile fi(fileName); + + if (!fi.exists()) + QSKIP("Test html file not found.", SkipSingle); + + QXmlSimpleReader xmlReader; + QXmlInputSource source(&fi); + + QVERIFY(xmlReader.parse(&source)); +} + QTEST_KDEMAIN_CORE(TerminalCharacterDecoderTest) #include "TerminalCharacterDecoderTest.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.11.1/src/tests/TerminalCharacterDecoderTest.h new/konsole-4.11.2/src/tests/TerminalCharacterDecoderTest.h --- old/konsole-4.11.1/src/tests/TerminalCharacterDecoderTest.h 2013-06-28 19:14:47.000000000 +0200 +++ new/konsole-4.11.2/src/tests/TerminalCharacterDecoderTest.h 2013-09-26 21:19:01.000000000 +0200 @@ -34,6 +34,7 @@ void cleanup(); void testPlainTextDecoder(); + void testHTMLFileForValidity(); }; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org