forwarded 984014 https://github.com/clementine-player/Clementine/issues/6865 tags 984014 + patch thanks
On Wed, Oct 27, 2021 at 11:05:04PM +0300, Alexander Kernozhitsky wrote: > It's worth noting that the upstream has already fixed this bug: > > https://github.com/clementine-player/Clementine/commit/cfcd0a956e6758624fab0ff20aee9eb08b3df0b3 Indeed, and this is tracked in https://github.com/clementine-player/Clementine/issues/6865 where that patch is referenced. FWIW, I can confirm that 1.4.0~rc1+git347-gfc4cb6fc7+dfsg-1 still FTBFS in the manner originally reported in this bug, but with the attached debdiff implementing the fix from upstream I was able to build it again. HTH, and please feel free to adjust to your liking. Cheers, Florian
diff -Nru clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/debian/changelog clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/debian/changelog --- clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/debian/changelog 2020-10-27 11:30:27.000000000 +0100 +++ clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/debian/changelog 2022-01-14 21:44:24.000000000 +0100 @@ -1,3 +1,11 @@ +clementine (1.4.0~rc1+git347-gfc4cb6fc7+dfsg-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with GCC-11 by dropping -std=c++0x and -U__STRICT_ANSI__, + patch taken from upstream. (Closes: #984014) + + -- Florian Ernst <florian_er...@gmx.net> Fri, 14 Jan 2022 21:44:24 +0100 + clementine (1.4.0~rc1+git347-gfc4cb6fc7+dfsg-1) unstable; urgency=medium * New upstream snapshot. diff -Nru clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/debian/patches/fix_gcc11_ftbfs.patch clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/debian/patches/fix_gcc11_ftbfs.patch --- clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/debian/patches/fix_gcc11_ftbfs.patch 1970-01-01 01:00:00.000000000 +0100 +++ clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/debian/patches/fix_gcc11_ftbfs.patch 2022-01-14 21:44:24.000000000 +0100 @@ -0,0 +1,52 @@ +Description: Fix GCC-11 build issue +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=984014 +Index: clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/ext/clementine-spotifyblob/CMakeLists.txt +=================================================================== +--- clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg.orig/ext/clementine-spotifyblob/CMakeLists.txt ++++ clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/ext/clementine-spotifyblob/CMakeLists.txt +@@ -7,7 +7,7 @@ include_directories(${CMAKE_SOURCE_DIR}/ + 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}) + +Index: clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/ext/clementine-tagreader/CMakeLists.txt +=================================================================== +--- clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg.orig/ext/clementine-tagreader/CMakeLists.txt ++++ clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/ext/clementine-tagreader/CMakeLists.txt +@@ -7,7 +7,7 @@ include_directories(${CMAKE_BINARY_DIR}/ + 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}) + +Index: clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/src/CMakeLists.txt +=================================================================== +--- clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg.orig/src/CMakeLists.txt ++++ clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/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 --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") + + option(BUILD_WERROR "Build with -Werror" ON) + +Index: clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/tests/CMakeLists.txt +=================================================================== +--- clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg.orig/tests/CMakeLists.txt ++++ clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/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}) diff -Nru clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/debian/patches/series clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/debian/patches/series --- clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/debian/patches/series 2020-10-16 17:41:29.000000000 +0200 +++ clementine-1.4.0~rc1+git347-gfc4cb6fc7+dfsg/debian/patches/series 2022-01-14 21:42:14.000000000 +0100 @@ -5,3 +5,4 @@ remove-references-to-non-dfsg-files.patch hide_boost_includes_from_q_moc.patch remove_embedded_qsqlite.patch +fix_gcc11_ftbfs.patch