diff --git a/0001-Drop-std-c-0x-and-U__STRICT_ANSI__.patch b/0001-Drop-std-c-0x-and-U__STRICT_ANSI__.patch deleted file mode 100644 index eb62257..0000000 --- a/0001-Drop-std-c-0x-and-U__STRICT_ANSI__.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 5472f628c803f3d4c5f62f11fe1d2f9f92237bc7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= -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 ---- - 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}) --- -2.29.2 - diff --git a/clementine.spec b/clementine.spec index 92bbb3e..31d87b8 100644 --- a/clementine.spec +++ b/clementine.spec @@ -29,8 +29,6 @@ Patch11: clementine-qt5-libraries.patch # https://github.com/clementine-player/Clementine/issues/6191 # https://bugzilla.redhat.com/show_bug.cgi?id=1643937 Patch13: 0001-Remove-default-shortcuts.patch -# https://github.com/clementine-player/Clementine/issues/6865 -Patch14: 0001-Drop-std-c-0x-and-U__STRICT_ANSI__.patch BuildConflicts: pkgconfig(gmock) >= 1.6 BuildConflicts: pkgconfig(gtest)