Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 719328 - [kde-overlay] kde-plasma/plasma-desktop-9999 plasma-desktop-5.18.4.1-override-include-dirs.patch fails to apply because of upstream path changes
Summary: [kde-overlay] kde-plasma/plasma-desktop-9999 plasma-desktop-5.18.4.1-override...
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-04-25 02:11 UTC by jospezial
Modified: 2020-04-25 12:58 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 2020-04-25 02:11:26 UTC
>>> Preparing source in /var/tmp/portage/kde-plasma/plasma-desktop-9999/work/plasma-desktop-9999 ...
 * Applying plasma-desktop-5.18.4.1-override-include-dirs.patch ...
patching file cmake/modules/FindEvdev.cmake
patching file cmake/modules/FindSynaptics.cmake
patching file cmake/modules/FindXorgLibinput.cmake
can't find file to patch at input line 102
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|2.26.2
|
|
|From eb7bedd400d854e430808ae469164dfed24b1550 Mon Sep 17 00:00:00 2001
|From: Andreas Sturmlechner <asturm@gentoo.org>
|Date: Fri, 24 Apr 2020 18:55:30 +0200
|Subject: [PATCH 2/2] synapticstouchpad.cpp: Drop synaptics-properties.h parent
| dir from include
|
|---
| kcms/touchpad/src/backends/x11/synapticstouchpad.cpp | 2 +-
| 1 file changed, 1 insertion(+), 1 deletion(-)
|
|diff --git a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
|index d2f41d70b..3eb3171ee 100644
|--- a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
|+++ b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
 [ !! ]
 * ERROR: kde-plasma/plasma-desktop-9999::kde failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/kde-plasma/plasma-desktop-9999/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
 * 
 * Call stack:
 *               ebuild.sh, line  125:  Called src_prepare
 *             environment, line 3219:  Called ecm_src_prepare
 *             environment, line 1795:  Called cmake_src_prepare
 *             environment, line 1494:  Called default_src_prepare
 *      phase-functions.sh, line  920:  Called __eapi6_src_prepare
 *             environment, line  536:  Called eapply '/var/tmp/portage/kde-plasma/plasma-desktop-9999/files/plasma-desktop-5.18.4.1-override-include-dirs.patch'
 *             environment, line 1645:  Called _eapply_patch '/var/tmp/portage/kde-plasma/plasma-desktop-9999/files/plasma-desktop-5.18.4.1-override-include-dirs.patch'
 *             environment, line 1583:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/kde-plasma/plasma-desktop-9999/files/plasma-desktop-5.18.4.1-override-include-dirs.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *              die "$@"


https://github.com/KDE/plasma-desktop/commit/9f34469d04e3a5e3423c9856ea8cc3cc60c3cdfc#diff-be55e58aeac41c35618eefcfdab1cb9e
"[kcm/touchpad] Simplify directory structure"
Comment 1 Larry the Git Cow gentoo-dev 2020-04-25 12:58:19 UTC
The bug has been closed via the following commit(s):

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

commit 142fb5031705e9d3dfe100c424ca5e8a7eaa4995
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2020-04-25 12:57:52 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2020-04-25 12:57:52 +0000

    kde-plasma/plasma-desktop: Split override-include-dirs.patch
    
    Files moved around after Plasma/5.18 branching.
    
    Closes: https://bugs.gentoo.org/719328
    Package-Manager: Portage-2.3.99, Repoman-2.3.22
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 ...ma-desktop-5.18.4.1-override-include-dirs.patch | 28 ----------------------
 .../plasma-desktop-5.18.4.1-synaptics-header.patch | 26 ++++++++++++++++++++
 .../plasma-desktop-5.18.80-synaptics-header.patch  | 26 ++++++++++++++++++++
 .../plasma-desktop-5.18.4.1-r3.ebuild              |  3 ++-
 .../plasma-desktop-5.18.49.9999.ebuild             |  1 +
 .../plasma-desktop/plasma-desktop-9999.ebuild      |  1 +
 6 files changed, 56 insertions(+), 29 deletions(-)