Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 757273 - [kde overlay] kde-frameworks/kdelibs4support-9999 kdelibs4support-5.76.0-no-kdesignerplugin.patch needs rebased
Summary: [kde overlay] kde-frameworks/kdelibs4support-9999 kdelibs4support-5.76.0-no-k...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Overlays (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo KDE team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-11-27 21:31 UTC by Duncan
Modified: 2020-11-28 00:17 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 Duncan 2020-11-27 21:31:45 UTC
Upstream kdelibs4support commit a69775f30 updated the required qt version to 5.13.0 from 5.12.0, which broke the context in the CMakeLists.txt portion of the second combined patch of gentoo's kdelibs4support-5.76.0-no-kdesignerplugin.patch.

s/set(REQUIRED_QT_VERSION 5.12.0)/set(REQUIRED_QT_VERSION 5.13.0)/

So the patch needs rebased.

>>> Preparing source in /tmp/portage/kde-frameworks/kdelibs4support-9999/work/kdelibs4support-9999 ...
* Applying kdelibs4support-5.76.0-no-kdesignerplugin.patch ...
patching file CMakeLists.txt
patching file KF5KDELibs4SupportConfig.cmake.in
patching file cmake/modules/FindKDE4Internal.cmake
patching file cmake/modules/KDE4Macros.cmake
patching file src/CMakeLists.txt
patching file src/KDEUIMacros.cmake
patching file CMakeLists.txt
Hunk #1 FAILED at 20.
1 out of 1 hunk FAILED -- saving rejects to file CMakeLists.txt.rej
patching file cmake/modules/ECMQt4To5Porting.cmake
patching file cmake/modules/FindQt5Transitional.cmake                                                                                               [ !! ]
* ERROR: kde-frameworks/kdelibs4support-9999::kde failed (prepare phase):
*   patch -p1  failed with /tmp/portage/kde-frameworks/kdelibs4support-9999/files/kdelibs4support-5.76.0-no-kdesignerplugin.patch
Comment 1 Larry the Git Cow gentoo-dev 2020-11-28 00:17:14 UTC
The bug has been closed via the following commit(s):

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

commit ae0f796d7cbe6e9274fb0c845cf1db81c15d8c86
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2020-11-28 00:15:17 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2020-11-28 00:15:17 +0000

    kde-frameworks/kdelibs4support: Rebase no-kdesignerplugin.patch
    
    Reported-by: Duncan <1i5t5.duncan@cox.net>
    Closes: https://bugs.gentoo.org/757273
    Package-Manager: Portage-3.0.10, Repoman-3.0.2
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 ...gnerplugin.patch => kdelibs4support-5.77.0-no-kdesignerplugin.patch} | 2 +-
 kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)