gentoo resync : 31.12.2018

12 files changed, 499 insertions, 6 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 90315d2bbde1..ff59be4f2dd0 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index cb60cd4c2294..93da9283cb9e 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,6 +1,7 @@
 AUX gwenview-18.07.90-activities-optional.patch 5078 BLAKE2B 692a743c319a9498de88af97b113e123ec445322f55513fcae58d4c556b29c23f0b2586e292900fb8e233c5cd2b33a7f76cf759b0c0ad119efb7daa7c290263c SHA512 2afd6fe89d1b455723d15f38866a476f8872e45d0548c36432f4b08d6404d02c4c03f78bfa60ec7dbddad022fef32283155b3ce27a9a8b16c4b753246b301106
+AUX gwenview-18.12.0-exiv2-0.27.patch 6552 BLAKE2B b57836867fe29e0d099d24b1b935ab4899909d94484a3c060e5a1ee97a2cf297c4fe444cc4b6a85d4f9727b68344013ed2292260a7e217b24d85b4debcacea13 SHA512 526fb77137cd504eb72a5bc6ba74a71efab7842f9ada3e4d7f0465284aa5d50cb6619fb54a555b8d959be3d305a302bf8d1b75162b60970523c628b09b04ca6e
 DIST gwenview-18.08.3.tar.xz 6178192 BLAKE2B 0b25bdd64398f7ef1310598daad07374ca56383578fd67a8e36e348e78e1d818335fe4d630cc733e7a1eb13eaafca268426aea5afbb44195106742c50587c74d SHA512 0889b3388311b8c2b5a2ff98eea55dbae69ec6a27b5f27defc884077d937006d184c08a9daf31df0d9fb096b1a53fc70e844d46c4e3577d21e8f6ab83cca06ce
 DIST gwenview-18.12.0.tar.xz 6178072 BLAKE2B 4066165db148987c606e85c47cb6a47f236c07938d3819ca76ce6c083764874360cbba82c6b9cbe9a7d72771269a8b66a7894634a55f3d9a2d6db027c982aa2e SHA512 ef7f706c3c3278ca4f826518824f7457948b5fdac2d49cdb55977d55829cc90852745833fd86b94a5ce2cc7b55286c864b05f9a51d546e29538bf0f32bec2ec4
 EBUILD gwenview-18.08.3.ebuild 2788 BLAKE2B c77ccacf146ac431a6e604c6a69107c54a5af2c50c907dafcdad900527aa5dbfdc4cc1405920d7502feff53309bbfce8cbbd244483a8c7842862839367518759 SHA512 4652f7225a398412bfe6737adf2fc437376640cdaff0d3976ebaaca8de15eacb9c9e99b0f950e0a589bce01ea38fdafbd3ddef3dc09b5a07c0d24688179a4b8c
-EBUILD gwenview-18.12.0.ebuild 2646 BLAKE2B 8608898cf943791816ed3cc3010276258bc3a259a829173b5ec43854c80da12ebb03e4958303588928995df5e607fad28df18fc0056565fed385c850adc56c09 SHA512 651a53414e2c9d6cb35283fe99eb469ab3e30a148a67f984dd82a812e79ab8b7dea5d4f030b8fb60f9d3cca6ace9cfd3297d01b4f3294b612a3b6bf9e7355a30
+EBUILD gwenview-18.12.0.ebuild 2730 BLAKE2B 571bd16dafbdb7b345c0964306b2290bac34c6c0255316c6d76303493808d896bb615d0d96743aa022e4e7b38631d9c856e2ceb02003fe032ff90c75deb8a075 SHA512 078b12f52f70efb981259da4d54de975f8fb59579e8fa4233ebf7198ba5de5cd850dfdeb02ce5bb612d55ad7376a5d8f279d40adff74319cd2d17fd861652e92
 MISC metadata.xml 608 BLAKE2B 19b5fd4798750b2efd9d68a6271cb7c0c1c63e82075f2ac68fdf12bf57c5e695d3d9ee08f49d7cc22e0b15931eed086690b3af478486a858c4c233ee23b34ab0 SHA512 bc0c98d5420300aa4f17b0f544bc9cd44d8755ac716c099a5787769705e72eab9aae5d4b9a653434234dc605362f3c0d3d362121ab8c75978cdbde8f5fc774de
diff --git a/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch b/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch
new file mode 100644
index 000000000000..fa0d62d84b74
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch
@@ -0,0 +1,216 @@
+From 7e4cd5e91d7434448b7227ee8cf3307435cc7d00 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 30 Dec 2018 12:59:05 +0100
+Subject: [PATCH 1/2] Include exiv2.hpp instead of individual headers
+
+Headers are subject to refactoring upstream, using exiv2.hpp per recommendation.
+---
+ lib/cms/cmsprofile.h                  | 2 +-
+ lib/document/document.h               | 2 +-
+ lib/exiv2imageloader.cpp              | 4 ----
+ lib/exiv2imageloader.h                | 2 +-
+ lib/imagemetainfomodel.cpp            | 4 +---
+ lib/jpegcontent.cpp                   | 4 ----
+ lib/timeutils.cpp                     | 4 ----
+ tests/auto/documenttest.cpp           | 2 --
+ tests/auto/imagemetainfomodeltest.cpp | 2 --
+ 9 files changed, 4 insertions(+), 22 deletions(-)
+
+diff --git a/lib/cms/cmsprofile.h b/lib/cms/cmsprofile.h
+index a2a38a87..bc378ff9 100644
+--- a/lib/cms/cmsprofile.h
++++ b/lib/cms/cmsprofile.h
+@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
+ #include <QSharedData>
+ 
+ // Exiv2
+-#include <exiv2/image.hpp>
++#include <exiv2/exiv2.hpp>
+ 
+ class QByteArray;
+ class QString;
+diff --git a/lib/document/document.h b/lib/document/document.h
+index c0bb454b..8e32c044 100644
+--- a/lib/document/document.h
++++ b/lib/document/document.h
+@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ #include <lib/gwenviewlib_export.h>
+ 
+ #include <string.h>
+-#include <exiv2/image.hpp>
++#include <exiv2/exiv2.hpp>
+ 
+ // Qt
+ #include <QObject>
+diff --git a/lib/exiv2imageloader.cpp b/lib/exiv2imageloader.cpp
+index f2830f81..f12b7383 100644
+--- a/lib/exiv2imageloader.cpp
++++ b/lib/exiv2imageloader.cpp
+@@ -28,10 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ // KDE
+ 
+-// Exiv2
+-#include <exiv2/error.hpp>
+-#include <exiv2/types.hpp>
+-
+ // Local
+ 
+ namespace Gwenview
+diff --git a/lib/exiv2imageloader.h b/lib/exiv2imageloader.h
+index 57ef24d2..866e7fac 100644
+--- a/lib/exiv2imageloader.h
++++ b/lib/exiv2imageloader.h
+@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ // Exiv2
+ #include <string.h>
+-#include <exiv2/image.hpp>
++#include <exiv2/exiv2.hpp>
+ 
+ // Local
+ 
+diff --git a/lib/imagemetainfomodel.cpp b/lib/imagemetainfomodel.cpp
+index d7b89ab2..58f1c13d 100644
+--- a/lib/imagemetainfomodel.cpp
++++ b/lib/imagemetainfomodel.cpp
+@@ -33,9 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #include <KFormat>
+ 
+ // Exiv2
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/iptc.hpp>
++#include <exiv2/exiv2.hpp>
+ 
+ // Local
+ #ifdef HAVE_FITS
+diff --git a/lib/jpegcontent.cpp b/lib/jpegcontent.cpp
+index bb810dd4..a628e8a8 100644
+--- a/lib/jpegcontent.cpp
++++ b/lib/jpegcontent.cpp
+@@ -41,10 +41,6 @@ extern "C" {
+ // KDE
+ #include <KLocalizedString>
+ 
+-// Exiv2
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-
+ // Local
+ #include "jpegerrormanager.h"
+ #include "iodevicejpegsourcemanager.h"
+diff --git a/lib/timeutils.cpp b/lib/timeutils.cpp
+index 9e8836a9..19befff5 100644
+--- a/lib/timeutils.cpp
++++ b/lib/timeutils.cpp
+@@ -29,10 +29,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
+ // KDE
+ #include <KFileItem>
+ 
+-// Exiv2
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-
+ // Local
+ #include <lib/exiv2imageloader.h>
+ #include <lib/urlutils.h>
+diff --git a/tests/auto/documenttest.cpp b/tests/auto/documenttest.cpp
+index 9373641f..496346f0 100644
+--- a/tests/auto/documenttest.cpp
++++ b/tests/auto/documenttest.cpp
+@@ -39,8 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ #include "../lib/transformimageoperation.h"
+ #include "testutils.h"
+ 
+-#include <exiv2/exif.hpp>
+-
+ #include "documenttest.h"
+ 
+ QTEST_MAIN(DocumentTest)
+diff --git a/tests/auto/imagemetainfomodeltest.cpp b/tests/auto/imagemetainfomodeltest.cpp
+index e3ec8d30..c4467a73 100644
+--- a/tests/auto/imagemetainfomodeltest.cpp
++++ b/tests/auto/imagemetainfomodeltest.cpp
+@@ -28,8 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ #include "../lib/imagemetainfomodel.h"
+ #include "testutils.h"
+ 
+-#include <exiv2/exif.hpp>
+-
+ #include "imagemetainfomodeltest.h"
+ 
+ QTEST_MAIN(ImageMetaInfoModelTest)
+-- 
+2.20.1
+
+
+From 7d6c5d95cf4e4d7c857f5d659a58f82bdc46259c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 30 Dec 2018 11:31:20 +0100
+Subject: [PATCH 2/2] Fix build with exiv2-0.27
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Summary:
+Include exiv2.hpp instead of individual headers
+
+Headers are subject to refactoring upstream, using exiv2.hpp per recommendation.
+
+Enable exceptions globally - otherwise, lots of the following error:
+
+In file included from /usr/include/exiv2/types.hpp:34,
+                 from /usr/include/exiv2/image.hpp:28,
+                 from gwenview-18.12.0/lib/cms/cmsprofile.h:33,
+                 from gwenview-18.12.0/lib/cms/cmsprofile.cpp:22:
+/usr/include/exiv2/slice.hpp: In constructor ‘Exiv2::Internal::SliceBase::SliceBase(size_t, size_t)’:
+/usr/include/exiv2/slice.hpp:99:77: error: exception handling disabled, use -fexceptions to enable
+                     throw std::out_of_range("Begin must be smaller than end");
+                                                                             ^
+
+Test Plan: Built fine with exiv2-0.27
+
+Reviewers: #gwenview, cgiboudeaux
+
+Tags: #gwenview
+
+Differential Revision: https://phabricator.kde.org/D17869
+---
+ CMakeLists.txt     | 2 ++
+ lib/CMakeLists.txt | 6 ------
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f44f9afc..b85ba4bc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -126,6 +126,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
+ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+ 
++kde_enable_exceptions()
++
+ ## dirs to build
+ add_subdirectory(lib)
+ add_subdirectory(app)
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 169df3c6..f7e9f71f 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -220,12 +220,6 @@ if (GWENVIEW_SEMANTICINFO_BACKEND_BALOO)
+         )
+ endif()
+ 
+-kde_source_files_enable_exceptions(
+-    exiv2imageloader.cpp
+-    imagemetainfomodel.cpp
+-    timeutils.cpp
+-    )
+-
+ ki18n_wrap_ui(gwenviewlib_SRCS
+     crop/cropwidget.ui
+     documentview/messageview.ui
+-- 
+2.20.1
+
diff --git a/kde-apps/gwenview/gwenview-18.12.0.ebuild b/kde-apps/gwenview/gwenview-18.12.0.ebuild
index a580d5a58ccd..22f5b406075b 100644
--- a/kde-apps/gwenview/gwenview-18.12.0.ebuild
+++ b/kde-apps/gwenview/gwenview-18.12.0.ebuild
@@ -73,6 +73,7 @@ RDEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	kde5_src_prepare
+	has_version ">=media-gfx/exiv2-0.27" && eapply "${FILESDIR}/${P}-exiv2-0.27.patch"
 	if ! use mpris; then
 		# FIXME: upstream a better solution
 		sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
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" <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/konsole-18.12.0-r1.ebuild b/kde-apps/konsole/konsole-18.12.0-r2.ebuild
index 63fec0b9fa7e..abc36ad9309f 100644
--- a/kde-apps/konsole/konsole-18.12.0-r1.ebuild
+++ b/kde-apps/konsole/konsole-18.12.0-r2.ebuild
@@ -48,7 +48,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-fix-drawing-box-chars.patch" ) # fixed in 18.12.1
+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=(
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index bd33b4057a77..d083391f48ef 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-text-ui-18.08.3.tar.xz 469856 BLAKE2B 27bdcdec15cdaeb692194f1e085dae0e8d2d3a6f913b5631ffb7195b2a62ca8b37dd02971515ad31024704eedf8f5b1a4e3225f211461021ff550651a27e62a7 SHA512 a3d46895d501156ebb6727e3b5bd6b4c0b6f202a77d5cdf557c6a15658d514ea692cc3f1cdeb59e18d45cdedc1387225816655e0c6e129b78ed8e7a6c1cd5444
 DIST ktp-text-ui-18.12.0.tar.xz 465828 BLAKE2B 8f80c009fe405bd7398b349d78e53f9a57e097a8b7e6fb9305af6880b4a016a3383cf58858b99166ca0fad9ebd2829ec4133fe068506a603ba07d084464a997e SHA512 db11b82075c5a3ad6416445e427268a590fe51f5d94e010a0b72413cefe711a1a951fe2c4677cfd912a5d038bce2e32053f524c08bdbf3f44406c6678ddb10a5
 EBUILD ktp-text-ui-18.08.3.ebuild 1484 BLAKE2B 28617a89ec2a9d08c6a45315708a28b87383bd0fdcdf7594f561009de8c9ef785a00f03287d9af6c3e763701091477b99cf719b9aaa229822b2143cb57f1f79b SHA512 9da1607b603317a8e3594167e4d7609a5833f5c1bbbc83911a42e8eb3e2ce1d4977073c34274a87d80ecc50b7f907bc61e7a1f853a13c8da134733ddfce6c89a
-EBUILD ktp-text-ui-18.12.0.ebuild 1486 BLAKE2B 2224766b83116b4ad06c2a37fce4237739d7eeaf222a31baa0149274e7da3fc75c39f36da3600fab5e694e580b3c6ba2d7e4598ddc7baecc96298aad8d5e5e83 SHA512 4df1063a7b4cf87546f85796c015c115858bf6e13a62912793b79589669d4f23b5d7e16e7fd391043e5078adc1eddab36bdb99a292ddd055698bafca3a50615e
+EBUILD ktp-text-ui-18.12.0-r1.ebuild 1453 BLAKE2B 469829605d10cc751edd185b25098d835f344044562c6166db235cb00eb593011bd6ac8f579ab73fc92ddea17320ff174f37d5e073648d0f18e5df9c7130a753 SHA512 6cf066e86d059b0460673738294d31c5730bc3235f70a83c3917fee37c12d84b3fd7b4fd305ba504ecd79fb0836399b91a9e2052cbc2a59dff68c90edf9de302
 MISC metadata.xml 354 BLAKE2B cb80df865c3fe1cbf07ecafbdb6c555f913951adfaa265c8e67600b8a53621944e66ef3009bba05c1114c40581d596d86491b2ae97ba522bd2cc98457bfe6722 SHA512 cb1c4a01ee60e82620746b37e989c9a79497c10d816b746420c8b3b248b5a1a84ff82464516ae38d4dd9d2cf3e176af0793d67c8567287394a6828a781a6b301
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-18.12.0.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-18.12.0-r1.ebuild
index 81ec19d08b27..0da10c8efe3b 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-18.12.0.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-18.12.0-r1.ebuild
@@ -19,7 +19,6 @@ DEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdewebkit)
 	$(add_frameworks_dep kemoticons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index a420cab0c58b..b0e329459417 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,5 +1,6 @@
+AUX libkexiv2-18.12.0-exiv2-0.27.patch 7827 BLAKE2B b16eef536dd2517a62de9561bf810cc2b2c404baa6b6c17750bba4f1880b1615cfaa0301983a009654bbcc8cc7b6f19704992e5a7dcb4151f266e6b83b4d38c4 SHA512 aa23336c5667c9bb6610e5c88f713c14f5aae187526faf1e65f92e5258faf50d6f7926b1b0b6deeed9874cc024061a0adae0ff6f4896ede1495678cadd9b368f
 DIST libkexiv2-18.08.3.tar.xz 64504 BLAKE2B b29645239bc1523bb363e04ab0449563f4c9550887c359b9a55414682e850289f80e85088c043a756d34dc83bb3b0c6cc9975cd4e5a513b80fbf4d6f93870d6e SHA512 eef3fbb5942823d23d276f56a1e9187b5142331485a4fb7d7e419f4af5504659c5a755f64e4cdf2a9bef6ae499126672ed5627c0fca7ef56fac7dc6a12794143
 DIST libkexiv2-18.12.0.tar.xz 64528 BLAKE2B 697c88fdf36c04dc874ad3625eb7bf699604630d35cf5f7e81ee40f269a54a2e03e837479b0e66c50f79aa9a646128f0b4588e2a7d5ffba091bd3c2f30a410a0 SHA512 8fc7a46b5814e6ac2013630e41dcb209074ea7765dd65343ed8e0d25216987f5262a77dbf1736eec31dfbfe05be730efab3474ac3689ca20ac94f363976a9d5a
 EBUILD libkexiv2-18.08.3.ebuild 353 BLAKE2B 2e6b4be08764403b6fe046b37908a1684e3a95f4f23a9c5e4fbc3f1c2e870362f43b7528d8e433940c6b40879eab4820616f28a1956dd7ef6d05dfbd6237b7ea SHA512 33ba8badebe5fa55e2dc648ddb2a304274ebf6a5ab71de0ea23712757ee7e8e9133027d77b283cc46e45f07a1779eb325e7dcd33c03979f370c6ec10ee769fff
-EBUILD libkexiv2-18.12.0.ebuild 355 BLAKE2B 3111ec03b5f3cf1752e53c68f44b3d035be494acf25711ea1b5a3178fa064e217944ef9d0fbcb88f308c3dd9e861dfd1ade03391e0c3faebe9de652c1f59fb3b SHA512 7242a7128c1b56d3ff203e4cabbf0c64ef9ce93aa105a9e26aa447926b506cb23637e3e9dd12c71330fa257ce64bf1b85a8c5635b51bf5ddca43e65ec88a20c5
+EBUILD libkexiv2-18.12.0-r1.ebuild 432 BLAKE2B bdd98454dc04cec92e69a77afc2cc020ba614d1ec5f45beb6dcb5f3659c3a7972d67653cd30e28fa5dc95642dea972975ca3319d3a1acbb7ee0f9fc6bb262d97 SHA512 4f875fe797aab12afcfc7ede5e0670138d19b10a180d9be5c67178ffd1bfc6c4fd5e853cdb93a5cddc3c9d738420129029d9a8ab3bacd99b05798bc20915f6a7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/files/libkexiv2-18.12.0-exiv2-0.27.patch b/kde-apps/libkexiv2/files/libkexiv2-18.12.0-exiv2-0.27.patch
new file mode 100644
index 000000000000..176fcb3ba123
--- /dev/null
+++ b/kde-apps/libkexiv2/files/libkexiv2-18.12.0-exiv2-0.27.patch
@@ -0,0 +1,210 @@
+From 3b697b880877c29cd865f101bddca6ce21bf8953 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Thu, 27 Dec 2018 01:05:17 +0100
+Subject: [PATCH] Fix building against exiv2-0.27
+
+Summary:
+Copied FindLibExiv2.cmake from ECM 5.53.0 until we raise min version.
+
+Test Plan: Tested build with exiv2-0.26 and 0.27
+
+Reviewers: #kde_applications, cgilles
+
+Subscribers: heikobecker
+
+Differential Revision: https://phabricator.kde.org/D17799
+---
+ CMakeLists.txt                        |  30 ++-----
+ cmake/templates/libkexiv2.pc.cmake.in |   2 +-
+ src/CMakeLists.txt                    |   3 +-
+ src/kexiv2.cpp                        |   2 +-
+ src/kexiv2_p.cpp                      |  17 +---
+ src/kexiv2_p.h                        |   1 +
+ src/kexiv2exif.cpp                    |   4 +
+ 7 files changed, 136 insertions(+), 118 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d13ef27..e9cd06e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,7 @@ set(EXIV2_MIN_VERSION   "0.24")
+ 
+ cmake_minimum_required(VERSION ${CMAKE_MIN_VERSION})
+ 
+-project(libkexiv2)
++project(libkexiv2 VERSION "5.0.0")
+ 
+ message(STATUS "----------------------------------------------------------------------------------")
+ message(STATUS "Starting CMake configuration for: ${PROJECT_NAME}")
+@@ -47,18 +47,12 @@ message(STATUS "Starting CMake configuration for: ${PROJECT_NAME}")
+ # 2.4.0 => 11.3.0                              - Add new method to access on text edit widget from AltLangStrEdit
+ # 5.0.0 => 15.0.0    (Released with KDE 5.x)
+ 
+-# Library API version
+-set(KEXIV2_LIB_MAJOR_VERSION "5")
+-set(KEXIV2_LIB_MINOR_VERSION "0")
+-set(KEXIV2_LIB_PATCH_VERSION "0")
+-
+ # Library ABI version used by linker.
+ # For details : http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
+ set(KEXIV2_LIB_SO_CUR_VERSION "15")
+ set(KEXIV2_LIB_SO_REV_VERSION "0")
+ set(KEXIV2_LIB_SO_AGE_VERSION "0")
+ 
+-set(LIBKEXIV2_LIB_VERSION "${KEXIV2_LIB_MAJOR_VERSION}.${KEXIV2_LIB_MINOR_VERSION}.${KEXIV2_LIB_PATCH_VERSION}")
+ set(LIBKEXIV2_SO_VERSION  "${KEXIV2_LIB_SO_CUR_VERSION}.${KEXIV2_LIB_SO_REV_VERSION}.${KEXIV2_LIB_SO_AGE_VERSION}")
+ 
+ ############## ECM setup ######################
+@@ -77,6 +71,13 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(GenerateExportHeader)
+ include(FeatureSummary)
+ 
++ecm_setup_version(${libkexiv2_VERSION}
++                  VARIABLE_PREFIX      KEXIV2
++                  VERSION_HEADER       "src/libkexiv2_version.h"
++                  PACKAGE_VERSION_FILE "KF5KExiv2ConfigVersion.cmake"
++                  SOVERSION            ${LIBKEXIV2_SO_VERSION}
++)
++
+ ############## Find Packages ###################
+ 
+ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS
+@@ -84,20 +85,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS
+              Gui
+ )
+ 
+-find_package(Exiv2 ${EXIV2_MIN_VERSION} REQUIRED)
+-set_package_properties("Exiv2"     PROPERTIES
+-                       DESCRIPTION "Required to build libkexiv2"
+-                       URL         "http://www.exiv2.org"
+-                       TYPE        RECOMMENDED
+-                       PURPOSE     "Library to manage image metadata"
+-)
+-
+-ecm_setup_version(${LIBKEXIV2_LIB_VERSION}
+-                  VARIABLE_PREFIX      KEXIV2
+-                  VERSION_HEADER       "src/libkexiv2_version.h"
+-                  PACKAGE_VERSION_FILE "KF5KExiv2ConfigVersion.cmake"
+-                  SOVERSION            ${LIBKEXIV2_SO_VERSION}
+-)
++find_package(LibExiv2 ${EXIV2_MIN_VERSION} REQUIRED)
+ 
+ ############## Targets #########################
+ 
+diff --git a/cmake/templates/libkexiv2.pc.cmake.in b/cmake/templates/libkexiv2.pc.cmake.in
+index 1df60df..e80e0ec 100644
+--- a/cmake/templates/libkexiv2.pc.cmake.in
++++ b/cmake/templates/libkexiv2.pc.cmake.in
+@@ -7,6 +7,6 @@ Name: ${PROJECT_NAME}
+ Description: A C++ library to manipulate EXIF/IPTC/XMP metadata using Exiv2 library.
+ URL: https://cgit.kde.org/libkexiv2.git/
+ Requires:
+-Version: ${KEXIV2_LIB_VERSION_STRING}
++Version: ${libkexiv2_VERSION}
+ Libs: -L${LIB_INSTALL_DIR} -lkexiv2
+ Cflags: -I${INCLUDE_INSTALL_DIR}
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 2b2df03..8ac18f5 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -6,7 +6,6 @@
+ 
+ kde_enable_exceptions()
+ 
+-include_directories(${EXIV2_INCLUDE_DIR})
+ include_directories(${CMAKE_CURRENT_BINARY_DIR}/..)
+ 
+ add_definitions(${EXIV2_DEFINITIONS})
+@@ -55,7 +54,7 @@ target_include_directories(KF5KExiv2 INTERFACE
+ 
+ target_link_libraries(KF5KExiv2
+                       PRIVATE
+-                      ${EXIV2_LIBRARIES}
++                      LibExiv2::LibExiv2
+                       PUBLIC
+                       Qt5::Core
+                       Qt5::Gui
+diff --git a/src/kexiv2.cpp b/src/kexiv2.cpp
+index 04c4aa4..b7bbc1a 100644
+--- a/src/kexiv2.cpp
++++ b/src/kexiv2.cpp
+@@ -153,7 +153,7 @@ QString KExiv2::Exiv2Version()
+     // Since 0.14.0 release, we can extract run-time version of Exiv2.
+     // else we return make version.
+ 
+-    return QString::fromLatin1(Exiv2::version());
++    return QString::fromStdString(Exiv2::versionString());
+ }
+ 
+ QString KExiv2::version()
+diff --git a/src/kexiv2_p.cpp b/src/kexiv2_p.cpp
+index cb6b134..2a287ab 100644
+--- a/src/kexiv2_p.cpp
++++ b/src/kexiv2_p.cpp
+@@ -124,19 +124,15 @@ bool KExiv2::Private::saveToFile(const QFileInfo& finfo) const
+ 
+     QStringList rawTiffBasedSupported, rawTiffBasedNotSupported;
+ 
+-    // Raw files supported by Exiv2 0.21
++    // Raw files supported by Exiv2 0.23
+     rawTiffBasedSupported << QString::fromLatin1("dng")
+                           << QString::fromLatin1("nef")
+                           << QString::fromLatin1("pef")
+                           << QString::fromLatin1("orf")
+-                          << QString::fromLatin1("srw");
++                          << QString::fromLatin1("srw")
++                          << QString::fromLatin1("cr2");
+ 
+-    if (Exiv2::testVersion(0,23,0))
+-    {
+-        rawTiffBasedSupported << QString::fromLatin1("cr2");
+-    }
+-
+-    // Raw files not supported by Exiv2 0.21
++    // Raw files not supported by Exiv2 0.23
+     rawTiffBasedNotSupported << QString::fromLatin1("3fr")
+                              << QString::fromLatin1("arw")
+                              << QString::fromLatin1("dcr")
+@@ -149,11 +145,6 @@ bool KExiv2::Private::saveToFile(const QFileInfo& finfo) const
+                              << QString::fromLatin1("srf")
+                              << QString::fromLatin1("rw2");
+ 
+-    if (!Exiv2::testVersion(0,23,0))
+-    {
+-        rawTiffBasedNotSupported << QString::fromLatin1("cr2");
+-    }
+-
+     QString ext = finfo.suffix().toLower();
+ 
+     if (!writeRawFiles && (rawTiffBasedSupported.contains(ext) || rawTiffBasedNotSupported.contains(ext)) )
+diff --git a/src/kexiv2_p.h b/src/kexiv2_p.h
+index ddf8f6d..c73fbbf 100644
+--- a/src/kexiv2_p.h
++++ b/src/kexiv2_p.h
+@@ -71,6 +71,7 @@
+ #include <exiv2/properties.hpp>
+ #include <exiv2/types.hpp>
+ #include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <exiv2/xmpsidecar.hpp>
+ 
+ // Check if Exiv2 support XMP
+diff --git a/src/kexiv2exif.cpp b/src/kexiv2exif.cpp
+index 11c8948..52cd1a4 100644
+--- a/src/kexiv2exif.cpp
++++ b/src/kexiv2exif.cpp
+@@ -987,7 +987,11 @@ bool KExiv2::setTiffThumbnail(const QImage& thumbImage, bool setProgramName) con
+ 
+         if (pos == d->exifMetadata().end() || pos->count() != 1 || pos->toLong() != 0)
+         {
++#if EXIV2_TEST_VERSION(0,27,0)
++            throw Exiv2::Error(Exiv2::kerErrorMessage, "Exif.Image.NewSubfileType missing or not set as main image");
++#else
+             throw Exiv2::Error(1, "Exif.Image.NewSubfileType missing or not set as main image");
++#endif
+         }
+ 
+         // Remove sub-IFD tags
+-- 
+2.20.1
+
diff --git a/kde-apps/libkexiv2/libkexiv2-18.12.0.ebuild b/kde-apps/libkexiv2/libkexiv2-18.12.0-r1.ebuild
index d1c1eda8fde7..286798e5a355 100644
--- a/kde-apps/libkexiv2/libkexiv2-18.12.0.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-18.12.0-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+FRAMEWORKS_MINIMAL="5.53.0"
 KDE_BLOCK_SLOT4="false"
 inherit kde5
 
@@ -16,3 +17,5 @@ DEPEND="
 	>=media-gfx/exiv2-0.25:=[xmp=]
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )