Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 689466 - [kde overlay] kde-plasma/libkworkspace-9999 libkworkspace-5.14.90-standalone.patch fails with upstream cd3e9a291
Summary: [kde overlay] kde-plasma/libkworkspace-9999 libkworkspace-5.14.90-standalone....
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: 2019-07-08 09:23 UTC by Duncan
Modified: 2019-07-16 18:40 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 2019-07-08 09:23:18 UTC
Calculating dependencies            i
... done!
[ebuild   R   *] kde-plasma/libkworkspace-9999:5::kde  USE="-debug -test" 0 KiB
Total: 1 package (1 reinstall), Size of downloads: 0 KiB
Would you like to merge these packages? [Yes/No] 
>>> Verifying ebuild manifests
>>> Emerging (1 of 1) kde-plasma/libkworkspace-9999::kde
* 
* 
* 
>>> Unpacking source...
* Repository id: plasma-workspace.git
* To override fetched repository properties, use:
*   EGIT_OVERRIDE_REPO_PLASMA_WORKSPACE
*   EGIT_OVERRIDE_BRANCH_PLASMA_WORKSPACE
*   EGIT_OVERRIDE_COMMIT_PLASMA_WORKSPACE
*   EGIT_OVERRIDE_COMMIT_DATE_PLASMA_WORKSPACE
* 
* Fetching https://anongit.kde.org/plasma-workspace ...
git fetch https://anongit.kde.org/plasma-workspace +HEAD:refs/git-r3/HEAD
git symbolic-ref refs/git-r3/kde-plasma/libkworkspace/5/__main__ refs/git-r3/HEAD
* Checking out https://anongit.kde.org/plasma-workspace to /tmp/portage/kde-plasma/libkworkspace-9999/work/libkworkspace-9999 ...
git checkout --quiet refs/git-r3/HEAD
GIT update -->
repository:               https://anongit.kde.org/plasma-workspace
at the commit:            bf811e448c76688ea49d6ddab64967cf650e61db
>>> Source unpacked in /tmp/portage/kde-plasma/libkworkspace-9999/work
* 
>>> Preparing source in /tmp/portage/kde-plasma/libkworkspace-9999/work/libkworkspace-9999/libkworkspace ...
* Applying libkworkspace-5.14.90-standalone.patch ...
1 out of 3 hunks FAILED -- saving rejects to file CMakeLists.txt.rej                                                                                  [ !! ]
* ERROR: kde-plasma/libkworkspace-9999::kde failed (prepare phase):
*   patch -p1  failed with /tmp/portage/kde-plasma/libkworkspace-9999/files/libkworkspace-5.14.90-standalone.patch
* 
* Call stack:
*               ebuild.sh, line  125:  Called src_prepare
*             environment, line 3235:  Called kde5_src_prepare
*             environment, line 2668:  Called cmake-utils_src_prepare
*             environment, line 1404:  Called default_src_prepare
*      phase-functions.sh, line  937:  Called __eapi6_src_prepare
*             environment, line  302:  Called eapply '/tmp/portage/kde-plasma/libkworkspace-9999/files/libkworkspace-5.14.90-standalone.patch'
*             environment, line 1589:  Called _eapply_patch '/tmp/portage/kde-plasma/libkworkspace-9999/files/libkworkspace-5.14.90-standalone.patch'
*             environment, line 1527:  Called __helpers_die 'patch -p1  failed with /tmp/portage/kde-plasma/libkworkspace-9999/files/libkworkspace-5.14.90-standalone.patch'
*   isolated-functions.sh, line  119:  Called die
* The specific snippet of code:
*              die "$@"
*

The reject file:

--- CMakeLists.txt
+++ CMakeLists.txt
@@ -65,11 +121,7 @@ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
remove_definitions(-DQT_NO_CAST_TO_ASCII)
.
.
-set(ksmserver_xml  ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
-
-set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
-
qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface )
.
.
Comment 1 Larry the Git Cow gentoo-dev 2019-07-10 10:30:23 UTC
The bug has been referenced in the following commit(s):

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

commit c7314eb2cdafb3c56892c65ad09b1ac9a01ecd1b
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2019-07-10 10:29:53 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2019-07-10 10:29:53 +0000

    kde-plasma/libkworkspace: Rebase standalone-patch on top of HEAD
    
    Bug: https://bugs.gentoo.org/689466
    Package-Manager: Portage-2.3.68, Repoman-2.3.16
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 .../files/libkworkspace-5.16.80-standalone.patch   | 110 +++++++++++++++++++++
 kde-plasma/libkworkspace/libkworkspace-9999.ebuild |   3 +-
 2 files changed, 112 insertions(+), 1 deletion(-)
Comment 2 Andreas Sturmlechner gentoo-dev 2019-07-10 10:37:59 UTC
Quite a lot of changes; unfortunately it means a new dependency from kde-plasma/. This is runtime-untested, please test.
Comment 3 Eugene Shalygin 2019-07-15 10:23:22 UTC
libkworkspace-5.16.80-standalone.patch fails too:

 * Applying libkworkspace-5.16.80-standalone.patch ...
The text leading up to this was:
--------------------------
|From d3413c9a69b186fb20d8b4caf5f48e7d372c5294 Mon Sep 17 00:00:00 2001
|From: Andreas Sturmlechner <asturm@gentoo.org>
|Date: Wed, 10 Jul 2019 11:38:44 +0200
|Subject: [PATCH] libkworkspace: Allow standalone build
|
|---
| libkworkspace/CMakeLists.txt | 69 +++++++++++++++++++++++++++++++++---
| 1 file changed, 65 insertions(+), 4 deletions(-)
|
|diff --git a/libkworkspace/CMakeLists.txt b/libkworkspace/CMakeLists.txt
|index 94576213e..27d46f83a 100644
|--- a/libkworkspace/CMakeLists.txt
|+++ b/libkworkspace/CMakeLists.txt
--------------------------
No file to patch.  Skipping patch.
4 out of 4 hunks ignored
Comment 4 Eugene Shalygin 2019-07-15 10:25:45 UTC
> No file to patch.  Skipping patch.

Probably because S is set to the libkworkspace subdir already.
Comment 5 Andreas Sturmlechner gentoo-dev 2019-07-15 12:09:18 UTC
(In reply to Eugene Shalygin from comment #4)
> Probably because S is set to the libkworkspace subdir already.

Yes, but upstream has changed the code again, meanwhile.
Comment 6 Larry the Git Cow gentoo-dev 2019-07-15 14:52:39 UTC
The bug has been referenced in the following commit(s):

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

commit ba84c4bca4439ae1bb37a797130c52c19b9de329
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2019-07-15 14:52:24 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2019-07-15 14:52:24 +0000

    kde-plasma/libkworkspace: Rebase standalone-patch on top of HEAD
    
    Bug: https://bugs.gentoo.org/689466
    Package-Manager: Portage-2.3.69, Repoman-2.3.16
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 .../files/libkworkspace-5.16.80-standalone.patch           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
Comment 7 Andreas Sturmlechner gentoo-dev 2019-07-16 18:40:53 UTC
Please reopen on repeated upstream breakage or negative runtime testing.