Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 816309 - [kde overlay] kde-frameworks/extra-cmake-modules-9999 extra-cmake-modules-5.74.0-disable-qmlplugindump.patch fails to apply
Summary: [kde overlay] kde-frameworks/extra-cmake-modules-9999 extra-cmake-modules-5.7...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Overlays (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo KDE team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-10-05 02:09 UTC by jospezial
Modified: 2021-10-05 15:49 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description jospezial 2021-10-05 02:09:34 UTC
https://invent.kde.org/frameworks/extra-cmake-modules/-/commit/8abe35b4214a24470dd5f8c0949f67253e10374b
"ECMFindQMLModule: Use QT_HOST_BINS to find qmlplugindump
When cross-compiling QT_INSTALL_BINS contains binaries for the target
system that can't be used during the build. Instead use QT_HOST_BINS
which contains the Qt build tools for the current system.
"

 * Package:    kde-frameworks/extra-cmake-modules-9999
 * Repository: kde
 * Maintainer: kde@gentoo.org
 * Upstream:   https://bugs.kde.org/
 * USE:        abi_x86_64 amd64 elibc_glibc kernel_linux userland_GNU
 * FEATURES:   ccache network-sandbox preserve-libs sandbox userpriv usersandbox
>>> Unpacking source...
 * Repository id: frameworks_extra-cmake-modules.git
 * To override fetched repository properties, use:
 *   EGIT_OVERRIDE_REPO_FRAMEWORKS_EXTRA_CMAKE_MODULES
 *   EGIT_OVERRIDE_BRANCH_FRAMEWORKS_EXTRA_CMAKE_MODULES
 *   EGIT_OVERRIDE_COMMIT_FRAMEWORKS_EXTRA_CMAKE_MODULES
 *   EGIT_OVERRIDE_COMMIT_DATE_FRAMEWORKS_EXTRA_CMAKE_MODULES
 * 
 * Fetching https://invent.kde.org/frameworks/extra-cmake-modules.git ...
git fetch https://invent.kde.org/frameworks/extra-cmake-modules.git +HEAD:refs/git-r3/HEAD
remote: Enumerating objects: 13, done.
remote: Counting objects: 100% (13/13), done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 13 (delta 7), reused 13 (delta 7), pack-reused 0
Unpacking objects: 100% (13/13), 5.50 KiB | 194.00 KiB/s, done.
From https://invent.kde.org/frameworks/extra-cmake-modules
   63bec55..8abe35b              -> refs/git-r3/HEAD
 * [new tag]         v5.87.0-rc1 -> v5.87.0-rc1
git symbolic-ref refs/git-r3/kde-frameworks/extra-cmake-modules/5/__main__ refs/git-r3/HEAD
 * Checking out https://invent.kde.org/frameworks/extra-cmake-modules.git to /var/tmp/portage/kde-frameworks/extra-cmake-modules-9999/work/extra-cmake-modules-9999 ...
git checkout --quiet refs/git-r3/HEAD
GIT update -->
   repository:               https://invent.kde.org/frameworks/extra-cmake-modules.git
   updating from commit:     63bec5521d245e3a1ea50109b86a2b716966938e
   to commit:                8abe35b4214a24470dd5f8c0949f67253e10374b
 find-modules/FindQtWaylandScanner.cmake | 2 +-
 modules/ECMAddTests.cmake               | 4 ++++
 modules/ECMFindQMLModule.cmake.in       | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
>>> Source unpacked in /var/tmp/portage/kde-frameworks/extra-cmake-modules-9999/work
>>> Preparing source in /var/tmp/portage/kde-frameworks/extra-cmake-modules-9999/work/extra-cmake-modules-9999 ...
 * Source directory (CMAKE_USE_DIR): "/var/tmp/portage/kde-frameworks/extra-cmake-modules-9999/work/extra-cmake-modules-9999"
 * Build directory  (BUILD_DIR):     "/var/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.74.0-disable-qmlplugindump.patch ...
patching file modules/ECMFindQMLModule.cmake.in
Hunk #1 FAILED at 26.
1 out of 1 hunk FAILED -- saving rejects to file modules/ECMFindQMLModule.cmake.in.rej
 [ !! ]
 * ERROR: kde-frameworks/extra-cmake-modules-9999::kde failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/kde-frameworks/extra-cmake-modules-9999/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch

Is our patch still needed after the upstream changes?
See also https://invent.kde.org/frameworks/extra-cmake-modules/-/commit/c36e5abaecfca3c4d7b3957f935e2f061fcad488
Comment 1 Larry the Git Cow gentoo-dev 2021-10-05 15:49:25 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/proj/kde.git/commit/?id=c24905bfe4ba7433673e214f6555fb8348ec3724

commit c24905bfe4ba7433673e214f6555fb8348ec3724
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2021-10-05 15:22:17 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2021-10-05 15:24:36 +0000

    kde-frameworks/extra-cmake-modules: Rebase disable-qmlplugindump.patch
    
    Closes: https://bugs.gentoo.org/816309
    Package-Manager: Portage-3.0.26, Repoman-3.0.3
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 .../extra-cmake-modules-9999.ebuild                |  2 +-
 ...make-modules-5.88.0-disable-qmlplugindump.patch | 65 ++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)