gentoo resync : 19.03.2019

3 files changed, 89 insertions, 2 deletions

diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 735fdc8d09b9..a5875c9e49fb 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
+AUX konsole-18.12.3-cursor.patch 2516 BLAKE2B 88591b1e8fb83328ead280c41740db2004bbc445c569e61022b1813d3e308bfcb39266cd64412a3e07866def901f97839a7227d16de04fdffe4ca93834cc4d7a SHA512 2be1001499e67f41c92c6f1dc147f05b5f3ef8e14aef53afbcf353cf31e3736da29dbc06b7e8c033d2921b8ff2755952ef0ad976244228293018bb739ee7fc0b
 DIST konsole-18.08.3.tar.xz 1077100 BLAKE2B 76ffc17c72ef6ccfc9618fd7ae59aeac00f8d686dcbe8fa61ef57248ba494d5dde94bc7f320c373f119e2ae60530d49640be7914aba7868b69e36c3673211f83 SHA512 3dcc5111e7a7fa389dda862b4a895379ffdb7a39d6568b3b958bf36631e3b3424a6abf2b9166f8567fcdf2d2d6f305a2e13f7575ce63549b0ebb4ebc27b33a82
-DIST konsole-18.12.2.tar.xz 1093592 BLAKE2B a91e1803aadebb39b7e2a7663644453659c11d8cced1a7d7d5d665cf04e692d9a898769e9cd71ae69eebd4edba01e0fb6826231b40f835e577e08558179e72de SHA512 3bf32dc9d39dbffb855a043728cca99b21819015a7ca1df56f17f18ec6b5cd5d53bd85f46381bafae72d3747d5b9e6beeff8a79e029800c5af599b169074bf68
+DIST konsole-18.12.3.tar.xz 1098092 BLAKE2B 672a0d8ca3572437893cff90fd56f13773d4100778a0620e68bce9c6e59bd1cf49bda62269106e3de136ceac03afe29e7d9e5cd3dd99887b8c6d4cae26b6a917 SHA512 9fecd316a9bc7adaca9a3fac38a57d293286b6328e88d96ac1cf8967fcb67ef8e9a5b085e185c4373599eafd0eaa18f0d73df70df16b98a1badd9efb689e1f7c
 EBUILD konsole-18.08.3-r1.ebuild 1463 BLAKE2B d8b66938939c560a9a8152e1a3cac2187156e725f80ee1ca1bacc8bdc5e8a2f13de4b287aa049180423feda04a9854fda2835ba23c8e21ec8deae74f34f942a2 SHA512 0114d8802c1863cd68b559c7be971436fd99585e804c84919bcd494d6156967b249e950742a33a4b3f884d5cbfc4da90231310012b5299d5bcae731a0f2d707f
-EBUILD konsole-18.12.2.ebuild 1426 BLAKE2B ba5109a043dbba30cc3897e9ab12981f9f0ec583acb8ba20130a6d802a8ec5718e6847faf761e42c34107debf5252e43db6da262b0a87d4debe396898a30677c SHA512 344a20e9475d1e01fbff0d4e322abe77d9e2ef6fbadde80d417a94dc1d819539bf487bc6533a12ca0da1eed400ec06848604dcc195871e8fa2e05d6f722574a4
+EBUILD konsole-18.12.3.ebuild 1484 BLAKE2B 1f5dc191ae99baaded1da4844ee51f7a7c11bff6559df3682bc325d6a8edbf106fd3783976b5e89773ec3243c7d691e5a59f25e35a1e02d53c1e7be2d2fe69ce SHA512 41cc04e44d980f7fd9643de0248c8bcb49b2756570f6a898618f9319191347496cace6c8c478de04829094e2ccad7171a6ac41a2fdc80b6242ce568607f49db1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/files/konsole-18.12.3-cursor.patch b/kde-apps/konsole/files/konsole-18.12.3-cursor.patch
new file mode 100644
index 000000000000..f9960340b906
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-18.12.3-cursor.patch
@@ -0,0 +1,84 @@
+From eccfb1f62bbf67ebffee11e241bd05757b826ff1 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bauer <wbauer@tmo.at>
+Date: Mon, 4 Mar 2019 09:59:45 -0500
+Subject: Fix ibeam and underline cursor rendering
+
+Summary:
+Since anti-aliasing was enabled in the painter, coordinates need to
+be shifted half a pixel so that they align with the pixel grid,
+otherwise the result gets "blurred" due to the anti-aliasing.
+And as parts of the blurred shape leak outside the cursor rectangle,
+this also leaves artifacts when the cursor moves or blinks as these
+parts are not cleared.
+
+This is basically the same as commit
+e7085310d6d594823d0ed491fa8bdbd99dec4932 for the
+standard block cursor.
+
+BUG: 402589
+
+Test Plan:
+- Switch cursor shape to "I-Beam" or "Underline" in the "Advanced"
+profile settings
+
+The cursors are a single line again now, before they were blurred by
+anti-aliasing.
+
+Screenshots:
+Before:
+{F6656366}
+{F6656370}
+
+After:
+{F6656371}
+{F6656373}
+
+Also, there are no more artifacts when the cursor is moved or
+cursor blinking is enabled.
+
+Reviewers: #konsole, hindenburg
+
+Reviewed By: #konsole, hindenburg
+
+Subscribers: hindenburg, konsole-devel
+
+Tags: #konsole
+
+Differential Revision: https://phabricator.kde.org/D19513
+---
+ src/TerminalDisplay.cpp | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
+index 543b897..397422c 100644
+--- a/src/TerminalDisplay.cpp
++++ b/src/TerminalDisplay.cpp
+@@ -716,16 +716,18 @@ void TerminalDisplay::drawCursor(QPainter& painter,
+             }
+         }
+     } else if (_cursorShape == Enum::UnderlineCursor) {
+-        painter.drawLine(cursorRect.left(),
+-                         cursorRect.bottom(),
+-                         cursorRect.right(),
+-                         cursorRect.bottom());
++        QLineF line(cursorRect.left() + 0.5,
++                    cursorRect.bottom() - 0.5,
++                    cursorRect.right() - 0.5,
++                    cursorRect.bottom() - 0.5);
++        painter.drawLine(line);
+ 
+     } else if (_cursorShape == Enum::IBeamCursor) {
+-        painter.drawLine(cursorRect.left(),
+-                         cursorRect.top(),
+-                         cursorRect.left(),
+-                         cursorRect.bottom());
++        QLineF line(cursorRect.left() + 0.5,
++                    cursorRect.top() + 0.5,
++                    cursorRect.left() + 0.5,
++                    cursorRect.bottom() - 0.5);
++        painter.drawLine(line);
+     }
+ }
+ 
+-- 
+cgit v1.1
diff --git a/kde-apps/konsole/konsole-18.12.2.ebuild b/kde-apps/konsole/konsole-18.12.3.ebuild
index 69ba89156daa..65dd4d2ac6cb 100644
--- a/kde-apps/konsole/konsole-18.12.2.ebuild
+++ b/kde-apps/konsole/konsole-18.12.3.ebuild
@@ -55,3 +55,5 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+PATCHES=( "${FILESDIR}/${P}-cursor.patch" ) # bug 673766