Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package widelands for openSUSE:Factory
checked in at 2025-07-18 15:58:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/widelands (Old)
and /work/SRC/openSUSE:Factory/.widelands.new.8875 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "widelands"
Fri Jul 18 15:58:54 2025 rev:17 rq:1294009 version:1.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/widelands/widelands.changes 2025-04-30
19:05:24.000871491 +0200
+++ /work/SRC/openSUSE:Factory/.widelands.new.8875/widelands.changes
2025-07-18 16:00:00.714183999 +0200
@@ -1,0 +2,11 @@
+Sat Jul 12 16:55:26 UTC 2025 - Carsten Ziepke <kiel...@gmail.com>
+
+- Use pkgconfig(glew) also for Leap 16.0
+
+-------------------------------------------------------------------
+Wed Jul 9 15:51:12 UTC 2025 - Martin Jambor <mjam...@suse.com>
+
+- Add include_missing_cstdint.patch and compile_c_only_libs_with_c11_std.patch
+ to fix building with GCC 15.
+
+-------------------------------------------------------------------
@@ -291 +301,0 @@
-
New:
----
compile_c_only_libs_with_c11_std.patch
include_missing_cstdint.patch
----------(New B)----------
New:
- Add include_missing_cstdint.patch and compile_c_only_libs_with_c11_std.patch
to fix building with GCC 15.
New:
- Add include_missing_cstdint.patch and compile_c_only_libs_with_c11_std.patch
to fix building with GCC 15.
----------(New E)----------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ widelands.spec ++++++
--- /var/tmp/diff_new_pack.sTGLQ4/_old 2025-07-18 16:00:06.146410758 +0200
+++ /var/tmp/diff_new_pack.sTGLQ4/_new 2025-07-18 16:00:06.146410758 +0200
@@ -20,11 +20,11 @@
%if 0%{?sle_version} && 0%{?sle_version} < 160000
%global force_gcc_version 13
%endif
-%if 0%{?suse_version} < 1600
-# Build against glew for Leap 15.X...
+# Build against glew for Leap 15.X, Leap 16.X
+%if 0%{?suse_version} < 1650
%bcond_without glew
%else
-# ...but disable glew and build with glbinding for Tumbleweed, Leap 16.0 and
newer
+# ...but disable glew and build with glbinding for Tumbleweed
%bcond_with glew
%endif
Name: widelands
@@ -34,6 +34,10 @@
License: GPL-2.0-or-later
URL: https://www.widelands.org
Source0:
https://codeberg.org/wl/widelands/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM compile_c_only_libs_with_c11_std.patch
https://github.com/widelands/widelands/issues/6697
+Patch1: compile_c_only_libs_with_c11_std.patch
+# PATCH-FIX-UPSTREAM include_missing_cstdint.patch
https://github.com/widelands/widelands/commit/a6c5a51a15e08894b4260c90a7c08615c495465a
+Patch2: include_missing_cstdint.patch
BuildRequires: cmake >= 3.12
BuildRequires: doxygen
BuildRequires: fdupes
++++++ compile_c_only_libs_with_c11_std.patch ++++++
>From d0c9f68514ee2a71d8924010ec092813aad6d069 Mon Sep 17 00:00:00 2001
From: Benedikt Straub <benedikt-str...@web.de>
Date: Tue, 15 Apr 2025 13:28:28 +0200
Subject: [PATCH] Compile C-only libraries with c11 standard
---
CMakeLists.txt | 3 +++
cmake/WlFunctions.cmake | 3 +++
2 files changed, 6 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 241b85241ca..7e7f7907794 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -276,6 +276,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
endif()
elseif(MSVC)
wl_add_flag(WL_GENERIC_CXX_FLAGS "/std:c++17")
+ wl_add_flag(WL_GENERIC_C_LIBRARY_FLAGS "/std:c11")
# https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/
# Disabled warnings that are overly verbose right now or just do not make
sense.
wl_add_flag(WL_COMPILE_DIAGNOSTICS "/wd4244")
@@ -288,6 +289,7 @@ else()
if(WIN32)
# This is needed for getenv().
wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=gnu++17")
+ wl_add_flag(WL_GENERIC_C_LIBRARY_FLAGS "-std=c11")
if (OPTION_BUILD_WINSTATIC)
set(CMAKE_CXX_STANDARD_LIBRARIES "-static-libgcc -static-libstdc++
${CMAKE_CXX_STANDARD_LIBRARIES}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Bstatic")
@@ -369,6 +371,7 @@ if(NOT MSVC)
endif()
wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++17")
+ wl_add_flag(WL_GENERIC_C_LIBRARY_FLAGS "-std=c11")
endif()
# Cross-compile-unit optimization slows linking significantly.
diff --git a/cmake/WlFunctions.cmake b/cmake/WlFunctions.cmake
index 9a84ba06823..112ce93ef52 100644
--- a/cmake/WlFunctions.cmake
+++ b/cmake/WlFunctions.cmake
@@ -65,6 +65,9 @@ macro(_common_compile_tasks)
# This is needed for header only libraries. While they do not really mean
# anything for cmake, they are useful to make dependencies explicit.
set_target_properties(${NAME} PROPERTIES LINKER_LANGUAGE CXX)
+ else()
+ set(TARGET_COMPILE_FLAGS "${TARGET_COMPILE_FLAGS}
${WL_GENERIC_C_LIBRARY_FLAGS}")
+ set_target_properties(${NAME} PROPERTIES LINKER_LANGUAGE C)
endif()
set(TARGET_COMPILE_FLAGS "${TARGET_COMPILE_FLAGS} ${WL_OPTIMIZE_FLAGS}
${WL_DEBUG_FLAGS}")
++++++ include_missing_cstdint.patch ++++++
>From a6c5a51a15e08894b4260c90a7c08615c495465a Mon Sep 17 00:00:00 2001
From: The Widelands Bunny Bot <bunny...@noreply.codeberg.org>
Date: Sun, 25 Aug 2024 07:38:19 +0000
Subject: [PATCH] include missing <cstdint> (CB #4883 / GH #6522)
Co-authored-by: Sergei Trofimovich <sly...@gmail.com>
---
src/base/format/abstract_node.h | 2 ++
src/logic/map_objects/tribes/training_attribute.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/base/format/abstract_node.h b/src/base/format/abstract_node.h
index 92782a087b5..bc31a137a7d 100644
--- a/src/base/format/abstract_node.h
+++ b/src/base/format/abstract_node.h
@@ -19,6 +19,8 @@
#ifndef WL_BASE_FORMAT_ABSTRACT_NODE_H
#define WL_BASE_FORMAT_ABSTRACT_NODE_H
+#include <cstdint>
+
namespace format_impl {
enum Flags : uint8_t {
diff --git a/src/logic/map_objects/tribes/training_attribute.h
b/src/logic/map_objects/tribes/training_attribute.h
index 5db0ae4fcf1..956defd76b8 100644
--- a/src/logic/map_objects/tribes/training_attribute.h
+++ b/src/logic/map_objects/tribes/training_attribute.h
@@ -19,6 +19,8 @@
#ifndef WL_LOGIC_MAP_OBJECTS_TRIBES_TRAINING_ATTRIBUTE_H
#define WL_LOGIC_MAP_OBJECTS_TRIBES_TRAINING_ATTRIBUTE_H
+#include <cstdint>
+
namespace Widelands {
/**
