9 files changed, 157 insertions, 58 deletions
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 93d036fae378..ff25610cec0c 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index eea8c411aba0..5da2cec0747f 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,5 +1,6 @@
+AUX kio-5.48.0-memleak.patch 1898 BLAKE2B 0212d3ebdb21cb120774f734cace156662aaa6ae0268ad83e83b5b2e507561084fef9c666ede24469d6c7567bf72834efb694fb8ffdd9f1b90ba4eb68cbe5bbb SHA512 d6ca84726ef0abac9652a66a14d5b76cd30cceed122330b0bd21e6ee0b6614b9cbf659082b223f6b62200130b8125f751f4846584221a4f8a3d789fba4e0f1d7
 DIST kio-5.46.0.tar.xz 3148600 BLAKE2B 0590d6315fc6fa3a85d016ddd2960925593dde4532de31b6f80b734e1ede2eb0de9292a6097e1d6275cab2623c6816575d1fce3d6893ae433f547f379da2c30c SHA512 64ea3c5cd27990a03f693eb6add5a9d148f16ef5c4b4e4e7118fe841258f2b8d4062697a9922cfabb3ac84d015e1fcc4e342bcce91fc80e55027cc7f8d8c78d9
 DIST kio-5.48.0.tar.xz 3164728 BLAKE2B 6e4a2e2ef629bff4fe6f51736d432fdc1a57200fa3e10cca439c4d14acd92ee8db8dfba2570271217b8ac220258dd735bc0205b4155355ff2fc5f23cddb4b90c SHA512 4a25f5664d3ac993a115dc13597ab758fc24122d02441c20d98d42dd67d5dd9a57e7e5013716de1b3e9d2c523bf45b843fd726a4ce20a3eccd3a25e1e4dba5ad
 EBUILD kio-5.46.0.ebuild 1926 BLAKE2B 3a206eb2b52652fdbc9601c559a2350b980d8b2fb88062dd2928dff8de7736cd679c4a7a145a05c75ccc3b92c75370918d12422a6b8ff0a7c0747678dece9f35 SHA512 33cb2460205e350c1058732064c53eaf0eed72aaf4aa972b0416c04b2360bce664ab03e4cea60c6ec37c999f90244926943d5d3415e3ea4c97fdfcd94fec5e79
-EBUILD kio-5.48.0.ebuild 1928 BLAKE2B d6dac00f93369929a7d2ea1bb8ecec7ae564918ef4ba8bfcf7cf5aa5a2477f2d518f0adbff76bba0c592d4b7e008338408af8652836f81e0c1292795cdf4f543 SHA512 397e71231fda9f9b855635d962b4cd0277cc7b0b88648455c9960cf15474175725bc47e72aea3cd7cd60800e74d44d1d8bc7745ae52a355f31d19b6f67ad5f83
+EBUILD kio-5.48.0-r1.ebuild 1974 BLAKE2B a7db610e91103148666e6f6c4c06c357978077edcc1b1f99490f4323f228ab75018c23cedbc2169251613d06d04fbbd8b18d2b797052ab390a060a411fe57c06 SHA512 f95b76a9d8c9bad924fbacdf778c818c517523dd5dc2b85acd8d2bcde8fc1cdd139b5d2c08837dc895e0130d1d2e08ed9e813901447b1dbf5527561aac862213
 MISC metadata.xml 389 BLAKE2B e0f1cc136204ab865eef4b3051c40b136fb2659f402148b8f7e48b80bd9c7156f0811a7fe80bda4a16ccf671e69d076afc6179dae6d34db695672534a0b9de5f SHA512 ae0874c02b207fad481d7f26a01186787d39e015dca650c4515b419f5d703ead48dd3250e3d0dc5d23660be9afe33e226d393c4d88246eba7e313763e6546820
diff --git a/kde-frameworks/kio/files/kio-5.48.0-memleak.patch b/kde-frameworks/kio/files/kio-5.48.0-memleak.patch
new file mode 100644
index 000000000000..2245c976b8ab
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.48.0-memleak.patch
@@ -0,0 +1,65 @@
+From 021daba60fafdf304b1079a705de900c431bb579 Mon Sep 17 00:00:00 2001
+From: Jaime Torres <jtamate@gmail.com>
+Date: Sat, 21 Jul 2018 13:43:35 +0200
+Subject: avoid memory leak in slave jobs
+
+Summary:
+Making ~SlaveInterface virtual, the connection created in Slave constructor is now deleted. (thanks @dfaure).
+Changed to new connect syntax.
+
+BUG: 396651
+
+Test Plan:
+The leaks of the bug report are gone.
+
+Reviewers: dfaure, #frameworks, ngraham
+
+Reviewed By: dfaure
+
+Subscribers: anthonyfieroni, apol, kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D14253
+---
+ src/core/slave.cpp          | 4 ++--
+ src/core/slaveinterface_p.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/slave.cpp b/src/core/slave.cpp
+index 9402b44..7823d73 100644
+--- a/src/core/slave.cpp
++++ b/src/core/slave.cpp
+@@ -171,7 +171,7 @@ void Slave::accept()
+     d->slaveconnserver->deleteLater();
+     d->slaveconnserver = nullptr;
+ 
+-    connect(d->connection, SIGNAL(readyRead()), SLOT(gotInput()));
++    connect(d->connection, &Connection::readyRead, this, &Slave::gotInput);
+ }
+ 
+ void Slave::timeout()
+@@ -218,7 +218,7 @@ Slave::Slave(const QString &protocol, QObject *parent)
+     Q_D(Slave);
+     d->slaveconnserver->setParent(this);
+     d->connection = new Connection(this);
+-    connect(d->slaveconnserver, SIGNAL(newConnection()), SLOT(accept()));
++    connect(d->slaveconnserver, &ConnectionServer::newConnection, this, &Slave::accept);
+ }
+ 
+ Slave::~Slave()
+diff --git a/src/core/slaveinterface_p.h b/src/core/slaveinterface_p.h
+index 4ed1f36..a4cb5d3 100644
+--- a/src/core/slaveinterface_p.h
++++ b/src/core/slaveinterface_p.h
+@@ -42,7 +42,7 @@ public:
+           nums(0), slave_calcs_speed(false)
+     {
+     }
+-    ~SlaveInterfacePrivate()
++    virtual ~SlaveInterfacePrivate()
+     {
+         delete connection;
+     }
+-- 
+cgit v0.11.2
diff --git a/kde-frameworks/kio/kio-5.48.0.ebuild b/kde-frameworks/kio/kio-5.48.0-r1.ebuild
index 1ec1b73cee23..43bb9151a5ae 100644
--- a/kde-frameworks/kio/kio-5.48.0.ebuild
+++ b/kde-frameworks/kio/kio-5.48.0-r1.ebuild
@@ -63,6 +63,8 @@ PDEPEND="
 	$(add_frameworks_dep kded)
 "
 
+PATCHES=( "${FILESDIR}/${P}-memleak.patch" )
+
 # tests hang
 RESTRICT+=" test"
 
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 818a070ba4b4..998e49d35818 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -2,6 +2,5 @@ AUX ktexteditor-5.46.0-CVE-2018-10361.patch 6579 BLAKE2B 9e992f2fc416cf51b30476d
 DIST ktexteditor-5.46.0.tar.xz 2296888 BLAKE2B 45572ff487505c38f6dfa23b96bd84ba83292ae1077bf3615fc2d30aaf6aa0347605a7c2ae4df68cc92552c1ecd8060ce1ba44f11bc78cfe736149476d6af5ab SHA512 b0197a82e9489c4093594c68a6c21dc9e204ec78cd17e5a0117d84e501710d90ad06214ed217332279f3b67ae84119d09d6eb19e33b37b7bde2ebb8a07b6a543
 DIST ktexteditor-5.48.0.tar.xz 2303100 BLAKE2B ec33b426719d7bde8d3e9aa7f807acdbc42845ae20b6771a1582483790df26142424e8f9ee94fb72e2ecf959cf6a52340d0e980e82822f9cc57004b1585345fa SHA512 1db1f2967d9fa806f29538dd3289780ecfb3ed1ff12e8ecb1ad012d7d7e18acb69952b018e22246c2a75297a351fd9258fd199fe090c3e00fda4b2fd2bbe18cd
 EBUILD ktexteditor-5.46.0-r1.ebuild 1478 BLAKE2B 1db4a6c3fbdd3149f0494d2d97ff7b6638393e1559df27f4206c10f04ec8dbd41c07d8c540c0cff133c8e1ff9ac7084f3b7cdf95169b8f67d6ddd7825d11b18b SHA512 86a33f3ffb9fbd7f077bed69fd3e1e800a332ac6e239c7b6994d5cb2656b7100db45fa19fb9f9bd6db46a827190c426a853b92dcf4b4b93b383ae3b71651e037
-EBUILD ktexteditor-5.46.0.ebuild 1426 BLAKE2B 1601927e98459d6f8e76df80862c3a2e52ef5d79531ace654619bc0af4571e8913c5d87debe3147ba94e72d1f65a6c013d716c09bcc7f236eb84b2838cbe4c0b SHA512 05d481454c10f7a8159c8ad9f194996b1430f147129716a73d614cb0823dc8e054e549e6653607bb9e285ce159623215d2028f8bd45f0793927588f0b8f4e234
 EBUILD ktexteditor-5.48.0.ebuild 1427 BLAKE2B 06ae9c7111371de93791cac534e9959d6b32ea22affe26193148185b2564332cde237eb7c0c698894c69f52c62a9e10c4ab5508dad736ce9e953a964fda28be1 SHA512 1fc22a7562f17aed007dce8a6d1263944a432e680da55a93355092f413483ae8ab37244b8d189d7d70ace3a9bf16108195e39397eca6d5f6f4d65e39a1cc4100
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.46.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.46.0.ebuild
deleted file mode 100644
index f5370b63dbe9..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.46.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing a full text editor component"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="editorconfig git"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	editorconfig? ( app-text/editorconfig-core-c )
-	git? ( dev-libs/libgit2:= )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtxmlpatterns)
-	test? ( $(add_frameworks_dep kservice) )
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package editorconfig EditorConfig)
-		$(cmake-utils_use_find_package git LibGit2)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index aadf0e101a72..0afc352aac23 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,7 @@
+AUX kxmlgui-5.48.0-kmainwindow.patch 1179 BLAKE2B fe0e9ef0c93f8ee5be95c0d25915585e9564f231e2394dc6c695ebfb89b2b0330ec65930dd8ca3d643e92742b2c3493e0b1f7cbc470d68cb81c738f4b9f54367 SHA512 f0b1b5e74f88f7dd36cd30bb049adcbe6da24edb8f41331e891ef9ce6772a49f842beb0fd53123d3358f3864911781a5f418c80bca1b1b22e5aae093b5fc6353
 DIST kxmlgui-5.46.0.tar.xz 884584 BLAKE2B d3beefcdf8ec6bd3e31d6a4a0b505725d7fbe9964f0d6eeefdbe6403b65ac7fd6e040da619fc4d6d87152ef1b6278a9dde34b7baae81a0835f66ba3a8d7e68ee SHA512 2b1595a83957fa2a9c974ba991fb17a83032e52c06bbb76c7aa0331af0d27efb1509fbbeba66e6c2292f674903b20b82b570aa32ee524b2c3f5d8e76c7d25848
 DIST kxmlgui-5.48.0.tar.xz 883968 BLAKE2B 2f4577bfb8fb72f7083611b0777cb23d1dbe8078fabed527c6341458fc7833afab9c7de3a3b0454a80279ae6a8b7c8be78d4aba0dabf08a6197041a0a66afe99 SHA512 4f0bfac2f795fccc021cc139397e0691dfe9fa0a273ab8ad95783f4a415cd15c2f84dc5b0d80d0e37d92c7b884c3cb9f338fcf67964f89ac9d0d40cc6f6acef2
 EBUILD kxmlgui-5.46.0.ebuild 1204 BLAKE2B c536c6bb3c322e51761850249b03bb2eb010455e1c454f0e4aa365475b4d412652ca750c67c1f3dc5a0561cec51ba21f7257388a66ccdcb3e91dfd1ffdc3a656 SHA512 3cd83c1ab8c22a61ad297fb083e58646e6d1f638091642188266405cb0540b6130a1424afb71140abbf6d5a78d22b3adaabdc5ae4f6b04a5f102ed12f5227ee1
+EBUILD kxmlgui-5.48.0-r1.ebuild 1250 BLAKE2B d9a3296aca2c76f5c655b2b04e6af5717b51492ec2052f062f7f39b11fc6cd0dc6bb8fcf7e442f5b75d5610271c852253122670a4f20f3efc3acad001d926dbe SHA512 bf4a0b5a964549fb39ee5c811cfbd93a009129c7b2246552ca9ddd3c87d9ede167fb4f2bba7f61a9d46878bee5d44040e86edd9d7864ebec10c175ed034906c4
 EBUILD kxmlgui-5.48.0.ebuild 1200 BLAKE2B d5e4a352c281b0c379d2b65d23f3a34c24f4eb2c2687cbc2c5a13ca473492d73ee538e7b9930219d3a20674524a826e8928b4d75f6f58dd835e0cd3142a9b34c SHA512 3bdf9d9f0bc900ccb15b37796effe30d38bac165dff0ffeb206253688fc607d96f32f222a846b9c92f89bb95a206cde4bda51b2a75a2834d9199347c75ba92f4
 MISC metadata.xml 345 BLAKE2B 96a4b9d8b198daa5ab0dc57b20fc8825cf496d8790b443a573db2e9779ec68b601cd6e0d17e41151820e834b888b25788f9e117539fa283b5036f19f0ee6f4b9 SHA512 8afbcc4b1fb04ab5cfd90dda415afbbd45fd96bb365ed08c4aa2f456bccb020816c45006222f6c53a0fe4bee1c5ee4b427355db8699ad0282526d97f873b70c4
diff --git a/kde-frameworks/kxmlgui/files/kxmlgui-5.48.0-kmainwindow.patch b/kde-frameworks/kxmlgui/files/kxmlgui-5.48.0-kmainwindow.patch
new file mode 100644
index 000000000000..ffc62a676d55
--- /dev/null
+++ b/kde-frameworks/kxmlgui/files/kxmlgui-5.48.0-kmainwindow.patch
@@ -0,0 +1,32 @@
+From d35a88289513c0420863b80aa6c1cb7d2c6e978f Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <max@scarlettvisionmedia.com>
+Date: Tue, 17 Jul 2018 09:45:30 +0200
+Subject: Fix KMainWindow saving incorrect widget settings
+
+BUG: 395988
+In certain cases KMainWindow::saveMainWindowSettings() could have been
+called after mainwindow started destroying itself. Window settings would
+be saved with incorrect child widget states. e.g. some widgets would be
+saved as hidden even if they were visible before destroying.
+---
+ src/kmainwindow.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/kmainwindow.cpp b/src/kmainwindow.cpp
+index 810bf32..885ac60 100644
+--- a/src/kmainwindow.cpp
++++ b/src/kmainwindow.cpp
+@@ -524,6 +524,10 @@ void KMainWindow::closeEvent(QCloseEvent *e)
+     }
+ 
+     if (queryClose()) {
++        // widgets will start destroying themselves at this point and we don't
++        // want to save state anymore after this as it might be incorrect
++        d->autoSaveSettings = false;
++        d->letDirtySettings = false;
+         e->accept();
+     } else {
+         e->ignore();    //if the window should not be closed, don't close it
+-- 
+cgit v0.11.2
+
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.48.0-r1.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.48.0-r1.ebuild
new file mode 100644
index 000000000000..1bf6dd9dd26d
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.48.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="attica"
+
+# slot op: includes QtCore/private/qlocale_p.h
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtcore '' '' '5=')
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	attica? ( $(add_frameworks_dep attica) )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-kmainwindow.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package attica KF5Attica)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# Files are missing; whatever. Bug: 650290
+	local myctestargs=(
+		-E "(kxmlgui_unittest)"
+	)
+
+	kde5_src_test
+}