Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/
Date: Sun, 30 Aug 2020 19:02:29
Message-Id: 1598811242.3f9d73b47a2119677a9e4131c68b915934d087dd.asturm@gentoo
1 commit: 3f9d73b47a2119677a9e4131c68b915934d087dd
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 30 18:14:02 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 30 18:14:02 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3f9d73b4
7
8 kde-plasma/kwin: Drop manual sed of ecm_find_qmlmodule
9
10 Obsolete by commit 7f989409cf
11
12 Bug: https://bugs.gentoo.org/640432
13 Package-Manager: Portage-3.0.4, Repoman-3.0.1
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 kde-plasma/kwin/kwin-5.19.49.9999.ebuild | 4 ----
17 kde-plasma/kwin/kwin-9999.ebuild | 4 ----
18 2 files changed, 8 deletions(-)
19
20 diff --git a/kde-plasma/kwin/kwin-5.19.49.9999.ebuild b/kde-plasma/kwin/kwin-5.19.49.9999.ebuild
21 index 11473ce7cb..95a22fb8d6 100644
22 --- a/kde-plasma/kwin/kwin-5.19.49.9999.ebuild
23 +++ b/kde-plasma/kwin/kwin-5.19.49.9999.ebuild
24 @@ -98,10 +98,6 @@ RESTRICT+=" test"
25 src_prepare() {
26 ecm_src_prepare
27 use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
28 -
29 - # Access violations, bug #640432
30 - sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
31 - -i CMakeLists.txt || die
32 }
33
34 src_configure() {
35
36 diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
37 index 92255158e8..16aaece223 100644
38 --- a/kde-plasma/kwin/kwin-9999.ebuild
39 +++ b/kde-plasma/kwin/kwin-9999.ebuild
40 @@ -101,10 +101,6 @@ src_prepare() {
41 ecm_src_prepare
42 use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
43
44 - # Access violations, bug #640432
45 - sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
46 - -i CMakeLists.txt || die
47 -
48 # TODO: try to get a build switch upstreamed
49 if ! use screencast; then
50 sed -e "s/^pkg_check_modules.*PipeWire/#&/" \