From 2891d29af8907ce881662f4a02844926d7a293c7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 Dec 2018 13:43:35 +0000 Subject: gentoo resync : 31.12.2018 --- kde-apps/konsole/Manifest | 3 +- .../konsole/files/konsole-18.12.0-fix-cursor.patch | 58 ++++++++++++++++++++ kde-apps/konsole/konsole-18.12.0-r1.ebuild | 59 -------------------- kde-apps/konsole/konsole-18.12.0-r2.ebuild | 62 ++++++++++++++++++++++ 4 files changed, 122 insertions(+), 60 deletions(-) create mode 100644 kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch delete mode 100644 kde-apps/konsole/konsole-18.12.0-r1.ebuild create mode 100644 kde-apps/konsole/konsole-18.12.0-r2.ebuild (limited to 'kde-apps/konsole') diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest index 5331dd573d65..0dfd017ee8ee 100644 --- a/kde-apps/konsole/Manifest +++ b/kde-apps/konsole/Manifest @@ -1,7 +1,8 @@ AUX konsole-18.08.3-desktop.patch 821 BLAKE2B 3b86d8c03bbc23e991ad2e84172f64591ccca3cf5877c3b1812593df8e817adaaf5a34c72d34ba57af09adb7f64eaa9e78732f724de8adfec523c17ee65d1e5d SHA512 0a6b36edff6067c18312b44d5b7fbe6f4c8659dd34ddda5edd5b483bea462fc4abe4c07710530997adf83be1dfc77c3fd72a74f60398ccdae8f8bdb84f3822ee +AUX konsole-18.12.0-fix-cursor.patch 2392 BLAKE2B 8ceb13cedc0f2a7edc043ba2ca931cd99a2988d87f5e60b23694ed1cbaad44bd116055d10e8c143a812f4b2e74d95f9f8273ebe242640d03d801b398838468b6 SHA512 2e9dc095c19f7be76f220a8a31e4ada7dbb705cad8e92069fa77893c75a76737590cebeae0e1ce30f50d382cae8eb26c4b2e474f5ae0d4fcaee28562c23029fe 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 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 +EBUILD konsole-18.12.0-r2.ebuild 1555 BLAKE2B 5709edac373af0c51f2d5e7e69523e812dd61d0eb7d851cde6a205a9ed6691dd8bd4abe772aaad06c160ea4d2406a3217f738b2b4deb7cbff443ce99c265f09c SHA512 e09cfcf041dd9e3f993bfcd60dce1d15cf06dab5a7ed2cddf75ef8b1423761d83b96b42f7b35e3f2bcdc17c43af3f7f9d5f1ba29e1b42ba5cd02fe50027b7d8e MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch b/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch new file mode 100644 index 000000000000..36aabaaccc54 --- /dev/null +++ b/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch @@ -0,0 +1,58 @@ +From b48ecb5712037027e6385515c9eced7fabfc3dc3 Mon Sep 17 00:00:00 2001 +From: "Martin T. H. Sandsmark" +Date: Mon, 10 Dec 2018 10:09:35 -0500 +Subject: fix cursor when anti aliasing is enabled + +Summary: +When there is a margin of 1 pixel, but some of the anti-aliasing +"blur" leaks to 0,0. so it is fixed with a full update() (e. g. when +it regains focus), but not when just some content updates in the +window. Without this it draws outside the content rect, most +visible as a vertical line if the cursor is completely to the left and +then moves. + +Reviewers: #konsole, hindenburg + +Reviewed By: #konsole, hindenburg + +Subscribers: pbraun, konsole-devel, #konsole + +Tags: #konsole + +Differential Revision: https://phabricator.kde.org/D17414 + +(cherry picked from commit e7085310d6d594823d0ed491fa8bdbd99dec4932) +--- + src/TerminalDisplay.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp +index 6e8b262..64c831c 100644 +--- a/src/TerminalDisplay.cpp ++++ b/src/TerminalDisplay.cpp +@@ -933,7 +933,7 @@ void TerminalDisplay::drawCursor(QPainter& painter, + + // shift rectangle top down one pixel to leave some space + // between top and bottom +- QRect cursorRect = rect.adjusted(0, 1, 0, 0); ++ QRectF cursorRect = rect.adjusted(0, 1, 0, 0); + + QColor cursorColor = _cursorColor.isValid() ? _cursorColor : foregroundColor; + painter.setPen(cursorColor); +@@ -942,10 +942,10 @@ void TerminalDisplay::drawCursor(QPainter& painter, + // draw the cursor outline, adjusting the area so that + // it is draw entirely inside 'rect' + int penWidth = qMax(1, painter.pen().width()); +- painter.drawRect(cursorRect.adjusted(penWidth / 2, +- penWidth / 2, +- - penWidth / 2 - penWidth % 2, +- - penWidth / 2 - penWidth % 2)); ++ painter.drawRect(cursorRect.adjusted(penWidth / 2 + 0.5, ++ penWidth / 2 + 0.5, ++ - penWidth / 2 - penWidth % 2 + 0.5, ++ - penWidth / 2 - penWidth % 2 + 0.5)); + + // draw the cursor body only when the widget has focus + if (hasFocus()) { +-- +cgit v1.1 diff --git a/kde-apps/konsole/konsole-18.12.0-r1.ebuild b/kde-apps/konsole/konsole-18.12.0-r1.ebuild deleted file mode 100644 index 63fec0b9fa7e..000000000000 --- a/kde-apps/konsole/konsole-18.12.0-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# 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 -} diff --git a/kde-apps/konsole/konsole-18.12.0-r2.ebuild b/kde-apps/konsole/konsole-18.12.0-r2.ebuild new file mode 100644 index 000000000000..abc36ad9309f --- /dev/null +++ b/kde-apps/konsole/konsole-18.12.0-r2.ebuild @@ -0,0 +1,62 @@ +# 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 + "${FILESDIR}/${P}-fix-cursor.patch" # fixed in 18.12.1 +) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package X X11) + ) + + kde5_src_configure +} -- cgit v1.2.3