Hello community, here is the log from the commit of package konsole for openSUSE:Factory checked in at 2016-02-22 10:17:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/konsole (Old) and /work/SRC/openSUSE:Factory/.konsole.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "konsole" Changes: -------- --- /work/SRC/openSUSE:Factory/konsole/konsole.changes 2016-02-07 09:22:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.konsole.new/konsole.changes 2016-02-22 10:17:35.000000000 +0100 @@ -1,0 +2,12 @@ +Sat Feb 13 08:16:24 UTC 2016 - [email protected] + +- Update to KDE Applications 15.12.2 + * KDE Applications 15.12.2 + * https://www.kde.org/announcements/announce-applications-15.12.2.php + * boo#966605 + +- Drop upstreamed patches: + * allow-certain-variable-width-fonts.patch + * fix-profile-terminal-size.patch + +------------------------------------------------------------------- Old: ---- allow-certain-variable-width-fonts.patch fix-profile-terminal-size.patch konsole-15.12.1.tar.xz New: ---- konsole-15.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konsole.spec ++++++ --- /var/tmp/diff_new_pack.byJREn/_old 2016-02-22 10:17:36.000000000 +0100 +++ /var/tmp/diff_new_pack.byJREn/_new 2016-02-22 10:17:36.000000000 +0100 @@ -17,7 +17,7 @@ Name: konsole -Version: 15.12.1 +Version: 15.12.2 Release: 0 Summary: KDE Terminal License: GPL-2.0+ @@ -32,10 +32,6 @@ Source24: utilities-terminal-su-48.png Source25: utilities-terminal-su-64.png Source26: utilities-terminal-su-128.png -# PATCH-FIX-UPSTREAM fix-profile-terminal-size.patch boo#964165, kde#345403 -- allow profile's terminal size to work again -Patch: fix-profile-terminal-size.patch -# PATCH-FIX-UPSTREAM allow-certain-variable-width-fonts.patch boo#962239 -Patch1: allow-certain-variable-width-fonts.patch BuildRequires: fdupes BuildRequires: kbookmarks-devel BuildRequires: kconfig-devel @@ -83,8 +79,6 @@ %prep %setup -q -%patch -p1 -%patch1 -p1 %build %cmake_kf5 -d build ++++++ konsole-15.12.1.tar.xz -> konsole-15.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.12.1/CMakeLists.txt new/konsole-15.12.2/CMakeLists.txt --- old/konsole-15.12.1/CMakeLists.txt 2016-01-07 00:01:40.000000000 +0100 +++ new/konsole-15.12.2/CMakeLists.txt 2016-02-12 06:10:18.000000000 +0100 @@ -4,7 +4,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "15") 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}") # minimal requirements diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.12.1/desktop/org.kde.konsole.appdata.xml new/konsole-15.12.2/desktop/org.kde.konsole.appdata.xml --- old/konsole-15.12.1/desktop/org.kde.konsole.appdata.xml 2016-01-07 00:01:40.000000000 +0100 +++ new/konsole-15.12.2/desktop/org.kde.konsole.appdata.xml 2016-02-12 06:10:18.000000000 +0100 @@ -14,6 +14,7 @@ <name xml:lang="el">Konsole</name> <name xml:lang="en-GB">Konsole</name> <name xml:lang="es">Konsole</name> + <name xml:lang="et">Konsool</name> <name xml:lang="fi">Konsole</name> <name xml:lang="gl">Konsole</name> <name xml:lang="hu">Konsole</name> @@ -51,6 +52,7 @@ <summary xml:lang="el">Τερματικό</summary> <summary xml:lang="en-GB">Terminal</summary> <summary xml:lang="es">Terminal</summary> + <summary xml:lang="et">Terminal</summary> <summary xml:lang="fi">Pääteikkuna</summary> <summary xml:lang="gl">Terminal</summary> <summary xml:lang="hu">Terminál</summary> @@ -87,6 +89,7 @@ <p xml:lang="el">Το Konsole είναι ένας εξομοιωτής τερματικού.</p> <p xml:lang="en-GB">Konsole is a terminal emulator.</p> <p xml:lang="es">Konsole es un emulador de terminal.</p> + <p xml:lang="et">Konsool on terminaliemulaator.</p> <p xml:lang="fi">Konsole on pääte-emulaattori.</p> <p xml:lang="gl">Konsole é un emulador de terminal.</p> <p xml:lang="hu">A Konsole egy terminálemulátor.</p> @@ -123,6 +126,7 @@ <p xml:lang="el">Χαρακτηριστικά:</p> <p xml:lang="en-GB">Features:</p> <p xml:lang="es">Funcionalidades:</p> + <p xml:lang="et">Omadused:</p> <p xml:lang="fi">Ominaisuuksia:</p> <p xml:lang="gl">Funcionalidades:</p> <p xml:lang="hu">Szolgáltatások:</p> @@ -161,6 +165,7 @@ <li xml:lang="el">Καρτέλες</li> <li xml:lang="en-GB">Tabs</li> <li xml:lang="es">Pestañas</li> + <li xml:lang="et">Kaardid</li> <li xml:lang="fi">Välilehdet</li> <li xml:lang="gl">Lapelas.</li> <li xml:lang="hu">Lapok</li> @@ -196,6 +201,7 @@ <li xml:lang="el">Πολλαπλά προφίλ</li> <li xml:lang="en-GB">Multiple profiles</li> <li xml:lang="es">Perfiles múltiples</li> + <li xml:lang="et">Mitme profiili võimalus</li> <li xml:lang="fi">Useat profiilit</li> <li xml:lang="gl">Varios perfís.</li> <li xml:lang="hu">Több profil használatának lehetősége</li> @@ -230,6 +236,7 @@ <li xml:lang="el">Παρακολούθηση κατάστασης αδράνειας και δραστηριοτήτων</li> <li xml:lang="en-GB">Silence and Activity monitoring</li> <li xml:lang="es">Supervisión de silencios y actividad</li> + <li xml:lang="et">Vaikuse ja tegevuse jälgimine</li> <li xml:lang="fi">Hiljaisuuden ja aktiivisuuden tarkkailu</li> <li xml:lang="gl">Control de actividade e inactividade.</li> <li xml:lang="hu">Üresjárat- és aktivitásmonitorozás</li> @@ -264,6 +271,7 @@ <li xml:lang="el">υποστήριξη σελιδοδεικτών</li> <li xml:lang="en-GB">Bookmark support</li> <li xml:lang="es">Uso de marcadores</li> + <li xml:lang="et">Järjehoidjate toetus</li> <li xml:lang="fi">Kirjanmerkkituki</li> <li xml:lang="gl">Marcadores.</li> <li xml:lang="hu">Könyvjelzők támogatása</li> @@ -299,6 +307,7 @@ <li xml:lang="el">Αναζήτηση</li> <li xml:lang="en-GB">Searching</li> <li xml:lang="es">Búsqueda</li> + <li xml:lang="et">Otsimine</li> <li xml:lang="fi">Haku</li> <li xml:lang="gl">Busca.</li> <li xml:lang="hu">Keresés</li> @@ -335,6 +344,7 @@ <li xml:lang="el">Αποθήκευση αποτελέσματος</li> <li xml:lang="en-GB">Saving output</li> <li xml:lang="es">Guardar la salida</li> + <li xml:lang="et">Väljundi salvestamine</li> <li xml:lang="fi">Tulosteen tallennus</li> <li xml:lang="gl">Posibilidade de gardar a saída.</li> <li xml:lang="hu">Kimenet mentése</li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.12.1/src/Application.cpp new/konsole-15.12.2/src/Application.cpp --- old/konsole-15.12.1/src/Application.cpp 2016-01-07 00:01:40.000000000 +0100 +++ new/konsole-15.12.2/src/Application.cpp 2016-02-12 06:10:18.000000000 +0100 @@ -36,6 +36,7 @@ #include "MainWindow.h" #include "Session.h" #include "ShellCommand.h" +#include "KonsoleSettings.h" using namespace Konsole; @@ -83,7 +84,7 @@ { MainWindow* window = newMainWindow(); window->createSession(profile, directory); - window->show(); + finalizeNewMainWindow(window); } void Application::detachView(Session* session) @@ -93,7 +94,7 @@ // Since user is dragging and dropping, move dnd window to where // the user has the cursor (correct multiple monitor setups). window->move(QCursor::pos()); - window->show(); + finalizeNewMainWindow(window); } int Application::newInstance() @@ -109,8 +110,12 @@ if (processHelpArgs(args)) return 0; + // returns from processWindowArgs(args, createdNewMainWindow) + // if a new window was created + bool createdNewMainWindow = false; + // create a new window or use an existing one - MainWindow* window = processWindowArgs(args); + MainWindow* window = processWindowArgs(args, createdNewMainWindow); if (args->isSet("tabs-from-file")) { // create new session(s) as described in file @@ -148,10 +153,15 @@ // run. After that KMainWindow will have manually resized the // window to its saved size at this point (so the Qt::WA_Resized // attribute will be set) - if (!window->testAttribute(Qt::WA_Resized)) - window->resize(window->sizeHint()); - window->show(); + + // If not restoring size from last time or only adding new tab, + // resize window to chosen profile size (see Bug:345403) + if (createdNewMainWindow){ + finalizeNewMainWindow(window); + } else{ + window->show(); + } } } @@ -285,7 +295,7 @@ window->hide(); } -MainWindow* Application::processWindowArgs(KCmdLineArgs* args) +MainWindow* Application::processWindowArgs(KCmdLineArgs* args, bool &createdNewMainWindow) { MainWindow* window = 0; if (args->isSet("new-tab")) { @@ -299,6 +309,7 @@ } if (window == 0) { + createdNewMainWindow = true; window = newMainWindow(); // override default menubar visibility @@ -475,3 +486,9 @@ } } +void Application::finalizeNewMainWindow(MainWindow* window) +{ + if (!KonsoleSettings::saveGeometryOnExit()) + window->resize(window->sizeHint()); + window->show(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.12.1/src/Application.h new/konsole-15.12.2/src/Application.h --- old/konsole-15.12.1/src/Application.h 2016-01-07 00:01:40.000000000 +0100 +++ new/konsole-15.12.2/src/Application.h 2016-02-12 06:10:18.000000000 +0100 @@ -77,12 +77,13 @@ void listProfilePropertyInfo(); void startBackgroundMode(MainWindow* window); bool processHelpArgs(KCmdLineArgs* args); - MainWindow* processWindowArgs(KCmdLineArgs* args); + MainWindow* processWindowArgs(KCmdLineArgs* args, bool &createdNewMainWindow); Profile::Ptr processProfileSelectArgs(KCmdLineArgs* args); Profile::Ptr processProfileChangeArgs(KCmdLineArgs* args, Profile::Ptr baseProfile); void processTabsFromFileArgs(KCmdLineArgs* args, MainWindow* window); void createTabFromArgs(KCmdLineArgs* args, MainWindow* window, const QHash<QString, QString>&); + void finalizeNewMainWindow(MainWindow* window); MainWindow* _backgroundInstance; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-15.12.1/src/TerminalDisplay.cpp new/konsole-15.12.2/src/TerminalDisplay.cpp --- old/konsole-15.12.1/src/TerminalDisplay.cpp 2016-01-07 00:01:40.000000000 +0100 +++ new/konsole-15.12.2/src/TerminalDisplay.cpp 2016-02-12 06:10:18.000000000 +0100 @@ -226,8 +226,7 @@ QFontInfo fontInfo(newFont); if (!fontInfo.fixedPitch()) { - qWarning() << "Ignoring font change due to it being variable-width"; - return; + qWarning() << "Using a variable-width font - this might cause display problems"; } // QFontInfo::fixedPitch() appears to not match QFont::fixedPitch()
