Upstream 6fefacf8c (which builds on the previous 3813fd1bc): * commit 6fefacf8c | Author: Arjen Hiemstra <ahiemstra@heimr.nl> | AuthorDate: Mon Aug 2 14:56:56 2021 +0200 | Commit: Arjen Hiemstra <ahiemstra@heimr.nl> | CommitDate: Tue Jan 18 12:09:57 2022 +0000 | | Rename ECMQMLModules.cmake to ECMFindQmlModule.cmake | | To avoid ambiguity with ECMQmlModule.cmake. | | To preserve backward compatibility, we keep a version around of | ECMQMLModules.cmake that warns a user of it being moved and includes the | new file. [snipping the other listed files] | modules/{ECMFindQMLModule.cmake.in => ECMFindQmlModule.cmake.in} | 0 Note the s/QML/Qml/ Thus the following error when the *uppercase* QML-named file we try to patch can't be found. Error: >>> Preparing source in /tmp/portage/kde-frameworks/extra-cmake-modules-9999/work/extra-cmake-modules-9999 ... * Source directory (CMAKE_USE_DIR): "/tmp/portage/kde-frameworks/extra-cmake-modules-9999/work/extra-cmake-modules-9999" * Build directory (BUILD_DIR): "/tmp/portage/kde-frameworks/extra-cmake-modules-9999/work/extra-cmake-modules-9999_build" * Applying extra-cmake-modules-5.49.0-no-fatal-warnings.patch ... patching file kde-modules/KDECompilerSettings.cmake Hunk #1 succeeded at 534 with fuzz 1 (offset 190 lines). [ ok ] * Applying extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch ... [ ok ] * Applying extra-cmake-modules-5.90.0-disable-qmlplugindump.patch ... can't find file to patch at input line 19 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From 763df79a4b468acd401f8adb5b245245a63d2934 Mon Sep 17 00:00:00 2001 |From: Andreas Sturmlechner <asturm@gentoo.org> |Date: Sun, 8 Dec 2019 15:01:33 +0100 |Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to | avoid sandbox violations | |See also: https://phabricator.kde.org/D25812 | |Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135 |BUG: 387753 |--- | modules/ECMFindQMLModule.cmake.in | 45 ++++++++++++++++++------------- | 1 file changed, 27 insertions(+), 18 deletions(-) | |diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in |index 7cd737b..9847825 100644 |--- a/modules/ECMFindQMLModule.cmake.in |+++ b/modules/ECMFindQMLModule.cmake.in -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored [ !! ] * ERROR: kde-frameworks/extra-cmake-modules-9999::kde failed (prepare phase):
Just did a manual s/QML/Qml/ on the filename in the patch and it applied and the package merged successfully. =:^)
Created attachment 763710 [details, diff] extra-cmake-modules-5.90.0-disable-qmlplugindump.patch manually rebased That commit broke the patch content: https://invent.kde.org/frameworks/extra-cmake-modules/-/commit/9ff6f346b7e5265fb89c8e946b3ee841f6d4c305 - find_package(Qt6QmlTools REQUIRED) + find_package(Qt6 COMPONENTS QmlTools REQUIRED) The rebased patch should be copied to the tree as extra-cmake-modules-5.91.0-disable-qmlplugindump.patch
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae99e91c16a6004cb9ddc18b3eb457da50dee243 commit ae99e91c16a6004cb9ddc18b3eb457da50dee243 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2022-01-27 19:04:26 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2022-01-27 19:04:26 +0000 kde-frameworks/extra-cmake-modules: Rebase disable-qmlplugindump.patch Reported-by: Duncan <1i5t5.duncan@cox.net> Closes: https://bugs.gentoo.org/831769 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> .../extra-cmake-modules/extra-cmake-modules-9999.ebuild | 2 +- ...tra-cmake-modules-5.91.0-disable-qmlplugindump.patch} | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-)
