diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-03-19 12:49:59 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-03-19 12:49:59 +0000 |
| commit | 328b082fd6fb193da715f61a92ff9366ad562a34 (patch) | |
| tree | bb1cb21fc0cdf0377ed571709e5ff4460f159a76 /kde-frameworks | |
| parent | 06617f385b21ef2262c88f17869c15c424e67d21 (diff) | |
gentoo auto-resync : 19:03:2024 - 12:49:59
Diffstat (limited to 'kde-frameworks')
| -rw-r--r-- | kde-frameworks/Manifest.gz | bin | 13905 -> 13909 bytes | |||
| -rw-r--r-- | kde-frameworks/kio/Manifest | 3 | ||||
| -rw-r--r-- | kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch | 34 | ||||
| -rw-r--r-- | kde-frameworks/kio/kio-6.0.0-r1.ebuild (renamed from kde-frameworks/kio/kio-6.0.0.ebuild) | 2 |
4 files changed, 38 insertions, 1 deletions
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz Binary files differindex c4bb7ffeeccf..200aaba46aa8 100644 --- a/kde-frameworks/Manifest.gz +++ b/kde-frameworks/Manifest.gz diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest index 29e51955a928..333e3ab3b8ea 100644 --- a/kde-frameworks/kio/Manifest +++ b/kde-frameworks/kio/Manifest @@ -1,5 +1,6 @@ +AUX kio-6.0.0-kterminallauncherjob.patch 1258 BLAKE2B e6796734803b67d8acab1216695a5b987b3037bcccaab5785ed6dde88aa87f92c69a65638ac344611555a8db51b84237aa5cb55934fdd504e40f6b8f460d9b4f SHA512 7b568b9797badbfd445461270a025835c3b33e6cd57a417be5569ea392b981683924179f3fc0e4911a326177575119aa62db7947917602b04c10a61348f75b96 DIST kio-5.115.0.tar.xz 3799964 BLAKE2B 020084259a4e41d102e786d34b899420e18d75f27a3f8391dfd05f57d86168676d5ae88b603d84176a8ad963aee7bc5883ef4952c25f6d8ea1b11cd6d04bb470 SHA512 014eab017a1a9ba65cf122a9f241764054b3591c5759d5121ccd82593ebfe301eec0ba1f9e08165ef75b0fdf057094ef81293a6ec020ee2100394a68ab80a8d7 DIST kio-6.0.0.tar.xz 3353680 BLAKE2B f65c2cc36e2e22494edf77f598ca6eff037d26de0981d3f136d3db901d1ca4cd069f696c5dd9a42622bcb6b60aabf79e1221b9862e47cc15205341101efe58e2 SHA512 ec230cda5fc9f973e0b02bf7e9a2c282c447c69cd247be10b11299b950043a9517ff17061c1262e4e709539d9fe17ff532d1ff69dae36abe56b1bb0d81327bfe EBUILD kio-5.115.0.ebuild 2433 BLAKE2B ef2dbdc733214e9ad012fbf45564b3eb052bf3980e346977d9c9c7ec13a4cd512fcc5a6b517d9993ed333c821e885228779ea53649905c9f744025ffdd21dd0d SHA512 9ea1c94266e3f638e891fdf834919deba8ade49b4339366d8ff965a23e221c55155e5bf963f585185ef8b191c3c242d04d7c88f09cbc73196bee5fb18d72c3ee -EBUILD kio-6.0.0.ebuild 2240 BLAKE2B 411835bcd59dfff3b4c4df21f7635616f0b081a9bc134eac7a388f0a85a5055c267b0bec446e525bd324836ae7f226ea1e7176263acff2d6691f10a005db8a40 SHA512 5c98d84d65a93c7a7641b09aa220141f5530edcee87d30128faaafee27df9e1a4fa3fc1e144406e4a1ea6e3d547c87499592c3fecb759425b0b1f69877e6083c +EBUILD kio-6.0.0-r1.ebuild 2316 BLAKE2B ff278c654297dee03830d86f3eb28ad51f611c27de4ff7b94bb74e7c9c9d9324de7fd7c4745598edfa362feeae55cda25b6f2981ba0718bc2bb073b20b4d4aa5 SHA512 2e5f43057970b1d9a338f46743ba12b9f181bbc1b205d4af551682eb09b6434d8d815137edc8606d5c613e3a5f7e1dadab3846ef40567b3277cf35abed244f0a MISC metadata.xml 776 BLAKE2B c30d6d930265af6c0f0d5e01e2ad7b4c7961190f013e9447dea890880f947a0ad006ac523e7363e50a58221d807e1b9ce78270800a20226906e48980eb332b6a SHA512 ccf86c003f2933287e41fcac9980f07006b3bde5a303f241d7a1fadeffa0b22656ea6e51fadd5ea5c40d7e8fa0debaf16a0ac004db317a18c99d80461bc82115 diff --git a/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch b/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch new file mode 100644 index 000000000000..2c9b594b33ee --- /dev/null +++ b/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch @@ -0,0 +1,34 @@ +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.ebuild b/kde-frameworks/kio/kio-6.0.0-r1.ebuild index e7e91a0869cc..384afe22e7e1 100644 --- a/kde-frameworks/kio/kio-6.0.0.ebuild +++ b/kde-frameworks/kio/kio-6.0.0-r1.ebuild @@ -67,6 +67,8 @@ RDEPEND="${COMMON_DEPEND} " PDEPEND=">=kde-frameworks/kded-${PVCUT}:6" +PATCHES=( "${FILESDIR}/${P}-kterminallauncherjob.patch" ) # KDE-bug 482107 + src_configure() { local mycmakeargs=( $(cmake_use_find_package acl ACL) |