Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pybind11_protobuf for openSUSE:Factory checked in at 2026-04-17 21:03:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pybind11_protobuf (Old) and /work/SRC/openSUSE:Factory/.pybind11_protobuf.new.11940 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pybind11_protobuf" Fri Apr 17 21:03:58 2026 rev:3 rq:1347591 version:0~git20250210.f02a2b7 Changes: -------- --- /work/SRC/openSUSE:Factory/pybind11_protobuf/pybind11_protobuf.changes 2024-11-25 23:20:29.504151124 +0100 +++ /work/SRC/openSUSE:Factory/.pybind11_protobuf.new.11940/pybind11_protobuf.changes 2026-04-17 21:04:28.930385639 +0200 @@ -1,0 +2,10 @@ +Tue Apr 14 23:37:28 UTC 2026 - Stefan Brüns <[email protected]> + +- Update git snapshot to 0~git20250210.f02a2b7 +- Rebase 0006-Add-install-target-for-CMake-builds.patch +- Drop obsolete 0007-CMake-Use-Python-Module.patch +- Add patches: + * 0001-Fix-CMake-variable-scope.patch + * 0001-Fix-for-PB-DescriptorDataBase-API-breaks.patch + +------------------------------------------------------------------- Old: ---- 0007-CMake-Use-Python-Module.patch pybind11_protobuf-0~git20241101.90b1a5b.tar.gz New: ---- 0001-Fix-CMake-variable-scope.patch 0001-Fix-for-PB-DescriptorDataBase-API-breaks.patch pybind11_protobuf-0~git20250210.f02a2b7.tar.gz ----------(Old B)---------- Old:- Rebase 0006-Add-install-target-for-CMake-builds.patch - Drop obsolete 0007-CMake-Use-Python-Module.patch - Add patches: ----------(Old E)---------- ----------(New B)---------- New:- Add patches: * 0001-Fix-CMake-variable-scope.patch * 0001-Fix-for-PB-DescriptorDataBase-API-breaks.patch New: * 0001-Fix-CMake-variable-scope.patch * 0001-Fix-for-PB-DescriptorDataBase-API-breaks.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pybind11_protobuf.spec ++++++ --- /var/tmp/diff_new_pack.xerKOW/_old 2026-04-17 21:04:29.462407418 +0200 +++ /var/tmp/diff_new_pack.xerKOW/_new 2026-04-17 21:04:29.462407418 +0200 @@ -1,7 +1,7 @@ # # spec file for package pybind11_protobuf # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,26 +18,30 @@ %global _lto_cflags %{nil} Name: pybind11_protobuf -Version: 0~git20241101.90b1a5b +Version: 0~git20250210.f02a2b7 Release: 0 Summary: Pybind11 bindings for Protocol Buffers License: BSD-3-Clause URL: https://github.com/pybind/pybind11_protobuf Source: pybind11_protobuf-%{version}.tar.gz # PATCH-FIX-OPENSUSE -Patch5: 0006-Add-install-target-for-CMake-builds.patch +Patch1: 0006-Add-install-target-for-CMake-builds.patch # PATCH-FIX-OPENSUSE -Patch6: 0007-CMake-Use-Python-Module.patch +Patch2: 0001-Fix-for-PB-DescriptorDataBase-API-breaks.patch +# PATCH-FIX-OPENSUSE +Patch3: 0001-Fix-CMake-variable-scope.patch BuildRequires: cmake >= 3.24 BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: protobuf-devel >= 26.0 +BuildRequires: pybind11-abseil-devel +BuildRequires: (protobuf-devel >= 29.2 with protobuf-devel < 35) %if 0%{?sle_version} >= 150500 -BuildRequires: python311-pybind11-devel >= 2.11.1 +BuildRequires: python311-pybind11-devel >= 2.13.6 %else -BuildRequires: python3-pybind11-devel >= 2.11.1 +BuildRequires: python3-pybind11-devel >= 2.13.6 %endif BuildRequires: cmake(absl) >= 20230125 +BuildRequires: cmake(zlib) # TESTS %if 0%{?sle_version} >= 150500 BuildRequires: python311-abseil @@ -60,13 +64,14 @@ %prep %autosetup -p1 -sed -i -e '/protobuf_package_args/ s/4.23.3/5.26.0/g' CMakeLists.txt +sed -i -e '/protobuf/ s/5.29.2/ /g' cmake/dependencies.cmake %build %cmake \ -DUSE_SYSTEM_ABSEIL:BOOL=ON \ -DUSE_SYSTEM_PROTOBUF:BOOL=ON \ -DUSE_SYSTEM_PYBIND:BOOL=ON \ + -DPYBIND11_PROTOBUF_BUILD_TESTING:BOOL=OFF \ %{nil} %cmake_build ++++++ 0001-Fix-CMake-variable-scope.patch ++++++ >From c6be7a30e98fb281afcaf2fdb82bcc89458c394e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> Date: Wed, 15 Apr 2026 11:49:03 +0200 Subject: [PATCH] Fix CMake variable scope find_package(...) in subdirectory scope will not make the targets available at the calling scope, but include will. --- CMakeLists.txt | 2 +- cmake/{dependencies/CMakeLists.txt => dependencies.cmake} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename cmake/{dependencies/CMakeLists.txt => dependencies.cmake} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b6e477..bb6622c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Module) # ============================================================================ # Build dependencies -add_subdirectory(cmake/dependencies dependencies) +include(cmake/dependencies.cmake) set(TOP_LEVEL_DIR ${CMAKE_CURRENT_LIST_DIR}) include_directories(${TOP_LEVEL_DIR} ${pybind11_INCLUDE_DIRS}) diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies.cmake similarity index 100% rename from cmake/dependencies/CMakeLists.txt rename to cmake/dependencies.cmake -- 2.53.0 ++++++ 0001-Fix-for-PB-DescriptorDataBase-API-breaks.patch ++++++ >From 05542a0d5abe6643b92c8059fc20f2cf0b768eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> Date: Wed, 15 Apr 2026 11:39:32 +0200 Subject: [PATCH] Fix for PB DescriptorDataBase API breaks --- pybind11_protobuf/proto_cast_util.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pybind11_protobuf/proto_cast_util.cc b/pybind11_protobuf/proto_cast_util.cc index 5ca857b..4e3fdcc 100644 --- a/pybind11_protobuf/proto_cast_util.cc +++ b/pybind11_protobuf/proto_cast_util.cc @@ -347,6 +347,14 @@ class PythonDescriptorPoolWrapper { // Similar to DescriptorPoolDatabase: wraps a Python DescriptorPool // as a DescriptorDatabase. class DescriptorPoolDatabase : public DescriptorDatabase { + protected: + #if PROTOBUF_VERSION >= 6034000 + using PbStringViewArg = absl::string_view; + #elif PROTOBUF_VERSION >= 6031000 + using PbStringViewArg = StringViewArg; + #else + using PbStringViewArg = const std::string&; + #endif public: DescriptorPoolDatabase(py::object python_pool) : pool_(std::move(python_pool)) {} @@ -355,7 +363,7 @@ class PythonDescriptorPoolWrapper { // the Python DescriptorPool. // Find a file by file name. - bool FindFileByName(const std::string& filename, + bool FindFileByName(PbStringViewArg filename, FileDescriptorProto* output) override { try { auto file = pool_.attr("FindFileByName")(filename); @@ -371,7 +379,7 @@ class PythonDescriptorPoolWrapper { } // Find the file that declares the given fully-qualified symbol name. - bool FindFileContainingSymbol(const std::string& symbol_name, + bool FindFileContainingSymbol(PbStringViewArg symbol_name, FileDescriptorProto* output) override { try { auto file = pool_.attr("FindFileContainingSymbol")(symbol_name); @@ -389,7 +397,7 @@ class PythonDescriptorPoolWrapper { // Find the file which defines an extension extending the given message type // with the given field number. - bool FindFileContainingExtension(const std::string& containing_type, + bool FindFileContainingExtension(PbStringViewArg containing_type, int field_number, FileDescriptorProto* output) override { try { -- 2.53.0 ++++++ 0006-Add-install-target-for-CMake-builds.patch ++++++ --- /var/tmp/diff_new_pack.xerKOW/_old 2026-04-17 21:04:29.510409383 +0200 +++ /var/tmp/diff_new_pack.xerKOW/_new 2026-04-17 21:04:29.514409547 +0200 @@ -1,22 +1,24 @@ -From 23dbb17ee57e79d60ad46f46988f45eb798a338c Mon Sep 17 00:00:00 2001 +From 6e643f8417dca60bc005f5166aca6c50b60a614f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> Date: Thu, 16 May 2024 01:04:58 +0200 -Subject: [PATCH 6/7] Add install target for CMake builds +Subject: [PATCH] Add install target for CMake builds --- - CMakeLists.txt | 53 +++++++++++++++++++++++++++++++++++++++++++ - cmake/Config.cmake.in | 11 +++++++++ - 2 files changed, 64 insertions(+) + CMakeLists.txt | 13 +++++++++++ + cmake/Config.cmake.in | 13 +++++++++++ + pybind11_protobuf/CMakeLists.txt | 38 ++++++++++++++++++++++++++++++++ + 3 files changed, 64 insertions(+) create mode 100644 cmake/Config.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4514f34..100bbf8 100644 +index 4ec0f64..2b6e477 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -81,6 +81,19 @@ list(APPEND CMAKE_MESSAGE_INDENT " ") - FetchContent_MakeAvailable(absl Protobuf pybind11) - list(POP_BACK CMAKE_MESSAGE_INDENT) - +@@ -39,3 +39,16 @@ add_subdirectory(cmake/dependencies dependencies) + set(TOP_LEVEL_DIR ${CMAKE_CURRENT_LIST_DIR}) + include_directories(${TOP_LEVEL_DIR} ${pybind11_INCLUDE_DIRS}) + add_subdirectory(pybind11_protobuf) ++ +# ============================================================================ +# pybind11_protobuf CMake Config module +include(CMakePackageConfigHelpers) @@ -29,16 +31,37 @@ + "${CMAKE_CURRENT_BINARY_DIR}/pybind11_protobuf-config.cmake" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pybind11_protobuf +) +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +new file mode 100644 +index 0000000..04b4bc8 +--- /dev/null ++++ b/cmake/Config.cmake.in +@@ -0,0 +1,13 @@ ++@PACKAGE_INIT@ + - # ============================================================================ - # pybind11_proto_utils pybind11 extension module - pybind11_add_module( -@@ -114,6 +127,28 @@ target_sources( - pybind11_protobuf/proto_cast_util.h - pybind11_protobuf/proto_caster_impl.h) - -+add_library(pybind11_protobuf::native ALIAS pybind11_native_proto_caster) ++set(_pybind11_protobuf_supported_components native wrapped) + ++foreach(_comp ${pybind11_protobuf_FIND_COMPONENTS}) ++ if (NOT _comp IN_LIST _pybind11_protobuf_supported_components) ++ set(pybind11_protobuf_FOUND False) ++ set(pybind11_protobuf_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}") ++ endif() ++endforeach() ++foreach(_comp ${_pybind11_protobuf_supported_components}) ++ include("${CMAKE_CURRENT_LIST_DIR}/pybind11_protobuf_${_comp}-targets.cmake") ++endforeach() +diff --git a/pybind11_protobuf/CMakeLists.txt b/pybind11_protobuf/CMakeLists.txt +index 7a9cdc1..dd8aefb 100644 +--- a/pybind11_protobuf/CMakeLists.txt ++++ b/pybind11_protobuf/CMakeLists.txt +@@ -26,9 +26,30 @@ add_library( + proto_cast_util.cc + proto_cast_util.h + proto_caster_impl.h) ++ + add_library(pybind11_protobuf::pybind11_native_proto_caster ALIAS + pybind11_native_proto_caster) + +install(TARGETS pybind11_native_proto_caster + EXPORT pybind11_protobuf_native_targets + DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -46,11 +69,11 @@ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/pybind11_protobuf +) +install(FILES -+ pybind11_protobuf/native_proto_caster.h -+ pybind11_protobuf/check_unknown_fields.h -+ pybind11_protobuf/enum_type_caster.h -+ pybind11_protobuf/proto_caster_impl.h -+ pybind11_protobuf/proto_cast_util.h ++ native_proto_caster.h ++ check_unknown_fields.h ++ enum_type_caster.h ++ proto_caster_impl.h ++ proto_cast_util.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/pybind11_protobuf +) +install(EXPORT pybind11_protobuf_native_targets @@ -61,13 +84,15 @@ + target_link_libraries( pybind11_native_proto_caster - absl::flat_hash_map -@@ -152,6 +187,24 @@ target_sources( - pybind11_protobuf/proto_cast_util.h - pybind11_protobuf/proto_caster_impl.h) - -+add_library(pybind11_protobuf::wrapped ALIAS pybind11_wrapped_proto_caster) + PUBLIC absl::flat_hash_map +@@ -50,9 +71,26 @@ add_library( + wrapped_proto_caster.h + # bazel: pybind_library: proto_cast_util + proto_cast_util.cc proto_cast_util.h proto_caster_impl.h) + + add_library(pybind11_protobuf::pybind11_wrapped_proto_caster ALIAS + pybind11_wrapped_proto_caster) + +install(TARGETS pybind11_wrapped_proto_caster + EXPORT pybind11_protobuf_wrapped_targets + DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -75,7 +100,7 @@ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/pybind11_protobuf +) +install(FILES -+ pybind11_protobuf/wrapped_proto_caster.h ++ wrapped_proto_caster.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/pybind11_protobuf +) +install(EXPORT pybind11_protobuf_wrapped_targets @@ -86,27 +111,8 @@ + target_link_libraries( pybind11_wrapped_proto_caster - absl::flat_hash_map -diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in -new file mode 100644 -index 0000000..c59048c ---- /dev/null -+++ b/cmake/Config.cmake.in -@@ -0,0 +1,13 @@ -+@PACKAGE_INIT@ -+ -+set(_pybind11_protobuf_supported_components native wrapped) -+ -+foreach(_comp ${pybind11_protobuf_FIND_COMPONENTS}) -+ if (NOT _comp IN_LIST _pybind11_protobuf_supported_components) -+ set(pybind11_protobuf_FOUND False) -+ set(pybind11_protobuf_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}") -+ endif() -+endforeach() -+foreach(_comp ${_pybind11_protobuf_supported_components}) -+ include("${CMAKE_CURRENT_LIST_DIR}/pybind11_protobuf_${_comp}-targets.cmake") -+endforeach() + PUBLIC absl::flat_hash_map -- -2.45.0 +2.53.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.xerKOW/_old 2026-04-17 21:04:29.538410529 +0200 +++ /var/tmp/diff_new_pack.xerKOW/_new 2026-04-17 21:04:29.542410693 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/pybind/pybind11_protobuf.git</param> <param name="scm">git</param> <param name="filename">pybind11_protobuf</param> - <param name="revision">90b1a5b9de76</param> + <param name="revision">f02a2b7653bc</param> <param name="versionformat">0~git%cd.%h</param> </service> <service name="recompress" mode="manual"> ++++++ pybind11_protobuf-0~git20241101.90b1a5b.tar.gz -> pybind11_protobuf-0~git20250210.f02a2b7.tar.gz ++++++ ++++ 2084 lines of diff (skipped)
