Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libArcus for openSUSE:Factory
checked in at 2024-11-18 20:00:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libArcus (Old)
and /work/SRC/openSUSE:Factory/.libArcus.new.2017 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libArcus"
Mon Nov 18 20:00:44 2024 rev:23 rq:1224616 version:4.13.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libArcus/libArcus.changes 2023-10-19
22:52:15.949196093 +0200
+++ /work/SRC/openSUSE:Factory/.libArcus.new.2017/libArcus.changes
2024-11-18 20:01:06.652882375 +0100
@@ -1,0 +2,6 @@
+Sun Nov 17 02:34:12 UTC 2024 - Stefan Brüns <stefan.bru...@rwth-aachen.de>
+
+- Add support for protobuf v3.26.x/v26.x, add
+ 0001-Fix-compatibility-for-protobuf-v26.x-and-later.patch
+
+-------------------------------------------------------------------
New:
----
0001-Fix-compatibility-for-protobuf-v26.x-and-later.patch
BETA DEBUG BEGIN:
New:- Add support for protobuf v3.26.x/v26.x, add
0001-Fix-compatibility-for-protobuf-v26.x-and-later.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libArcus.spec ++++++
--- /var/tmp/diff_new_pack.KA5zX7/_old 2024-11-18 20:01:07.440915336 +0100
+++ /var/tmp/diff_new_pack.KA5zX7/_new 2024-11-18 20:01:07.440915336 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libArcus
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -30,6 +30,8 @@
Patch0: libArcus-3.5.1-PyQt5.sip.patch
# PATCH-FIX-UPSTREAM
Patch1: 0001-Use-single-parameter-SetTotalBytesLimit-fix-protobuf.patch
+# PATCH-FIX-OPENSUSE
+Patch2: 0001-Fix-compatibility-for-protobuf-v26.x-and-later.patch
BuildRequires: cmake >= 3.6
BuildRequires: gcc-c++
BuildRequires: protobuf-devel >= 3.0.0
++++++ 0001-Fix-compatibility-for-protobuf-v26.x-and-later.patch ++++++
>From b6874fbd816dddfd00bf60dd56a2d78657fa3eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de>
Date: Sun, 17 Nov 2024 03:12:39 +0100
Subject: [PATCH] Fix compatibility for protobuf v26.x and later
---
src/MessageTypeStore.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/MessageTypeStore.cpp b/src/MessageTypeStore.cpp
index 382a138..866d680 100644
--- a/src/MessageTypeStore.cpp
+++ b/src/MessageTypeStore.cpp
@@ -52,7 +52,11 @@ class ErrorCollector : public
google::protobuf::compiler::MultiFileErrorCollecto
public:
ErrorCollector() : _error_count(0) { }
+#if PROTOBUF_VERSION >= 5026000
+ void RecordError(absl::string_view filename, int line, int column,
absl::string_view message) override
+#else
void AddError(const std::string& filename, int line, int column, const
std::string& message) override
+#endif
{
_stream << "[" << filename << " (" << line << "," << column << ")] "
<< message << std::endl;
_error_count++;
--
2.47.0
