Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/, media-gfx/flameshot/files/
Date: Tue, 04 May 2021 13:30:23
Message-Id: 1620133156.38ac024d53d4f795ad65182e24cdfbf6cf89a064.juippis@gentoo
1 commit: 38ac024d53d4f795ad65182e24cdfbf6cf89a064
2 Author: Pavel Kalugin <pavel <AT> pavelthebest <DOT> me>
3 AuthorDate: Mon May 3 10:02:12 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Tue May 4 12:59:16 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38ac024d
7
8 media-gfx/flameshot: don't force using ccache
9
10 - don't include cmake/Cache.cmake
11
12 Reported-by: josef.95 <josef64 <AT> posteo.org>
13 Closes: https://bugs.gentoo.org/787095
14 Signed-off-by: Pavel Kalugin <pavel <AT> pavelthebest.me>
15 Closes: https://github.com/gentoo/gentoo/pull/20665
16 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
17
18 .../flameshot/files/flameshot-0.9.0-dont-force-ccache.patch | 13 +++++++++++++
19 media-gfx/flameshot/flameshot-0.9.0.ebuild | 1 +
20 2 files changed, 14 insertions(+)
21
22 diff --git a/media-gfx/flameshot/files/flameshot-0.9.0-dont-force-ccache.patch b/media-gfx/flameshot/files/flameshot-0.9.0-dont-force-ccache.patch
23 new file mode 100644
24 index 00000000000..85f43fc6c98
25 --- /dev/null
26 +++ b/media-gfx/flameshot/files/flameshot-0.9.0-dont-force-ccache.patch
27 @@ -0,0 +1,13 @@
28 +diff -ruN a/CMakeLists.txt b/CMakeLists.txt
29 +--- a/CMakeLists.txt 2021-05-03 12:55:07.561259897 +0300
30 ++++ b/CMakeLists.txt 2021-05-03 12:55:36.772461830 +0300
31 +@@ -70,9 +70,6 @@
32 +
33 + add_library(project_warnings INTERFACE)
34 +
35 +-# enable cache system
36 +-include(cmake/Cache.cmake)
37 +-
38 + # standard compiler warnings
39 + include(cmake/CompilerWarnings.cmake)
40 + # set_project_warnings(project_warnings)
41
42 diff --git a/media-gfx/flameshot/flameshot-0.9.0.ebuild b/media-gfx/flameshot/flameshot-0.9.0.ebuild
43 index 2f6c1bbbe3f..0b3b2178cb1 100644
44 --- a/media-gfx/flameshot/flameshot-0.9.0.ebuild
45 +++ b/media-gfx/flameshot/flameshot-0.9.0.ebuild
46 @@ -31,6 +31,7 @@ BDEPEND="
47 RDEPEND="${DEPEND}"
48 PATCHES=(
49 "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
50 + "${FILESDIR}/${P}-dont-force-ccache.patch"
51 )
52
53 src_prepare() {