gentoo resync : 03.07.2021

3 files changed, 73 insertions, 1 deletions

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index fa8abc3a53a2..0f6c788b83f6 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,5 +1,6 @@
 AUX clementine-1.4.0_rc1-QPainterPath_include.patch 1395 BLAKE2B e95d24a03e8a7ce2ff2465d37615a1b7a5ce2d435af4795a7e22f3550807dd939f21993b3c2fd69318326ab4a07ce9a8125177958d0e5ac307cead3a707db5c5 SHA512 ca8125e10712d06ffdbb28311eca33c914dff0fc34e1edc8be4b06778443d4097aad86315360e9915bcb6829f70e33c652ff0745754e02ef4e44860660beac54
+AUX clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch 3349 BLAKE2B dcea69040e8de44746e7e83d9d8024d1133e68915c110e397b262294239b9a8151784ec13d3d5871553c6ba5e5b43d4638dcd3f69a5599ba22696c4ab8fd42f8 SHA512 60dfe7f5e28ede7e1cc5c91fffb2690cd17407e8a4f59e29008d6025e36e38d8f80eb67d49c1c3f4c982c4eea5821c11bd9760cc8d1dadc4706ae7bcc9232d79
 DIST clementine-1.4.0rc1.tar.xz 5593564 BLAKE2B 894d86903df1ba43fca2f07c83d92bcb5d65a0103a4ecd1b321d44259534930c977f0caeaf0c93446dbec4422937f2ddc7f665daa7cb41e5c183fa7f16571809 SHA512 c74102a3ca4a99c3627b718389478e5ca79ba71ce45eccd232ca2eb3fb60a1632afa62908a2831244d6c35154ad6a8b4fa2b2485b4440b9685a0521bfacaabdb
-EBUILD clementine-1.4.0_rc1.ebuild 4917 BLAKE2B 9232e336c94c4e0cfcb2b9240890cc790d69edb4c1ea35df7ec8b0b8469f3a322bacc867612991f9fa3a16fe447d4f54a5572bbb3d267d8299c2e4ba8188431a SHA512 8756bb1915b72f201eeddb5a214127ad6eb2a9342e5a7077011b1a8c3047c65c8d5979ac92aa60a4446150b6dfafb077ae8184210da8fe9eba325d754efb88f3
+EBUILD clementine-1.4.0_rc1.ebuild 4986 BLAKE2B c842a8226afd0aeb0c0f4a0bce747ff1fbfb8e8da62cebea8290d4b0e639085d0bfac68eec48c8e2e63c5286a810193b90d1396ca592f3d2fc1a0140728a68fa SHA512 9396b90dd827ccdae00c0b3d155cc4fe94602faaa2df116f71f02d0b02f477313f582aee7d0eda6b3227c89fc769f43587640fc3bbeea13e369575388d7371bd
 EBUILD clementine-9999.ebuild 4820 BLAKE2B 2fe724b22cc8b7b60e6b71a82fc39c9975e722690905b223f19d910f35ddcd238987dfd5a6cebc63169ee952cd1214e68e1e11768ff281b0ae230a11d0eaf373 SHA512 969c6a71948ce2d59b3074fbe481853ef269168f59a1f9dc74cc1f4cf1508b6c6b726f0b64e4f8c55fdbab14f6c3201064be4033aa4641afd9b1fa53f621a495
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.4.0_rc1.ebuild b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
index ef72ab5c0af0..620d245f5d3a 100644
--- a/media-sound/clementine/clementine-1.4.0_rc1.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
@@ -108,6 +108,7 @@ DOCS=( Changelog README.md )
 
 PATCHES=(
 	"${FILESDIR}/${P}-QPainterPath_include.patch" #725678
+	"${FILESDIR}/${P}-gcc11-fix-static-assertion-failure.patch" #788607
 )
 
 src_prepare() {
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
new file mode 100644
index 000000000000..1a492fe5664c
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch
@@ -0,0 +1,70 @@
+From cfcd0a956e6758624fab0ff20aee9eb08b3df0b3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Wed, 16 Dec 2020 20:03:26 +0100
+Subject: [PATCH] Drop -std=c++0x and -U__STRICT_ANSI__
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This was causing compilation failures, static assertion failed, with GCC 11.
+
+Fix #6865
+
+Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
+---
+ ext/clementine-spotifyblob/CMakeLists.txt | 2 +-
+ ext/clementine-tagreader/CMakeLists.txt   | 2 +-
+ src/CMakeLists.txt                        | 2 +-
+ tests/CMakeLists.txt                      | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/ext/clementine-spotifyblob/CMakeLists.txt b/ext/clementine-spotifyblob/CMakeLists.txt
+index e5342ee5b..6fd551d57 100644
+--- a/ext/clementine-spotifyblob/CMakeLists.txt
++++ b/ext/clementine-spotifyblob/CMakeLists.txt
+@@ -7,7 +7,7 @@ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob)
+ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-common)
+ include_directories(${CMAKE_SOURCE_DIR}/src)
+ 
+-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__")
++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")
+ 
+ link_directories(${SPOTIFY_LIBRARY_DIRS})
+ 
+diff --git a/ext/clementine-tagreader/CMakeLists.txt b/ext/clementine-tagreader/CMakeLists.txt
+index 855e390cf..a48b01450 100644
+--- a/ext/clementine-tagreader/CMakeLists.txt
++++ b/ext/clementine-tagreader/CMakeLists.txt
+@@ -7,7 +7,7 @@ include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-tagreader)
+ include_directories(${CMAKE_SOURCE_DIR}/src)
+ include_directories(${CMAKE_BINARY_DIR}/src)
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x -U__STRICT_ANSI__")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ 
+ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 627b2e7cb..0bbc775ba 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ 
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+-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__")
++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")
+ 
+ option(BUILD_WERROR "Build with -Werror" ON)
+ 
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 4474e7be5..ff571fc19 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ cmake_minimum_required(VERSION 2.8.11)
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fpermissive -Wno-c++11-narrowing -U__STRICT_ANSI__")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -Wno-c++11-narrowing")
+ 
+ if(USE_SYSTEM_GMOCK)
+   include_directories(${GMOCK_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS})