From 8cdbce52e2f89fecc3d9bac3ff73ebee1c8f8c75 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 21 Jul 2018 19:03:52 +0100 Subject: gentoo resync : 21.07.2018 --- kde-apps/dolphin/Manifest | 4 +- kde-apps/dolphin/dolphin-18.04.3-r1.ebuild | 92 ++++++++++++++++++++++ kde-apps/dolphin/dolphin-18.04.3.ebuild | 91 --------------------- .../dolphin/files/dolphin-18.04.3-memleak-1.patch | 36 +++++++++ .../dolphin/files/dolphin-18.04.3-memleak-2.patch | 37 +++++++++ 5 files changed, 168 insertions(+), 92 deletions(-) create mode 100644 kde-apps/dolphin/dolphin-18.04.3-r1.ebuild delete mode 100644 kde-apps/dolphin/dolphin-18.04.3.ebuild create mode 100644 kde-apps/dolphin/files/dolphin-18.04.3-memleak-1.patch create mode 100644 kde-apps/dolphin/files/dolphin-18.04.3-memleak-2.patch (limited to 'kde-apps/dolphin') diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest index 060806a9a049..5cfc4630f073 100644 --- a/kde-apps/dolphin/Manifest +++ b/kde-apps/dolphin/Manifest @@ -1,8 +1,10 @@ AUX dolphin-18.04.1-flto.patch 3061 BLAKE2B d24d99f9cebd2979d6e0b6c8edb30b552601ba502937313395dae35e9c21c2ec6b1978eaf949cb87c5846ea6a12fe535b4fc849b3d7547c6c95c5b75c0cfc2d9 SHA512 7af21ea15381a460b08c02d5dee0bc1702a2a30c0b86b2b8f1b937783a199fb3b3cc1f76ee827ac15ca934d0e975ad2e702053369477afa35990423abe7e9d63 +AUX dolphin-18.04.3-memleak-1.patch 1651 BLAKE2B dff558ec7e3ba2dafe676c43da09409bfbdaaa12bf508aaf825121a72df129b3c1c6ef17066520b8c5900682806bf7a2cf65d914c9e69cafd64fd5f65f25e468 SHA512 1acfdb7b200464be878e503053faa08680595422c62619f94ed66a6f8bf84087328bd6959f69c0351b926bf63ebbe63a2c70f34e4ebe6e873958893d6caf0455 +AUX dolphin-18.04.3-memleak-2.patch 1180 BLAKE2B 4b546aefe5b1c5342522fae2a0bcf7e74f023f45f0e39950a104188b40e51a480e638d864b953033ec3f3630c89095315fb73a1ab45782c34adffa11b6a0f77c SHA512 533a449113f3c196cac02634f5c4baf25225fbca6747f3d47c6a69986329bfc2f52d95bc20c7a7c603e80e18dfb65a47e0608835fe4eeeea906035136fe541b1 AUX dolphin-18.04.3-root-user.patch 2198 BLAKE2B e92b053b53f7f1c2c6ce25eb7a81e8c26f5dc9497f9bff6e2d02d125c9b57b7722352d18ee4d0ea001b73a71904d729485544596904229700d4a29a240e1c28f SHA512 c9f419f67ffae57ccf057fb5aa7352e3fb652cec3a9a21459ae5d3e9fba0b1dede993058afe83ced5c3fc036c11649476bc25435a29bc5d910257443e21cb43a AUX dolphin-18.04.3-root-warn.patch 1488 BLAKE2B 8e9536926b0b9e9f37c0e2be7e23fafc60f34ca1e25ef83423097d49e5f575cb762008b6c4cbf2c8d664cdbd010db5ed52a15226e812c5988c2e3431770334a6 SHA512 ae763f8fcef45108f812bccdb485d8da31fd27997583195e612c2ded82f041441849ae680f20d7259b3621b9609d55ff12dc6b3044b993e8f3063a1abc85aebd DIST dolphin-17.12.3.tar.xz 4841752 BLAKE2B 1f58cb0f1663e131a1b8dc58fc47d40a8a68bcb998fd3c6191f99176263523d40c1d9057b569c10c14e2a6b0be91b2eaaf07a54acdd386984d0da167cb84fabd SHA512 44cf8baaeead69dd5529ce7da96d78f507029fa47ac9ac50de9d77cb15335dd0b0e0c916f2cdd0d5cadc465e461115dbfd02c51af38d03da985d66bd22456136 DIST dolphin-18.04.3.tar.xz 4850916 BLAKE2B 1d2a5c4f5e94e2f30055804d96c205eb2c03864ad2b6c245d917549986fbac26686e654818dacf93fcb711f59bfe6e7f3a011e578988f5bf9e6b6cb82fc33876 SHA512 167a35225dd4e75b7ff863771287a471273e0594c247ef058adc718682eb07f014ca84bc373e1c3a846e99711aad3d9a16b12aab8543aa3603e17f944b206b21 EBUILD dolphin-17.12.3.ebuild 2230 BLAKE2B 8e3d435eac7d521830bbd13122d7616bc5c54b786eef8386dad3c9b97447058a843d61c060308518c84e776787cdeb0e1b3399fc099f69faa6b7f055eae79c58 SHA512 b3999175d7bf0672fce3b697104b9fb024c9d0487dad8a40d1f37405ca7d611b2981a76629c024eb06cf7503c900a2a2d70c365d718fd8b173562103f1db975b -EBUILD dolphin-18.04.3.ebuild 2375 BLAKE2B 531782e4c620b2f1749ac3a3effe342feb3e01e0a7e1110ea7d023801ff70f48413406ff23060bf84be0afc0154e47eaa4e5a7542d78560b9b3da790dba7f15b SHA512 f3da766491d99c9469d08495c2889c475be17c903196f3e96c5cbd8da25fea970c44e90526809e70eba7aa8d7bac619c5f4cf445e3f892db309bc7ce9f7dd765 +EBUILD dolphin-18.04.3-r1.ebuild 2397 BLAKE2B 780d95fc1e944b290ca05f149acebdad003eaf9f798dad14dc1792710361f1ca2edec398c1145a3090d7d6f21a64dd2a18abcca8023204f161dd65011792f9eb SHA512 5c1530a7b34e58b0a8da9a6aea6910d149a63802eee4811f0693cd52d6b27098566a982b3b7854463cf3e5a198c00baf4dd84541278447586d42f668af44d62f MISC metadata.xml 325 BLAKE2B 2526d5a76392c6c3ba96998586cab48d43c3bf87422c698fbfe009c398d2f84b13193f4cebd06e87b3f7856a83824e3ed3a34b902a437671fb9302de2af44674 SHA512 8a728d296c68f8046b32871bb185a467b1b03a25af3c026647d76b40d83d1f8ee959fac135b26ed1fdb3ec15cdb6c58c75d9fd128122331181530637e2d69169 diff --git a/kde-apps/dolphin/dolphin-18.04.3-r1.ebuild b/kde-apps/dolphin/dolphin-18.04.3-r1.ebuild new file mode 100644 index 000000000000..030c7e78bf3c --- /dev/null +++ b/kde-apps/dolphin/dolphin-18.04.3-r1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +KDE_TEST="true" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Plasma filemanager focusing on usability" +HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin" +KEYWORDS="~amd64 ~x86" +IUSE="semantic-desktop thumbnail" + +DEPEND=" + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kinit) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep solid) + $(add_qt_dep qtconcurrent) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + media-libs/phonon[qt5(+)] + semantic-desktop? ( + $(add_frameworks_dep baloo) + $(add_frameworks_dep kfilemetadata) + $(add_kdeapps_dep baloo-widgets) + ) + !semantic-desktop? ( + $(add_frameworks_dep kdelibs4support) + ) +" +RDEPEND="${DEPEND} + $(add_kdeapps_dep kio-extras) + thumbnail? ( + $(add_kdeapps_dep ffmpegthumbs) + $(add_kdeapps_dep thumbnailers) + ) +" + +RESTRICT+=" test" + +PATCHES=( + "${FILESDIR}"/${PN}-18.04.1-flto.patch + "${FILESDIR}"/${P}-root-user.patch + "${FILESDIR}"/${P}-root-warn.patch + "${FILESDIR}"/${P}-memleak-{1,2}.patch +) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package semantic-desktop KF5Baloo) + $(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets) + $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) + ) + + kde5_src_configure +} + +pkg_postinst() { + kde5_pkg_postinst + + if ! has_version "kde-apps/ark:${SLOT}" ; then + elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}" + fi + + if ! has_version "kde-apps/kleopatra:${SLOT}" ; then + elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}" + fi +} diff --git a/kde-apps/dolphin/dolphin-18.04.3.ebuild b/kde-apps/dolphin/dolphin-18.04.3.ebuild deleted file mode 100644 index 7688b7f2c3b5..000000000000 --- a/kde-apps/dolphin/dolphin-18.04.3.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="true" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Plasma filemanager focusing on usability" -HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin" -KEYWORDS="~amd64 ~x86" -IUSE="semantic-desktop thumbnail" - -DEPEND=" - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kinit) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - media-libs/phonon[qt5(+)] - semantic-desktop? ( - $(add_frameworks_dep baloo) - $(add_frameworks_dep kfilemetadata) - $(add_kdeapps_dep baloo-widgets) - ) - !semantic-desktop? ( - $(add_frameworks_dep kdelibs4support) - ) -" -RDEPEND="${DEPEND} - $(add_kdeapps_dep kio-extras) - thumbnail? ( - $(add_kdeapps_dep ffmpegthumbs) - $(add_kdeapps_dep thumbnailers) - ) -" - -RESTRICT+=" test" - -PATCHES=( - "${FILESDIR}/${PN}-18.04.1-flto.patch" - "${FILESDIR}/${PN}-18.04.3-root-user.patch" - "${FILESDIR}/${PN}-18.04.3-root-warn.patch" -) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package semantic-desktop KF5Baloo) - $(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets) - $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) - ) - - kde5_src_configure -} - -pkg_postinst() { - kde5_pkg_postinst - - if ! has_version "kde-apps/ark:${SLOT}" ; then - elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}" - fi - - if ! has_version "kde-apps/kleopatra:${SLOT}" ; then - elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}" - fi -} diff --git a/kde-apps/dolphin/files/dolphin-18.04.3-memleak-1.patch b/kde-apps/dolphin/files/dolphin-18.04.3-memleak-1.patch new file mode 100644 index 000000000000..5bbeaa7e617c --- /dev/null +++ b/kde-apps/dolphin/files/dolphin-18.04.3-memleak-1.patch @@ -0,0 +1,36 @@ +From 4536e25ac929d8d37ffbbba0642de662bcc9f891 Mon Sep 17 00:00:00 2001 +From: David Hallas +Date: Wed, 18 Jul 2018 23:20:18 +0200 +Subject: Fixes memory leak in KItemListViewAccessible + +Summary: The KItemListViewAccessible class has a list of QAccessibleInterface pointers in a member variable m_cells. The problem is that when new entries are created, the newly allocated pointer is not stored in the list, only a nullptr is store, this renders the cleanup code in the destructor useless. This patch simply stores the pointer in the list, causing the destructor to correctly free the memory. + +Test Plan: I found this issue using address sanitizer. Simply building Dolphin with -fsanitize=address and opening a window caused the memory leak. + +Reviewers: #dolphin, jtamate, elvisangelaccio + +Reviewed By: #dolphin, jtamate, elvisangelaccio + +Subscribers: elvisangelaccio, kfm-devel + +Tags: #dolphin + +Differential Revision: https://phabricator.kde.org/D14168 +--- + src/kitemviews/kitemlistviewaccessible.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp +index 69c126f..4d1b28b 100644 +--- a/src/kitemviews/kitemlistviewaccessible.cpp ++++ b/src/kitemviews/kitemlistviewaccessible.cpp +@@ -78,6 +78,7 @@ QAccessibleInterface* KItemListViewAccessible::cell(int index) const + QAccessibleInterface* child = m_cells.at(index); + if (!child) { + child = new KItemListAccessibleCell(view(), index); ++ m_cells.insert(index, child); + QAccessible::registerAccessibleInterface(child); + } + return child; +-- +cgit v0.11.2 diff --git a/kde-apps/dolphin/files/dolphin-18.04.3-memleak-2.patch b/kde-apps/dolphin/files/dolphin-18.04.3-memleak-2.patch new file mode 100644 index 000000000000..f39885bdca36 --- /dev/null +++ b/kde-apps/dolphin/files/dolphin-18.04.3-memleak-2.patch @@ -0,0 +1,37 @@ +From 2cbf3cb11ea668577121fa755c1ddacc6f0acdd8 Mon Sep 17 00:00:00 2001 +From: David Hallas +Date: Wed, 18 Jul 2018 16:43:25 -0600 +Subject: Fixes small memory leak in DolphinContextMenu + +Summary: When DolphinContextMenu::baseFileItem is called a KFileItem is allocated and stored in DolphinContextMenu::m_baseFileItem, which is of type KFileItem*, but the destructor failed to delete this. + +Test Plan: This leak was found using Address Sanitizer + +Reviewers: broulik, elvisangelaccio + +Reviewed By: broulik, elvisangelaccio + +Subscribers: ngraham, kfm-devel + +Tags: #dolphin + +Differential Revision: https://phabricator.kde.org/D14178 +--- + src/dolphincontextmenu.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp +index 7d7d7a4..8fdaab1 100644 +--- a/src/dolphincontextmenu.cpp ++++ b/src/dolphincontextmenu.cpp +@@ -81,6 +81,8 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, + + DolphinContextMenu::~DolphinContextMenu() + { ++ delete m_baseFileItem; ++ m_baseFileItem = nullptr; + delete m_selectedItemsProperties; + m_selectedItemsProperties = nullptr; + } +-- +cgit v0.11.2 -- cgit v1.2.3