Hello community, here is the log from the commit of package konsole for openSUSE:Factory checked in at 2016-02-07 09:22:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-23 01:08:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.konsole.new/konsole.changes 2016-02-07 09:22:04.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Feb 3 05:40:38 UTC 2016 - [email protected] + +- Add allow-certain-variable-width-fonts.patch: resolve no characters + are shown on Chinese and Japanese environment (boo#962239) + * For some monospaced fonts with ligatures or the ambiguous-width + problem, QFontInfo::fixedPitch does not return true. When such + font is selected for "Monospace", Konsole did not print anything. + + +------------------------------------------------------------------- +Mon Feb 1 11:01:57 UTC 2016 - [email protected] + +- Add fix-profile-terminal-size.patch: allow profile's terminal + size to work again (boo#964165, kde#345403) + +------------------------------------------------------------------- New: ---- allow-certain-variable-width-fonts.patch fix-profile-terminal-size.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konsole.spec ++++++ --- /var/tmp/diff_new_pack.1Ab7vg/_old 2016-02-07 09:22:05.000000000 +0100 +++ /var/tmp/diff_new_pack.1Ab7vg/_new 2016-02-07 09:22:05.000000000 +0100 @@ -32,6 +32,10 @@ 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 @@ -79,6 +83,8 @@ %prep %setup -q +%patch -p1 +%patch1 -p1 %build %cmake_kf5 -d build ++++++ allow-certain-variable-width-fonts.patch ++++++ commit 1e2dc1083c1fe3b1c7acd028832c70bf8006848f Author: Kurt Hindenburg <[email protected]> Date: Sat Jan 30 15:46:35 2016 -0500 Allow certain variable-width fonts to be used For certain fonts (with ligatures) QFontInfo::fixedPitch doesn't return the correct result. Previously, these fonts were not allowed to be used. Variable-width fonts are still not selectable in the font dialog. Thanks to Stefan Seemayer stefan seemayer de for research and patch. See reviewboard for a more detailed description REVIEW: 126921 diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp index 536aea6..3272122 100644 --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -226,8 +226,7 @@ void TerminalDisplay::setVTFont(const QFont& f) 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() ++++++ fix-profile-terminal-size.patch ++++++ From: Kurt Hindenburg <[email protected]> Date: Sat, 30 Jan 2016 17:09:33 +0000 Subject: Allow profile's termainal size to work again X-Git-Url: http://quickgit.kde.org/?p=konsole.git&a=commitdiff&h=55f02e5b8e3e2395050940c33c97306311192e18 --- Allow profile's termainal size to work again When Konsole Settings -> 'Use current window size on next startup' is disabled, use the Profile's terminal size for new windows. Many thanks to Roman Gilg (subdiff gmail com) for research and patch. If there are no further issues, I'll commit to 15.12 branch (should go .2 release). REVIEW: 126924 CCBUG: 345403 --- --- a/src/Application.cpp +++ b/src/Application.cpp @@ -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(); +} --- a/src/Application.h +++ b/src/Application.h @@ -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; };
