Hello community, here is the log from the commit of package konsole for openSUSE:Factory checked in at 2018-12-19 13:35:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/konsole (Old) and /work/SRC/openSUSE:Factory/.konsole.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "konsole" Wed Dec 19 13:35:36 2018 rev:101 rq:658440 version:18.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/konsole/konsole.changes 2018-11-12 09:29:17.862155241 +0100 +++ /work/SRC/openSUSE:Factory/.konsole.new.28833/konsole.changes 2018-12-19 13:35:37.248446916 +0100 @@ -1,0 +2,46 @@ +Fri Dec 14 06:09:14 UTC 2018 - [email protected] + +- Update to 18.12.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12.0.php +- Changes since 18.11.90: + * No code changes since 18.11.90 + +------------------------------------------------------------------- +Fri Dec 7 08:56:42 UTC 2018 - [email protected] + +- Add fix-drawing-box-chars.patch to fix bad border rendering, in + mc for example (boo#1117446, kde#401463) + +------------------------------------------------------------------- +Mon Dec 03 20:56:07 UTC 2018 - [email protected] + +- Update to 18.11.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12-rc.php +- Changes since 18.11.80: + * Fix ASAN issue for determining if running in a KPart + * Allow small colour changes when varying dark backgrounds (kde#311263) + * set variable in initialize list and explictly use bool in if + * Fix search result highlight when scrolling + +------------------------------------------------------------------- +Tue Nov 20 06:22:39 UTC 2018 - Luca Beltrame <[email protected]> + +- Run spec-cleaner + +------------------------------------------------------------------- +Tue Nov 20 05:57:10 UTC 2018 - [email protected] + +- Update to 18.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12-beta.php +- Changes since 18.08.3: + * Too many changes to list here +- Refreshed patches: + * fix-build-with-gcc48.patch + +------------------------------------------------------------------- @@ -49 +95 @@ - * https://www.kde.org/announcements/announce-applications-18.07.80.php + * https://www.kde.org/announcements/announce-applications-18.08-beta.php @@ -111 +157 @@ - * https://www.kde.org/announcements/announce-applications-18.03.90.php + * https://www.kde.org/announcements/announce-applications-18.04-rc.php @@ -232 +278 @@ - * https://www.kde.org/announcements/announce-applications-17.07.90.php + * https://www.kde.org/announcements/announce-applications-17.08-rc.php @@ -320 +366 @@ - * https://www.kde.org/announcements/announce-applications-17.03.80.php + * https://www.kde.org/announcements/announce-applications-17.04-beta.php @@ -463 +509 @@ - * https://www.kde.org/announcements/announce-applications-16.07.90.php + * https://www.kde.org/announcements/announce-applications-16.08-rc.php @@ -611 +657 @@ - * https://www.kde.org/announcements/announce-applications-15.07.90.php + * https://www.kde.org/announcements/announce-applications-15.08-rc.php Old: ---- konsole-18.08.3.tar.xz New: ---- fix-drawing-box-chars.patch konsole-18.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konsole.spec ++++++ --- /var/tmp/diff_new_pack.fuOzkM/_old 2018-12-19 13:35:37.796446205 +0100 +++ /var/tmp/diff_new_pack.fuOzkM/_new 2018-12-19 13:35:37.796446205 +0100 @@ -1,7 +1,7 @@ # # spec file for package konsole # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,22 +12,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%bcond_without lang - -Name: konsole -Version: 18.08.3 -Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%bcond_without lang +Name: konsole +Version: 18.12.0 +Release: 0 Summary: KDE Terminal -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/X11/Terminals -Url: http://www.kde.org/ +URL: http://www.kde.org/ Source: %{name}-%{version}.tar.xz Source3: Root_Shell.profile Source4: konsolesu.desktop @@ -38,7 +37,9 @@ Source25: utilities-terminal-su-64.png Source26: utilities-terminal-su-128.png # PATCH-FIX-OPENSUSE -Patch: fix-build-with-gcc48.patch +Patch0: fix-build-with-gcc48.patch +# PATCH-FIX-UPSTREAM +Patch1: fix-drawing-box-chars.patch BuildRequires: fdupes BuildRequires: kbookmarks-devel BuildRequires: kcompletion-devel @@ -55,9 +56,9 @@ BuildRequires: kiconthemes-devel BuildRequires: kinit-devel BuildRequires: kio-devel +BuildRequires: knewstuff-devel BuildRequires: knotifications-devel BuildRequires: knotifyconfig-devel -BuildRequires: knewstuff-devel BuildRequires: kparts-devel BuildRequires: kpty-devel BuildRequires: kservice-devel @@ -67,17 +68,16 @@ BuildRequires: kxmlgui-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.2.0 BuildRequires: pkgconfig(Qt5Script) >= 5.2.0 BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0 Requires: %{name}-part = %{version} Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Konsole is a terminal emulator for the K Desktop Environment. @@ -85,8 +85,8 @@ %package part Summary: KDE Terminal Group: System/GUI/KDE -Obsoletes: konsole5-part < %{version} Recommends: %{name}-part-lang +Obsoletes: konsole5-part < %{version} %description part Konsole is a terminal emulator for the K Desktop Environment. @@ -94,14 +94,14 @@ %if %{with lang} %package -n %{name}-part-lang +# FIXME: consider using %%lang_package macro Summary: Translations for package %{name} Group: System/Localization Requires: %{name}-part = %{version} +Supplements: packageand(bundle-lang-other:%{name}-part) Provides: %{name}-lang = %{version} Obsoletes: %{name}-lang < %{version} - Provides: %{name}-part-lang-all = %{version} -Supplements: packageand(bundle-lang-other:%{name}-part) BuildArch: noarch %description -n %{name}-part-lang @@ -112,9 +112,9 @@ %prep %setup -q %if 0%{?suse_version} < 1500 -%patch -p1 +%patch0 -p1 %endif - +%patch1 -p1 %build %cmake_kf5 -d build @@ -124,7 +124,7 @@ %kf5_makeinstall -C build %if %{with lang} %find_lang %{name} --with-man --all-name - %kf5_find_htmldocs + %{kf5_find_htmldocs} %endif install -D -m 0644 %{SOURCE3} "%{buildroot}%{_kf5_sharedir}/konsole/Root Shell.profile" install -D -m 0644 %{SOURCE4} %{buildroot}%{_kf5_applicationsdir}/ @@ -143,8 +143,8 @@ %postun part -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc COPYING README +%license COPYING +%doc README %dir %{_kf5_appstreamdir} %dir %{_kf5_htmldir} %dir %{_kf5_htmldir}/en @@ -162,8 +162,8 @@ %{_kf5_sharedir}/khotkeys/konsole.khotkeys %files part -%defattr(-,root,root) -%doc COPYING README +%license COPYING +%doc README %dir %{_kf5_plugindir} %dir %{_kf5_servicesdir} %dir %{_kf5_servicetypesdir} @@ -173,10 +173,11 @@ %{_kf5_servicesdir}/konsolepart.desktop %{_kf5_servicetypesdir}/terminalemulator.desktop %{_kf5_sharedir}/konsole/ +%{_kf5_debugdir}/konsole.categories %if %{with lang} %files part-lang -f %{name}.lang -%doc COPYING* +%license COPYING* %endif %changelog ++++++ fix-build-with-gcc48.patch ++++++ --- /var/tmp/diff_new_pack.fuOzkM/_old 2018-12-19 13:35:37.824446169 +0100 +++ /var/tmp/diff_new_pack.fuOzkM/_new 2018-12-19 13:35:37.824446169 +0100 @@ -12,12 +12,12 @@ index e9865b12..18545f80 100644 --- a/src/SessionController.cpp +++ b/src/SessionController.cpp -@@ -174,7 +174,7 @@ SessionController::SessionController(Session* session , TerminalDisplay* view, Q +@@ -171,7 +171,7 @@ SessionController::SessionController(Session* session , TerminalDisplay* view, Q connect(_session.data(), &Konsole::Session::sessionAttributeChanged, this, &Konsole::SessionController::sessionAttributeChanged); connect(_session.data(), &Konsole::Session::readOnlyChanged, this, &Konsole::SessionController::sessionReadOnlyChanged); -- connect(this, &Konsole::SessionController::tabRenamedByUser, _session, &Konsole::Session::tabRenamedByUser); -+ connect(this, &Konsole::SessionController::tabRenamedByUser, _session.data(), &Konsole::Session::tabRenamedByUser); +- connect(this, &Konsole::SessionController::tabRenamedByUser, _session, &Konsole::Session::tabTitleSetByUser); ++ connect(this, &Konsole::SessionController::tabRenamedByUser, _session.data(), &Konsole::Session::tabTitleSetByUser); connect(_session.data() , &Konsole::Session::currentDirectoryChanged , this , &Konsole::SessionController::currentDirectoryChanged); ++++++ fix-drawing-box-chars.patch ++++++ >From 14b3c8be2c15ed9711b1308b4a991de4aad5802d Mon Sep 17 00:00:00 2001 From: "Martin T. H. Sandsmark" <[email protected]> Date: Thu, 6 Dec 2018 10:02:41 -0500 Subject: fix drawing box chars, avoid storing and saving state all the time Summary: to get the box chars to be drawn correctly we need to turn on high quality antialiasing in qpainter. in addition only turn it on if antialiasing is enabled. lastly qpainter.save()/restore() is called very often, so try to avoid that if it isn't necessary. BUG: 401463 Test Plan: `cat tests/boxes.txt` old: {F6428268} new: {F6450304} Reviewers: #konsole, hindenburg Reviewed By: #konsole, hindenburg Subscribers: wbauer, konsole-devel, #konsole Tags: #konsole Differential Revision: https://phabricator.kde.org/D16947 --- src/TerminalDisplay.cpp | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp index c45bb62..87db09f 100644 --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -614,7 +614,7 @@ static void drawLineChar(QPainter& paint, int x, int y, int w, int h, uchar code { //Calculate cell midpoints, end points. const int cx = x + w / 2; - const int cy = y + h / 2; + const int cy = y + h / 2. - 0.5; const int ex = x + w - 1; const int ey = y + h - 1; @@ -666,33 +666,33 @@ static void drawLineChar(QPainter& paint, int x, int y, int w, int h, uchar code //Intersection points. if ((toDraw & Int11) != 0u) { - paint.drawPoint(cx - 1, cy - 1); + paint.drawPoint(cx - 2, cy - 2); } if ((toDraw & Int12) != 0u) { - paint.drawPoint(cx, cy - 1); + paint.drawPoint(cx - 1, cy - 2); } if ((toDraw & Int13) != 0u) { - paint.drawPoint(cx + 1, cy - 1); + paint.drawPoint(cx - 0, cy - 2); } if ((toDraw & Int21) != 0u) { - paint.drawPoint(cx - 1, cy); + paint.drawPoint(cx - 2, cy - 1); } if ((toDraw & Int22) != 0u) { - paint.drawPoint(cx, cy); + paint.drawPoint(cx - 1, cy - 1); } if ((toDraw & Int23) != 0u) { - paint.drawPoint(cx + 1, cy); + paint.drawPoint(cx - 0, cy - 1); } if ((toDraw & Int31) != 0u) { - paint.drawPoint(cx - 1, cy + 1); + paint.drawPoint(cx - 2, cy); } if ((toDraw & Int32) != 0u) { - paint.drawPoint(cx, cy + 1); + paint.drawPoint(cx - 1, cy); } if ((toDraw & Int33) != 0u) { - paint.drawPoint(cx + 1, cy + 1); + paint.drawPoint(cx - 0, cy); } } @@ -700,7 +700,7 @@ static void drawOtherChar(QPainter& paint, int x, int y, int w, int h, uchar cod { //Calculate cell midpoints, end points. const int cx = x + w / 2; - const int cy = y + h / 2; + const int cy = y + h / 2. - 0.5; // Compensate for the translation, to match fonts const int ex = x + w - 1; const int ey = y + h - 1; @@ -787,16 +787,17 @@ void TerminalDisplay::drawLineCharString(QPainter& painter, int x, int y, const const Character* attributes) { painter.save(); - painter.setRenderHint(QPainter::Antialiasing); - const QPen& originalPen = painter.pen(); + // For antialiasing, we need to shift it so the single pixel width is in the middle + painter.translate(0.5, 0.5); if (((attributes->rendition & RE_BOLD) != 0) && _boldIntense) { - QPen boldPen(originalPen); - boldPen.setWidth(3); + QPen boldPen(painter.pen()); + boldPen.setWidth(4); painter.setPen(boldPen); } + for (int i = 0 ; i < str.length(); i++) { const uchar code = str[i].cell(); if (LineChars[code] != 0u) { @@ -904,10 +905,10 @@ void TerminalDisplay::drawBackground(QPainter& painter, const QRect& rect, const QColor color(backgroundColor); color.setAlpha(qAlpha(_blendColor)); - painter.save(); + const QPainter::CompositionMode originalMode = painter.compositionMode(); painter.setCompositionMode(QPainter::CompositionMode_Source); painter.fillRect(rect, color); - painter.restore(); + painter.setCompositionMode(originalMode); #endif } else { painter.fillRect(rect, backgroundColor); @@ -1036,8 +1037,6 @@ void TerminalDisplay::drawTextFragment(QPainter& painter , const QString& text, const Character* style) { - painter.save(); - // setup painter const QColor foregroundColor = style->foregroundColor.color(_colorTable); const QColor backgroundColor = style->backgroundColor.color(_colorTable); @@ -1057,8 +1056,6 @@ void TerminalDisplay::drawTextFragment(QPainter& painter , // draw text drawCharacters(painter, rect, text, style, invertCharacterColor); - - painter.restore(); } void TerminalDisplay::drawPrinterFriendlyTextFragment(QPainter& painter, @@ -1066,8 +1063,6 @@ void TerminalDisplay::drawPrinterFriendlyTextFragment(QPainter& painter, const QString& text, const Character* style) { - painter.save(); - // Set the colors used to draw to black foreground and white // background for printer friendly output when printing Character print_style = *style; @@ -1076,8 +1071,6 @@ void TerminalDisplay::drawPrinterFriendlyTextFragment(QPainter& painter, // draw text drawCharacters(painter, rect, text, &print_style, false); - - painter.restore(); } void TerminalDisplay::setRandomSeed(uint randomSeed) @@ -1494,6 +1487,8 @@ void TerminalDisplay::paintEvent(QPaintEvent* pe) drawBackground(paint, rect, getBackgroundColor(), true /* use opacity setting */); } + paint.setRenderHint(QPainter::Antialiasing, _antialiasText); + foreach(const QRect & rect, dirtyImageRegion.rects()) { drawContents(paint, rect); } -- cgit v0.11.2 ++++++ konsole-18.08.3.tar.xz -> konsole-18.12.0.tar.xz ++++++ ++++ 112947 lines of diff (skipped)
