Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at Thu Nov 18 16:24:43 CET 2010. -------- --- KDE/kdebase4/kdebase4.changes 2010-10-28 22:08:47.000000000 +0200 +++ kdebase4/kdebase4.changes 2010-11-16 14:07:26.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Nov 16 13:05:32 UTC 2010 - cristian.rodriguez@opensuse.org + +- Remove workaround for bko#246652, real fix is now in kdelibs + revision 1197480. + +------------------------------------------------------------------- +Sat Nov 13 22:51:42 UTC 2010 - cristian.rodriguez@opensuse.org + +- Closing the shell via CTRL+D crashes [bko#246652] + +------------------------------------------------------------------- +Fri Nov 12 19:45:49 UTC 2010 - ctrippe@gmx.net + +- Change the name of the konsole profile in konsolesu.desktop + to fix the renamed profile + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- kdebase-4.5.3-konsole-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.uMuZkt/_old 2010-11-18 16:22:03.000000000 +0100 +++ /var/tmp/diff_new_pack.uMuZkt/_new 2010-11-18 16:22:03.000000000 +0100 @@ -34,7 +34,7 @@ Summary: The Base KDE Apps Url: http://www.kde.org/ Version: 4.5.3 -Release: 1 +Release: 2 Source0: kdebase-%version.tar.bz2 Source1: baselibs.conf Source2: rpmlintrc @@ -51,6 +51,7 @@ Patch7: dolphin-go_up.diff Patch8: plasma-new-default-panel.diff Patch10: dolphin-search-toolbar-bnc537372.diff +Patch11: kdebase-4.5.3-konsole-crash.patch %kde4_runtime_requires Suggests: konsole Suggests: dolphin @@ -83,6 +84,7 @@ ###KDE44: rediff? #%patch8 %patch10 +%patch11 %build %cmake_kde4 -d build ++++++ kdebase-4.5.3-konsole-crash.patch ++++++ --- apps/konsole/src/TerminalDisplay.cpp.orig +++ apps/konsole/src/TerminalDisplay.cpp @@ -942,15 +942,18 @@ void TerminalDisplay::updateImage() _screenWindow->scrollRegion() ); _screenWindow->resetScrollCount(); + if (!_image) { + // Create _image. + // The emitted changedContentSizeSignal also leads to getImage being recreated, so do this first. + updateImageSize(); + } + Character* const newimg = _screenWindow->getImage(); int lines = _screenWindow->windowLines(); int columns = _screenWindow->windowColumns(); setScroll( _screenWindow->currentLine() , _screenWindow->lineCount() ); - if (!_image) - updateImageSize(); // Create _image - Q_ASSERT( this->_usedLines <= this->_lines ); Q_ASSERT( this->_usedColumns <= this->_columns ); --- apps/konsole/src/SessionController.cpp.orig +++ apps/konsole/src/SessionController.cpp @@ -1059,9 +1059,11 @@ void SessionController::showDisplayConte // application did not merge our GUI. if (!factory()) { - if (!clientBuilder()) + if (!clientBuilder()) + { setClientBuilder(new KXMLGUIBuilder(_view)); - + } + //kDebug(1211) << "Created xmlgui factory" << factory; KXMLGUIFactory* factory = new KXMLGUIFactory(clientBuilder(), this); factory->addClient(this); } ++++++ konsolesu.desktop ++++++ --- /var/tmp/diff_new_pack.uMuZkt/_old 2010-11-18 16:22:03.000000000 +0100 +++ /var/tmp/diff_new_pack.uMuZkt/_new 2010-11-18 16:22:03.000000000 +0100 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=konsole --profile Root_Shell +Exec=konsole --profile Root\ Shell Icon=utilities-terminal_su X-DocPath=konsole/index.html Terminal=false ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org