1 |
commit: 108a30eff5e383a41da0285e07d44ed74eb40c88 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 2 10:39:53 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 2 10:42:18 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=108a30ef |
7 |
|
8 |
media-sound/clementine: Fixed build with gcc11 |
9 |
|
10 |
Thanks-to: Jiří Moravec <qjim <AT> volny.cz> |
11 |
Closes: https://bugs.gentoo.org/788607 |
12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
13 |
|
14 |
media-sound/clementine/clementine-1.4.0_rc1.ebuild | 1 + |
15 |
....0_rc1-gcc11-fix-static-assertion-failure.patch | 70 ++++++++++++++++++++++ |
16 |
2 files changed, 71 insertions(+) |
17 |
|
18 |
diff --git a/media-sound/clementine/clementine-1.4.0_rc1.ebuild b/media-sound/clementine/clementine-1.4.0_rc1.ebuild |
19 |
index ef72ab5c0af..620d245f5d3 100644 |
20 |
--- a/media-sound/clementine/clementine-1.4.0_rc1.ebuild |
21 |
+++ b/media-sound/clementine/clementine-1.4.0_rc1.ebuild |
22 |
@@ -108,6 +108,7 @@ DOCS=( Changelog README.md ) |
23 |
|
24 |
PATCHES=( |
25 |
"${FILESDIR}/${P}-QPainterPath_include.patch" #725678 |
26 |
+ "${FILESDIR}/${P}-gcc11-fix-static-assertion-failure.patch" #788607 |
27 |
) |
28 |
|
29 |
src_prepare() { |
30 |
|
31 |
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch b/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch |
32 |
new file mode 100644 |
33 |
index 00000000000..1a492fe5664 |
34 |
--- /dev/null |
35 |
+++ b/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch |
36 |
@@ -0,0 +1,70 @@ |
37 |
+From cfcd0a956e6758624fab0ff20aee9eb08b3df0b3 Mon Sep 17 00:00:00 2001 |
38 |
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@×××××.com> |
39 |
+Date: Wed, 16 Dec 2020 20:03:26 +0100 |
40 |
+Subject: [PATCH] Drop -std=c++0x and -U__STRICT_ANSI__ |
41 |
+MIME-Version: 1.0 |
42 |
+Content-Type: text/plain; charset=UTF-8 |
43 |
+Content-Transfer-Encoding: 8bit |
44 |
+ |
45 |
+This was causing compilation failures, static assertion failed, with GCC 11. |
46 |
+ |
47 |
+Fix #6865 |
48 |
+ |
49 |
+Signed-off-by: Robert-André Mauchin <zebob.m@×××××.com> |
50 |
+--- |
51 |
+ ext/clementine-spotifyblob/CMakeLists.txt | 2 +- |
52 |
+ ext/clementine-tagreader/CMakeLists.txt | 2 +- |
53 |
+ src/CMakeLists.txt | 2 +- |
54 |
+ tests/CMakeLists.txt | 2 +- |
55 |
+ 4 files changed, 4 insertions(+), 4 deletions(-) |
56 |
+ |
57 |
+diff --git a/ext/clementine-spotifyblob/CMakeLists.txt b/ext/clementine-spotifyblob/CMakeLists.txt |
58 |
+index e5342ee5b..6fd551d57 100644 |
59 |
+--- a/ext/clementine-spotifyblob/CMakeLists.txt |
60 |
++++ b/ext/clementine-spotifyblob/CMakeLists.txt |
61 |
+@@ -7,7 +7,7 @@ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob) |
62 |
+ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-common) |
63 |
+ include_directories(${CMAKE_SOURCE_DIR}/src) |
64 |
+ |
65 |
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x -U__STRICT_ANSI__") |
66 |
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option") |
67 |
+ |
68 |
+ link_directories(${SPOTIFY_LIBRARY_DIRS}) |
69 |
+ |
70 |
+diff --git a/ext/clementine-tagreader/CMakeLists.txt b/ext/clementine-tagreader/CMakeLists.txt |
71 |
+index 855e390cf..a48b01450 100644 |
72 |
+--- a/ext/clementine-tagreader/CMakeLists.txt |
73 |
++++ b/ext/clementine-tagreader/CMakeLists.txt |
74 |
+@@ -7,7 +7,7 @@ include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-tagreader) |
75 |
+ include_directories(${CMAKE_SOURCE_DIR}/src) |
76 |
+ include_directories(${CMAKE_BINARY_DIR}/src) |
77 |
+ |
78 |
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x -U__STRICT_ANSI__") |
79 |
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") |
80 |
+ |
81 |
+ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}) |
82 |
+ |
83 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
84 |
+index 627b2e7cb..0bbc775ba 100644 |
85 |
+--- a/src/CMakeLists.txt |
86 |
++++ b/src/CMakeLists.txt |
87 |
+@@ -1,6 +1,6 @@ |
88 |
+ |
89 |
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") |
90 |
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x -U__STRICT_ANSI__") |
91 |
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option") |
92 |
+ |
93 |
+ option(BUILD_WERROR "Build with -Werror" ON) |
94 |
+ |
95 |
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt |
96 |
+index 4474e7be5..ff571fc19 100644 |
97 |
+--- a/tests/CMakeLists.txt |
98 |
++++ b/tests/CMakeLists.txt |
99 |
+@@ -1,6 +1,6 @@ |
100 |
+ cmake_minimum_required(VERSION 2.8.11) |
101 |
+ |
102 |
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fpermissive -Wno-c++11-narrowing -U__STRICT_ANSI__") |
103 |
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -Wno-c++11-narrowing") |
104 |
+ |
105 |
+ if(USE_SYSTEM_GMOCK) |
106 |
+ include_directories(${GMOCK_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS}) |