gentoo resync : 12.01.2019

4 files changed, 3 insertions, 256 deletions

diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 0dfd017ee8ee..09e2bb957e6d 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,8 +1,6 @@
 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
+DIST konsole-18.12.1.tar.xz 1093548 BLAKE2B c3ab69b568d7dfa582b220e8b967a57b5f39949afd45c4be03c647d784f673d187ca41220caad2138dfc1a61ac64ba65ccfafb3880b34f001d2e69bae2cbb4cd SHA512 5eae431f624bab778cb7d45de80a7485df92e4d392744b0bcdea5c1fc54e9a557051986bd868f2b2115a0ccae3f8a871531d7095dcbc9e21173395200bf3d9c3
 EBUILD konsole-18.08.3-r1.ebuild 1463 BLAKE2B d8b66938939c560a9a8152e1a3cac2187156e725f80ee1ca1bacc8bdc5e8a2f13de4b287aa049180423feda04a9854fda2835ba23c8e21ec8deae74f34f942a2 SHA512 0114d8802c1863cd68b559c7be971436fd99585e804c84919bcd494d6156967b249e950742a33a4b3f884d5cbfc4da90231310012b5299d5bcae731a0f2d707f
-EBUILD konsole-18.12.0-r2.ebuild 1555 BLAKE2B 5709edac373af0c51f2d5e7e69523e812dd61d0eb7d851cde6a205a9ed6691dd8bd4abe772aaad06c160ea4d2406a3217f738b2b4deb7cbff443ce99c265f09c SHA512 e09cfcf041dd9e3f993bfcd60dce1d15cf06dab5a7ed2cddf75ef8b1423761d83b96b42f7b35e3f2bcdc17c43af3f7f9d5f1ba29e1b42ba5cd02fe50027b7d8e
+EBUILD konsole-18.12.1.ebuild 1419 BLAKE2B ac5911697cb27bb51dc674ef623d2ab4a3db72471bd0220e97366615f891cdd6a240e5b5d3bee5ef213cb04366260bec764e23ba50c04772da993475cb9b4a29 SHA512 98d90ea117098e0fda1b52574091c3a9b1df8e3a849f0c98758bdbd3ab60beda5258c8c04a17e8184d0f23f2ca1d817512b4cde542b5d1a0f65b4086f20853d5
 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
deleted file mode 100644
index 36aabaaccc54..000000000000
--- a/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b48ecb5712037027e6385515c9eced7fabfc3dc3 Mon Sep 17 00:00:00 2001
-From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
-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/files/konsole-18.12.0-fix-drawing-box-chars.patch b/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch
deleted file mode 100644
index 1847543737af..000000000000
--- a/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-From 807ac77061604c2ac7cf84b0a0b29dd949a6c634 Mon Sep 17 00:00:00 2001
-From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
-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.12.0-r2.ebuild b/kde-apps/konsole/konsole-18.12.1.ebuild
index abc36ad9309f..e7071be9cf1d 100644
--- a/kde-apps/konsole/konsole-18.12.0-r2.ebuild
+++ b/kde-apps/konsole/konsole-18.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,11 +48,6 @@ DEPEND="
 "
 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)