Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package warzone2100 for openSUSE:Factory checked in at 2022-05-25 20:35:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/warzone2100 (Old) and /work/SRC/openSUSE:Factory/.warzone2100.new.2254 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "warzone2100" Wed May 25 20:35:29 2022 rev:21 rq:979236 version:4.2.7 Changes: -------- --- /work/SRC/openSUSE:Factory/warzone2100/warzone2100.changes 2022-03-11 11:37:31.526355910 +0100 +++ /work/SRC/openSUSE:Factory/.warzone2100.new.2254/warzone2100.changes 2022-05-25 20:36:11.120363539 +0200 @@ -1,0 +2,7 @@ +Mon May 23 04:41:54 UTC 2022 - Carsten Ziepke <[email protected]> + +- Add warzone2100-temporarily-disable-Wnull-dereference-on-gcc12.patch + and warzone2100-silence-gcc12-warning.patch, fixes building with + gcc12: gh#Warzone2100/warzone2100/#2698 + +------------------------------------------------------------------- New: ---- warzone2100-silence-gcc12-warning.patch warzone2100-temporarily-disable-Wnull-dereference-on-gcc12.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ warzone2100.spec ++++++ --- /var/tmp/diff_new_pack.V7mOI1/_old 2022-05-25 20:36:12.928366062 +0200 +++ /var/tmp/diff_new_pack.V7mOI1/_new 2022-05-25 20:36:12.932366067 +0200 @@ -32,6 +32,10 @@ URL: http://wz2100.net/ Source: https://github.com/Warzone2100/warzone2100/releases/download/%{version}/warzone2100_src.tar.xz Source99: %{name}.changes +# PATCH-FIX-UPSTREAM warzone2100-temporarily-disable-Wnull-dereference-on-gcc12.patch -- Fix building with gcc12 -- https://github.com/Warzone2100/warzone2100/commit/3128eee +Patch0: warzone2100-temporarily-disable-Wnull-dereference-on-gcc12.patch +# PATCH-FIX-UPSTREAM warzone2100-silence-gcc12-warning.patch -- Fix building with gcc12 -- https://github.com/Warzone2100/warzone2100/commit/5d71117 +Patch1: warzone2100-silence-gcc12-warning.patch BuildRequires: asciidoc BuildRequires: cmake >= 3.5 BuildRequires: fdupes @@ -108,6 +112,8 @@ %prep %setup -q -n %{name} +%patch0 -p1 +%patch1 -p1 # constant timestamp for reproducible builds modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE99}")" ++++++ warzone2100-silence-gcc12-warning.patch ++++++ >From 5d711172962bb8a91cc1cdce4704e2d9745e79f8 Mon Sep 17 00:00:00 2001 From: past-due <[email protected]> Date: Fri, 13 May 2022 16:45:21 -0400 Subject: [PATCH] cheat.cpp: Silence GCC 12 warning --- src/cheat.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/cheat.cpp b/src/cheat.cpp index 547cc090898..fd0b83edff4 100644 --- a/src/cheat.cpp +++ b/src/cheat.cpp @@ -182,6 +182,11 @@ void sendProcessDebugMappings(bool val) NETend(); } +#if !defined(__clang__) && defined(__GNUC__) && (12 <= __GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Warray-bounds" +#endif + static std::string getWantedDebugMappingStatuses(const DebugInputManager& dbgInputManager, bool bStatus) { char ret[MAX_PLAYERS + 1] = "\0"; @@ -198,6 +203,10 @@ static std::string getWantedDebugMappingStatuses(const DebugInputManager& dbgInp return ret; } +#if !defined(__clang__) && defined(__GNUC__) && (12 <= __GNUC__) +# pragma GCC diagnostic pop +#endif + void recvProcessDebugMappings(NETQUEUE queue) { bool val = false; ++++++ warzone2100-temporarily-disable-Wnull-dereference-on-gcc12.patch ++++++ >From 3128eee9a8be531734c29533649d0c014e5725ac Mon Sep 17 00:00:00 2001 From: past-due <[email protected]> Date: Fri, 13 May 2022 19:53:41 -0400 Subject: [PATCH] [CMake] Temporarily disable Wnull-dereference on GCC 12 Until the issues with this warning are fixed --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8af404dc27..31c4253d9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -550,8 +550,11 @@ macro(CONFIGURE_WZ_COMPILER_WARNINGS) # check_compiler_flags_output("-Werror -Wuseless-cast -Wno-error=cpp" COMPILER_TYPE CXX OUTPUT_FLAGS "-Wuseless-cast" OUTPUT_VARIABLE _supported_cxx_compiler_flags APPEND) # -Wnull-dereference (GCC 6.0+, Clang 3.2+) + # Temporary: Do not enable for GCC 12+ (issues with nlohmann::json + GCC 12.1 + Wnull-dereference) + if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0) check_compiler_flags_output("-Werror -Wnull-dereference -Wno-error=cpp" COMPILER_TYPE C OUTPUT_FLAGS "-Wnull-dereference" OUTPUT_VARIABLE _supported_c_compiler_flags APPEND) check_compiler_flags_output("-Werror -Wnull-dereference -Wno-error=cpp" COMPILER_TYPE CXX OUTPUT_FLAGS "-Wnull-dereference" OUTPUT_VARIABLE _supported_cxx_compiler_flags APPEND) + endif() # -Wduplicated-cond (GCC 6.0+) check_compiler_flags_output("-Werror -Wduplicated-cond -Wno-error=cpp" COMPILER_TYPE C OUTPUT_FLAGS "-Wduplicated-cond" OUTPUT_VARIABLE _supported_c_compiler_flags APPEND)
