diff -Nru compiz-0.9.14.2+22.10.20220822/cmake/CompizCommon.cmake compiz-0.9.14.2+22.10.20220822/cmake/CompizCommon.cmake --- compiz-0.9.14.2+22.10.20220822/cmake/CompizCommon.cmake 2022-08-22 05:54:46.000000000 +0000 +++ compiz-0.9.14.2+22.10.20220822/cmake/CompizCommon.cmake 2023-09-21 23:45:55.000000000 +0000 @@ -54,7 +54,6 @@ # Almost everything is a shared library now, so almost everything needs -fPIC set (COMMON_FLAGS "-fPIC -Wall") -set (COMMON_CXX_FLAGS "-std=c++11") option (COMPIZ_SUBOBJECT_LINKAGE_WARNINGS "Warn about subobject linkage" OFF) if (NOT COMPIZ_SUBOBJECT_LINKAGE_WARNINGS) diff -Nru compiz-0.9.14.2+22.10.20220822/compizconfig/gsettings/mocks/CMakeLists.txt compiz-0.9.14.2+22.10.20220822/compizconfig/gsettings/mocks/CMakeLists.txt --- compiz-0.9.14.2+22.10.20220822/compizconfig/gsettings/mocks/CMakeLists.txt 2022-08-22 05:54:46.000000000 +0000 +++ compiz-0.9.14.2+22.10.20220822/compizconfig/gsettings/mocks/CMakeLists.txt 2023-09-21 23:45:55.000000000 +0000 @@ -8,7 +8,6 @@ ${CMAKE_CURRENT_SOURCE_DIR}/../gsettings_backend_shared ${GLIB_INCLUDE_DIRS}) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") add_library (compizconfig_ccs_gsettings_wrapper_mock STATIC ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_wrapper_mock.cpp diff -Nru compiz-0.9.14.2+22.10.20220822/compizconfig/gsettings/tests/CMakeLists.txt compiz-0.9.14.2+22.10.20220822/compizconfig/gsettings/tests/CMakeLists.txt --- compiz-0.9.14.2+22.10.20220822/compizconfig/gsettings/tests/CMakeLists.txt 2022-08-22 05:54:46.000000000 +0000 +++ compiz-0.9.14.2+22.10.20220822/compizconfig/gsettings/tests/CMakeLists.txt 2023-09-21 23:45:55.000000000 +0000 @@ -16,7 +16,6 @@ if (COMPIZCONFIG_TEST_GSETTINGS_FOUND) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../libcompizconfig/tests) link_directories (${CMAKE_CURRENT_BINARY_DIR}/../testenvironments) diff -Nru compiz-0.9.14.2+22.10.20220822/compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt compiz-0.9.14.2+22.10.20220822/compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt --- compiz-0.9.14.2+22.10.20220822/compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt 2022-08-22 05:54:46.000000000 +0000 +++ compiz-0.9.14.2+22.10.20220822/compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt 2023-09-21 23:45:55.000000000 +0000 @@ -11,7 +11,6 @@ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/) link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/) -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") add_executable (compizconfig_test_ccs_gnome_gsettings_integrated_setting ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_test_ccs_gnome_gsettings_integrated_setting.cpp) diff -Nru compiz-0.9.14.2+22.10.20220822/compizconfig/integration/gnome/tests/CMakeLists.txt compiz-0.9.14.2+22.10.20220822/compizconfig/integration/gnome/tests/CMakeLists.txt --- compiz-0.9.14.2+22.10.20220822/compizconfig/integration/gnome/tests/CMakeLists.txt 2022-08-22 05:54:46.000000000 +0000 +++ compiz-0.9.14.2+22.10.20220822/compizconfig/integration/gnome/tests/CMakeLists.txt 2023-09-21 23:45:55.000000000 +0000 @@ -8,7 +8,6 @@ include_directories (${CMAKE_SOURCE_DIR}/compizconfig/tests) link_directories (${CMAKE_INSTALL_PREFIX}/lib) -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") add_library (compizconfig_ccs_mock_gnome_integrated_setting_composition ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_mock_gnome_integrated_setting_composition.c) diff -Nru compiz-0.9.14.2+22.10.20220822/compizconfig/libcompizconfig/tests/CMakeLists.txt compiz-0.9.14.2+22.10.20220822/compizconfig/libcompizconfig/tests/CMakeLists.txt --- compiz-0.9.14.2+22.10.20220822/compizconfig/libcompizconfig/tests/CMakeLists.txt 2022-08-22 05:54:46.000000000 +0000 +++ compiz-0.9.14.2+22.10.20220822/compizconfig/libcompizconfig/tests/CMakeLists.txt 2023-09-21 23:45:55.000000000 +0000 @@ -9,7 +9,6 @@ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/) link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/) -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") add_definitions (-DCONFIGDIR="${COMPIZCONFIG_CONFIG_DIR}") diff -Nru compiz-0.9.14.2+22.10.20220822/debian/changelog compiz-0.9.14.2+22.10.20220822/debian/changelog --- compiz-0.9.14.2+22.10.20220822/debian/changelog 2023-01-09 18:39:45.000000000 +0000 +++ compiz-0.9.14.2+22.10.20220822/debian/changelog 2023-09-21 23:46:09.000000000 +0000 @@ -1,3 +1,10 @@ +compiz (1:0.9.14.2+22.10.20220822-0ubuntu4) mantic; urgency=medium + + * Fix ftbfs by stopping forcing obsolete c++11. + * Disable Werror. + + -- Dimitri John Ledkov Fri, 22 Sep 2023 00:46:09 +0100 + compiz (1:0.9.14.2+22.10.20220822-0ubuntu3) lunar; urgency=medium * Rebuild against new libprotobuf32. diff -Nru compiz-0.9.14.2+22.10.20220822/debian/rules compiz-0.9.14.2+22.10.20220822/debian/rules --- compiz-0.9.14.2+22.10.20220822/debian/rules 2022-08-22 05:55:24.000000000 +0000 +++ compiz-0.9.14.2+22.10.20220822/debian/rules 2023-09-21 23:46:09.000000000 +0000 @@ -15,18 +15,14 @@ # currently, segfault if CMAKE_BUILD_TYPE=Release export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions -# libgtkmm requires C++-11, and some plugins require libgtkmm, so we do too -# (lp: #1477978) -export DEB_CXXFLAGS_MAINT_APPEND=-std=c++11 - CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' include/core/abiversion.h ) override_dh_auto_configure: # right now, xorg-gtest won't compile on arm. ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures))) - dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_BUILD_TESTING=$(build_testing) -DBUILD_GLES=ON -DBUILD_XORG_GTEST=OFF + dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_BUILD_TESTING=$(build_testing) -DBUILD_GLES=ON -DBUILD_XORG_GTEST=OFF -DCOMPIZ_WERROR=FALSE else - dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_BUILD_TESTING=$(build_testing) + dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_BUILD_TESTING=$(build_testing) -DCOMPIZ_WERROR=FALSE endif override_dh_install: