diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2024-03-24 21:37:04 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-03-24 22:02:15 +0100 |
commit | dcc5ac87c3c7da7b11384c424d5fdb0063fc3eae (patch) | |
tree | 8aea3b8ad85c49410032b05a03c25e0fcf89f7b2 /kde-frameworks/kio | |
parent | kde-frameworks/kiconthemes: Add missing dev-qt/qtbase:6= slot op (diff) | |
download | gentoo-dcc5ac87c3c7da7b11384c424d5fdb0063fc3eae.tar.gz gentoo-dcc5ac87c3c7da7b11384c424d5fdb0063fc3eae.tar.bz2 gentoo-dcc5ac87c3c7da7b11384c424d5fdb0063fc3eae.zip |
kde-frameworks/kio: Backport various bug/regression fixes from 6.1.0
Berk Elyesa Yıldırım (1):
Drop legacy keys for m_runOnDiscreteGpuBool
Jonathan Marten (1):
kioexec: Remove temporary files after the main loop has completed
Martin Seher (1):
fix hide service menu items in context menu
Méven Car (2):
KFileitem: Use internal permissions as best case scenario
KFileItem: when checking access use current user
Nicolas Fella (4):
[knewfilemenu] Fix error handling when creating a folder that already exists
[kterminallauncherjob] Inherit default process environment from parent
[knewfilemenu] Add window title for new file dialog
[kfileplacesmodel] Remove wrong assert
Patrycja Rosa (1):
Fix sprintf buffer leaks on 32-bit systems
Sergey Katunin (1):
Revert "Temporarily revert "Consider slow files as remote files in previewjob""
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kio')
-rw-r--r-- | kde-frameworks/kio/Manifest | 1 | ||||
-rw-r--r-- | kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch | 34 | ||||
-rw-r--r-- | kde-frameworks/kio/kio-6.0.0-r2.ebuild | 93 |
3 files changed, 94 insertions, 34 deletions
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest index a7f8d0e727cf..a95962e599eb 100644 --- a/kde-frameworks/kio/Manifest +++ b/kde-frameworks/kio/Manifest @@ -1,2 +1,3 @@ DIST kio-5.115.0.tar.xz 3799964 BLAKE2B 020084259a4e41d102e786d34b899420e18d75f27a3f8391dfd05f57d86168676d5ae88b603d84176a8ad963aee7bc5883ef4952c25f6d8ea1b11cd6d04bb470 SHA512 014eab017a1a9ba65cf122a9f241764054b3591c5759d5121ccd82593ebfe301eec0ba1f9e08165ef75b0fdf057094ef81293a6ec020ee2100394a68ab80a8d7 +DIST kio-6.0.0-patchset.tar.xz 5808 BLAKE2B 94b6a57a660fa2c6d2362b3a35c02a355dc486e59b9d4d74adab91258f2a8fd73ee2f2ae8168d4aaa11ae5508f3492e898002ba274cdd6a51eb1cf3422a003bb SHA512 b20e2b2ed673dffdbc9588bcaf1bcde9ff7dd6d4c77ef7398240b4d6c5f899f1025ef4757fa19f42c2196c60836afe6205bd8cd1ed436cc91ccffd7be427a7a7 DIST kio-6.0.0.tar.xz 3353680 BLAKE2B f65c2cc36e2e22494edf77f598ca6eff037d26de0981d3f136d3db901d1ca4cd069f696c5dd9a42622bcb6b60aabf79e1221b9862e47cc15205341101efe58e2 SHA512 ec230cda5fc9f973e0b02bf7e9a2c282c447c69cd247be10b11299b950043a9517ff17061c1262e4e709539d9fe17ff532d1ff69dae36abe56b1bb0d81327bfe diff --git a/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch b/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch deleted file mode 100644 index 2c9b594b33ee..000000000000 --- a/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6e7775d315f389df0a440ed62b842ce83dc9a27e Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Fri, 1 Mar 2024 22:16:07 +0100 -Subject: [PATCH] [kterminallauncherjob] Inherit default process environment - from parent - -Before Qt 6.3, an empty (default constructed) QProcessEnvironment caused -QProcess to incorrectly inherit the environment variables from the parent -process. This was fixed in qtbase 5fc9c02a695. - -CommandLauncherJob was adjusted for this in 916984940f64e07db9b4d152be9f2a87dda0cfb4, -however here we are overriding its default env with our own default-constructed one - -BUG: 482107 ---- - src/gui/kterminallauncherjob.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/kterminallauncherjob.cpp b/src/gui/kterminallauncherjob.cpp -index c4e83fb11b..edd99327bd 100644 ---- a/src/gui/kterminallauncherjob.cpp -+++ b/src/gui/kterminallauncherjob.cpp -@@ -22,7 +22,7 @@ public: - QString m_fullCommand; // "xterm -e ls" - QString m_desktopName; - QByteArray m_startupId; -- QProcessEnvironment m_environment; -+ QProcessEnvironment m_environment{QProcessEnvironment::InheritFromParent}; - }; - - KTerminalLauncherJob::KTerminalLauncherJob(const QString &command, QObject *parent) --- -GitLab - diff --git a/kde-frameworks/kio/kio-6.0.0-r2.ebuild b/kde-frameworks/kio/kio-6.0.0-r2.ebuild new file mode 100644 index 000000000000..3c6c3979cb39 --- /dev/null +++ b/kde-frameworks/kio/kio-6.0.0-r2.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PATCHSET="${P}-patchset" +ECM_DESIGNERPLUGIN="true" +ECM_HANDBOOK="optional" +ECM_HANDBOOK_DIR="docs" +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org xdg-utils + +DESCRIPTION="Framework providing transparent file and data management" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="acl +kwallet wayland X" + +# tests hang +RESTRICT="test" + +COMMON_DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,ssl,widgets] + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtdeclarative-${QTMIN}:6 + =kde-frameworks/kauth-${PVCUT}*:6 + =kde-frameworks/kbookmarks-${PVCUT}*:6 + =kde-frameworks/kcodecs-${PVCUT}*:6 + =kde-frameworks/kcolorscheme-${PVCUT}*:6 + =kde-frameworks/kcompletion-${PVCUT}*:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kconfigwidgets-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kcrash-${PVCUT}*:6 + =kde-frameworks/kdbusaddons-${PVCUT}*:6 + =kde-frameworks/kguiaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kiconthemes-${PVCUT}*:6 + =kde-frameworks/kitemviews-${PVCUT}*:6 + =kde-frameworks/kjobwidgets-${PVCUT}*:6 + =kde-frameworks/knotifications-${PVCUT}*:6 + =kde-frameworks/kservice-${PVCUT}*:6 + =kde-frameworks/ktextwidgets-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kwindowsystem-${PVCUT}*:6[wayland?,X?] + =kde-frameworks/kxmlgui-${PVCUT}*:6 + =kde-frameworks/solid-${PVCUT}*:6 + sys-power/switcheroo-control + acl? ( + sys-apps/attr + virtual/acl + ) + handbook? ( + dev-libs/libxml2 + dev-libs/libxslt + =kde-frameworks/karchive-${PVCUT}*:6 + =kde-frameworks/kdoctools-${PVCUT}*:6 + ) + kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:6 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/qtbase-${QTMIN}:6[concurrent] +" +RDEPEND="${COMMON_DEPEND} + sys-power/switcheroo-control +" +PDEPEND=">=kde-frameworks/kded-${PVCUT}:6" + +PATCHES=( "${WORKDIR}/${PATCHSET}" ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package acl ACL) + $(cmake_use_find_package kwallet KF6Wallet) + -DWITH_WAYLAND=$(usex wayland) + -DWITH_X11=$(usex X) + ) + + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + xdg_desktop_database_update +} + +pkg_postrm() { + ecm_pkg_postrm + xdg_desktop_database_update +} |