Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde-sunset:master commit in: media-libs/qimageblitz/files/, media-libs/qimageblitz/
Date: Sun, 16 Aug 2020 15:57:49
Message-Id: 1597593125.b52e7e4890781e173d915c1872c551001a1d5fe0.asturm@gentoo
1 commit: b52e7e4890781e173d915c1872c551001a1d5fe0
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 21 14:46:17 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 16 15:52:05 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=b52e7e48
7
8 media-libs/qimageblitz: Fix build with >=dev-util/cmake-3.15
9
10 Closes: https://bugs.gentoo.org/690360
11 Package-Manager: Portage-2.3.69, Repoman-2.3.16
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 .../qimageblitz/files/qimageblitz-0.0.6_p20131029-cxx11.patch | 11 +++++++++++
15 media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild | 5 ++++-
16 2 files changed, 15 insertions(+), 1 deletion(-)
17
18 diff --git a/media-libs/qimageblitz/files/qimageblitz-0.0.6_p20131029-cxx11.patch b/media-libs/qimageblitz/files/qimageblitz-0.0.6_p20131029-cxx11.patch
19 new file mode 100644
20 index 00000000..da962cd1
21 --- /dev/null
22 +++ b/media-libs/qimageblitz/files/qimageblitz-0.0.6_p20131029-cxx11.patch
23 @@ -0,0 +1,11 @@
24 +--- a/CMakeLists.txt 2017-03-15 00:31:04.000000000 +0100
25 ++++ b/CMakeLists.txt 2019-07-21 16:39:14.365729343 +0200
26 +@@ -14,6 +14,8 @@
27 + set(CMAKE_AUTOMOC ON)
28 + find_package(Qt5Core REQUIRED)
29 + find_package(Qt5Gui REQUIRED)
30 ++ set (CMAKE_CXX_STANDARD 11)
31 ++ set (CMAKE_CXX_EXTENSIONS OFF)
32 + else()
33 + find_package(Qt4 REQUIRED)
34 + # properly set up compile flags (QT_DEBUG/QT_NO_DEBUG, ...)
35
36 diff --git a/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild b/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
37 index 96e5ffaa..2b488b7f 100644
38 --- a/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
39 +++ b/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
40 @@ -27,7 +27,10 @@ DEPEND="
41 "
42 RDEPEND="${DEPEND}"
43
44 -PATCHES=( "${FILESDIR}/${P}-gcc.patch" )
45 +PATCHES=(
46 + "${FILESDIR}/${P}-gcc.patch"
47 + "${FILESDIR}/${P}-cxx11.patch" # bug 690360
48 +)
49
50 src_configure() {
51 local mycmakeargs=(