From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- kde-apps/konsole/Manifest | 7 +- .../konsole-18.12.0-fix-drawing-box-chars.patch | 188 +++++++++++++++++++++ kde-apps/konsole/konsole-18.04.3.ebuild | 57 ------- kde-apps/konsole/konsole-18.08.3-r1.ebuild | 2 +- kde-apps/konsole/konsole-18.12.0-r1.ebuild | 59 +++++++ 5 files changed, 252 insertions(+), 61 deletions(-) create mode 100644 kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch delete mode 100644 kde-apps/konsole/konsole-18.04.3.ebuild create mode 100644 kde-apps/konsole/konsole-18.12.0-r1.ebuild (limited to 'kde-apps/konsole') diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest index 0e66a12437d4..5331dd573d65 100644 --- a/kde-apps/konsole/Manifest +++ b/kde-apps/konsole/Manifest @@ -1,6 +1,7 @@ AUX konsole-18.08.3-desktop.patch 821 BLAKE2B 3b86d8c03bbc23e991ad2e84172f64591ccca3cf5877c3b1812593df8e817adaaf5a34c72d34ba57af09adb7f64eaa9e78732f724de8adfec523c17ee65d1e5d SHA512 0a6b36edff6067c18312b44d5b7fbe6f4c8659dd34ddda5edd5b483bea462fc4abe4c07710530997adf83be1dfc77c3fd72a74f60398ccdae8f8bdb84f3822ee -DIST konsole-18.04.3.tar.xz 1043452 BLAKE2B 341d589ea00536913d008548affecf301f9c455661eb5630e345481d75c3feb0138e5dff23d25421d0f375381586c4dc72b511042cb4803dc75873a943c20658 SHA512 0809cf4db6e10e672a4a976609045fb88879fe615b48e452f140da0a6c44971f31a7b4606124ed3b7642ee3f3556ace45b31e0b5c466df611fea98a9cf702066 +AUX konsole-18.12.0-fix-drawing-box-chars.patch 6037 BLAKE2B 9214a32c9ab66ad6a0cfd7d02a3dd05d4e8dcda067b247322d7a320ebab9a251193906577e1a395ef52d06658e436776cad628e1d6a7ff81bbaf1bed5486e045 SHA512 6439b1c90a37c80c3de0dc16aa1f68eff87e41562c74f86748b99c20702fe14c27cd6a0553284e4c957b70f1d6ef3c645b1b2485a73858cf390fc6603caf48ee DIST konsole-18.08.3.tar.xz 1077100 BLAKE2B 76ffc17c72ef6ccfc9618fd7ae59aeac00f8d686dcbe8fa61ef57248ba494d5dde94bc7f320c373f119e2ae60530d49640be7914aba7868b69e36c3673211f83 SHA512 3dcc5111e7a7fa389dda862b4a895379ffdb7a39d6568b3b958bf36631e3b3424a6abf2b9166f8567fcdf2d2d6f305a2e13f7575ce63549b0ebb4ebc27b33a82 -EBUILD konsole-18.04.3.ebuild 1420 BLAKE2B f940eacd6525caabc7f69e5e89a8cf1b470d255a3334f98ade87b950b5c91ed45bdeec7769cfd274c32d39abf99e0ba9475d4284c5ea042ba546949d78e7f1b8 SHA512 8da1c3cc6e9ae895ba7fc992bad527de09e8355dc6d49fc74d5a925fa18b0b64b79233aaf5fad2617d7ac93ebe56594669a07487ddb1de0c8c825c5ce223fcc2 -EBUILD konsole-18.08.3-r1.ebuild 1465 BLAKE2B 3c05b1fc9acf278919cd93d21d6f86db948053375c9e7c9682c307ccf7729753e63b1dc644dfc81f885bcfef6a5eb513745f89c778209b5650698acf1e9dbbca SHA512 7edaa956ad37143b3626d37ced1025afd3d5ac414b44a352a11cc19f94ed707d5b435f5cd90d09913d7023e6bbaa6ad67374345b90cfe51087c5b917d0552007 +DIST konsole-18.12.0.tar.xz 1093284 BLAKE2B e2a50364d80f1060c705a6ae09e657dcf3461a9903b0485650c57547964b57f99a98b2101e0f7702bf487f386018f40c1d9a96ef9a926fe935e193c7036a2588 SHA512 fce0f46d68453d795c68bc91ebc56c3db8e04e3cd20c5a036d12dd9cf29daf5aed7cd53f5f9af96081c3e6d3b79f52af7e0a127412771fe12ac1e24e09fcee95 +EBUILD konsole-18.08.3-r1.ebuild 1463 BLAKE2B d8b66938939c560a9a8152e1a3cac2187156e725f80ee1ca1bacc8bdc5e8a2f13de4b287aa049180423feda04a9854fda2835ba23c8e21ec8deae74f34f942a2 SHA512 0114d8802c1863cd68b559c7be971436fd99585e804c84919bcd494d6156967b249e950742a33a4b3f884d5cbfc4da90231310012b5299d5bcae731a0f2d707f +EBUILD konsole-18.12.0-r1.ebuild 1498 BLAKE2B 56650907571190f9b7333bc837585d52b795d6ef2b8c94ea21a5a519269079a7882c8ae14cc0f52a2800199fe522e5a21db04ced713b194f5ac6a214a0f598ca SHA512 9148092b94af0ee6564b5d68e3b143fba64ecdc6d9d88d3e18669d9ba61ce2c14647cdc0a23abfa5cf299b951527fb256418c78ddfe5765363906ae102539afb MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch b/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch new file mode 100644 index 000000000000..1847543737af --- /dev/null +++ b/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch @@ -0,0 +1,188 @@ +From 807ac77061604c2ac7cf84b0a0b29dd949a6c634 Mon Sep 17 00:00:00 2001 +From: "Martin T. H. Sandsmark" +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 + +(cherry picked from commit 14b3c8be2c15ed9711b1308b4a991de4aad5802d) +--- + src/TerminalDisplay.cpp | 45 ++++++++++++++++++++------------------------- + 1 file changed, 20 insertions(+), 25 deletions(-) + +diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp +index 722e200..2b14556 100644 +--- a/src/TerminalDisplay.cpp ++++ b/src/TerminalDisplay.cpp +@@ -619,7 +619,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; + +@@ -671,33 +671,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); + } + } + +@@ -705,7 +705,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; + +@@ -792,16 +792,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) { +@@ -909,10 +910,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); +@@ -1041,8 +1042,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); +@@ -1062,8 +1061,6 @@ void TerminalDisplay::drawTextFragment(QPainter& painter , + + // draw text + drawCharacters(painter, rect, text, style, invertCharacterColor); +- +- painter.restore(); + } + + void TerminalDisplay::drawPrinterFriendlyTextFragment(QPainter& painter, +@@ -1071,8 +1068,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; +@@ -1081,8 +1076,6 @@ void TerminalDisplay::drawPrinterFriendlyTextFragment(QPainter& painter, + + // draw text + drawCharacters(painter, rect, text, &print_style, false); +- +- painter.restore(); + } + + void TerminalDisplay::setRandomSeed(uint randomSeed) +@@ -1499,6 +1492,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 v1.1 diff --git a/kde-apps/konsole/konsole-18.04.3.ebuild b/kde-apps/konsole/konsole-18.04.3.ebuild deleted file mode 100644 index b4451f253c16..000000000000 --- a/kde-apps/konsole/konsole-18.04.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="optional" -KDE_TEST="true" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="KDE's terminal emulator" -HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org" - -KEYWORDS="amd64 x86" -IUSE="X" - -DEPEND=" - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kinit) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kpty) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - X? ( x11-libs/libX11 ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package X X11) - ) - - kde5_src_configure -} diff --git a/kde-apps/konsole/konsole-18.08.3-r1.ebuild b/kde-apps/konsole/konsole-18.08.3-r1.ebuild index 5bc727ab78c7..a3f626b9bcf2 100644 --- a/kde-apps/konsole/konsole-18.08.3-r1.ebuild +++ b/kde-apps/konsole/konsole-18.08.3-r1.ebuild @@ -11,7 +11,7 @@ inherit kde5 DESCRIPTION="KDE's terminal emulator" HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="X" DEPEND=" diff --git a/kde-apps/konsole/konsole-18.12.0-r1.ebuild b/kde-apps/konsole/konsole-18.12.0-r1.ebuild new file mode 100644 index 000000000000..63fec0b9fa7e --- /dev/null +++ b/kde-apps/konsole/konsole-18.12.0-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="optional" +KDE_TEST="true" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="KDE's terminal emulator" +HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org" + +KEYWORDS="~amd64 ~x86" +IUSE="X" + +DEPEND=" + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kinit) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kpty) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + X? ( x11-libs/libX11 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-fix-drawing-box-chars.patch" ) # fixed in 18.12.1 + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package X X11) + ) + + kde5_src_configure +} -- cgit v1.2.3