diff options
Diffstat (limited to 'kde-frameworks/kio')
| -rw-r--r-- | kde-frameworks/kio/Manifest | 3 | ||||
| -rw-r--r-- | kde-frameworks/kio/files/kio-5.48.0-memleak.patch | 65 | ||||
| -rw-r--r-- | kde-frameworks/kio/kio-5.48.0-r1.ebuild (renamed from kde-frameworks/kio/kio-5.48.0.ebuild) | 2 |
3 files changed, 69 insertions, 1 deletions
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" |