June 2023 - openSUSE Commits - openSUSE Mailing Lists

commit abseil-cpp for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package abseil-cpp for openSUSE:Factory checked in at 2023-06-30 19:58:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/abseil-cpp (Old) and /work/SRC/openSUSE:Factory/.abseil-cpp.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "abseil-cpp" Fri Jun 30 19:58:23 2023 rev:29 rq:1095946 version:20230125.3 Changes: -------- --- /work/SRC/openSUSE:Factory/abseil-cpp/abseil-cpp.changes 2023-05-28 19:21:35.600516030 +0200 +++ /work/SRC/openSUSE:Factory/.abseil-cpp.new.13546/abseil-cpp.changes 2023-06-30 19:58:38.937563786 +0200 @@ -1,0 +2,5 @@ +Thu Jun 29 09:52:24 UTC 2023 - Fabian Vogt <fvogt(a)suse.com> + +- Add baselibs.conf to make protobuf happy. Hopefully temporary. + +------------------------------------------------------------------- New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abseil-cpp.spec ++++++ --- /var/tmp/diff_new_pack.5k4TSx/_old 2023-06-30 19:58:39.817569020 +0200 +++ /var/tmp/diff_new_pack.5k4TSx/_new 2023-06-30 19:58:39.821569044 +0200 @@ -24,6 +24,7 @@ License: Apache-2.0 URL: https://abseil.io/ Source0: https://github.com/abseil/abseil-cpp/archive/%{version}.tar.gz#/%{name}-%{v… +Source1: baselibs.conf BuildRequires: c++_compiler BuildRequires: cmake BuildRequires: fdupes ++++++ baselibs.conf ++++++ libabsl2301_0_0

1 0

commit python-cryptography-vectors for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-cryptography-vectors for openSUSE:Factory checked in at 2023-06-30 19:58:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cryptography-vectors (Old) and /work/SRC/openSUSE:Factory/.python-cryptography-vectors.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-cryptography-vectors" Fri Jun 30 19:58:22 2023 rev:28 rq:1096023 version:41.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-cryptography-vectors/python-cryptography-vectors.changes 2023-06-27 23:16:00.523159294 +0200 +++ /work/SRC/openSUSE:Factory/.python-cryptography-vectors.new.13546/python-cryptography-vectors.changes 2023-06-30 19:58:37.241553698 +0200 @@ -4 +4 @@ -- update to 41.0.1: +- update to 41.0.1 (bsc#1212568): ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit grpc for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package grpc for openSUSE:Factory checked in at 2023-06-30 19:58:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grpc (Old) and /work/SRC/openSUSE:Factory/.grpc.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grpc" Fri Jun 30 19:58:22 2023 rev:57 rq:1095799 version:1.56.0 Changes: -------- --- /work/SRC/openSUSE:Factory/grpc/grpc.changes 2023-05-09 15:02:07.377769915 +0200 +++ /work/SRC/openSUSE:Factory/.grpc.new.13546/grpc.changes 2023-06-30 19:58:36.169547323 +0200 @@ -1,0 +2,20 @@ +Wed Jun 28 07:09:25 UTC 2023 - Fabian Vogt <fvogt(a)suse.com> + +- Remove unnecessary BuildRequires: zypper + +------------------------------------------------------------------- +Mon Jun 19 03:28:40 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 1.56.0 + * core: Add support for vsock transport. + * EventEngine: Change TXT lookup result type to + std::vector<std::string>. + * C++/Authz: support customizable audit functionality for + authorization policy. + +------------------------------------------------------------------- +Tue Jun 13 21:09:27 UTC 2023 - Dirk M��ller <dmueller(a)suse.com> + +- pin to protobuf < 22 until next version update + +------------------------------------------------------------------- Old: ---- v1.54.1.tar.gz New: ---- v1.56.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grpc.spec ++++++ --- /var/tmp/diff_new_pack.RIBx2O/_old 2023-06-30 19:58:37.033552462 +0200 +++ /var/tmp/diff_new_pack.RIBx2O/_new 2023-06-30 19:58:37.037552485 +0200 @@ -16,11 +16,11 @@ # -%define lver 31 -%define lverp 1_54 +%define lver 33 +%define lverp 1_56 %define src_install_dir /usr/src/%name Name: grpc -Version: 1.54.1 +Version: 1.56.0 Release: 0 Summary: HTTP/2-based Remote Procedure Call implementation License: Apache-2.0 @@ -34,10 +34,9 @@ BuildRequires: gcc-c++ BuildRequires: opencensus-proto-source BuildRequires: pkg-config -BuildRequires: zypper -BuildRequires: pkgconfig(libcares) +BuildRequires: pkgconfig(libcares) >= 1.13.0 BuildRequires: pkgconfig(openssl) >= 1.0.1 -BuildRequires: pkgconfig(protobuf) >= 3.8.0 +BuildRequires: pkgconfig(protobuf) >= 22 BuildRequires: pkgconfig(re2) BuildRequires: pkgconfig(zlib) ++++++ v1.54.1.tar.gz -> v1.56.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/grpc/v1.54.1.tar.gz /work/SRC/openSUSE:Factory/.grpc.new.13546/v1.56.0.tar.gz differ: char 13, line 1

1 0

commit libzypp for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2023-06-30 19:58:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp" Fri Jun 30 19:58:21 2023 rev:475 rq:1095787 version:17.31.15 Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2023-06-20 16:40:02.356361678 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp.new.13546/libzypp.changes 2023-06-30 19:58:32.821527409 +0200 @@ -1,0 +2,11 @@ +Wed Jun 28 12:34:18 CEST 2023 - ma(a)suse.de + +- Fix build against protobuf >= 22 (fixes #465, closes #466) + Port away from protobuf_generate_cpp. Upstream protobuf does not + export protobuf_generate_cpp by default anymore. + Use protobuf_generate instead, which is also available on older + versions. +- Remove SUSE < SLE11 constructs (fixes #464). +- version 17.31.15 (22) + +------------------------------------------------------------------- Old: ---- libzypp-17.31.14.tar.bz2 New: ---- libzypp-17.31.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.wlsoMW/_old 2023-06-30 19:58:33.693532596 +0200 +++ /var/tmp/diff_new_pack.wlsoMW/_new 2023-06-30 19:58:33.701532643 +0200 @@ -42,7 +42,7 @@ %bcond_with enable_preview_single_rpmtrans_as_default_for_zypper Name: libzypp -Version: 17.31.14 +Version: 17.31.15 Release: 0 License: GPL-2.0-or-later URL: https://github.com/openSUSE/libzypp @@ -101,12 +101,8 @@ %endif BuildRequires: libsolv-devel >= 0.7.24 -%if 0%{?suse_version} >= 1100 BuildRequires: libsolv-tools %requires_eq libsolv-tools -%else -Requires: libsolv-tools -%endif BuildRequires: glib2-devel BuildRequires: libsigc++2-devel @@ -148,18 +144,12 @@ %endif %define min_curl_version 7.19.4 +BuildRequires: libcurl-devel >= %{min_curl_version} %if 0%{?suse_version} -%if 0%{?suse_version} >= 1100 # Code11+ -BuildRequires: libcurl-devel >= %{min_curl_version} Requires: libcurl4 >= %{min_curl_version} %else -# Code10 -BuildRequires: curl-devel -%endif -%else # Other distros (Fedora) -BuildRequires: libcurl-devel >= %{min_curl_version} Requires: libcurl >= %{min_curl_version} %endif @@ -219,18 +209,13 @@ Requires: zlib-devel Requires: libudev-devel %if 0%{?suse_version} -%if 0%{?suse_version} >= 1100 # Code11+ Requires: libcurl-devel >= %{min_curl_version} %else -# Code10 -Requires: curl-devel -%endif -%else # Other distros (Fedora) Requires: libcurl-devel >= %{min_curl_version} %endif -%if 0%{?suse_version} >= 1100 +%if 0%{?suse_version} %requires_ge libsolv-devel %else Requires: libsolv-devel ++++++ libzypp-17.31.14.tar.bz2 -> libzypp-17.31.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/CMakeLists.txt new/libzypp-17.31.15/CMakeLists.txt --- old/libzypp-17.31.14/CMakeLists.txt 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/CMakeLists.txt 2023-06-28 12:42:04.000000000 +0200 @@ -207,7 +207,13 @@ INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) ENDIF( NOT ZLIB_FOUND) -FIND_PACKAGE(Protobuf REQUIRED) +# CMake's own FindProtobuf is not compatible with protobuf >= 22, +# so force using protobuf's own CMake module. +FIND_PACKAGE(Protobuf CONFIG) +if ( NOT Protobuf_FOUND) + # Protobuf's own CMake module not found, fall back to CMake's + FIND_PACKAGE(Protobuf REQUIRED) +endif() SET( Protobuf_IMPORT_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ) if ( "${Protobuf_VERSION}" VERSION_LESS "3.8.0") message("Protobuf ${Protobuf_VERSION} has no ZeroCopyStreams, using internal version.") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/VERSION.cmake new/libzypp-17.31.15/VERSION.cmake --- old/libzypp-17.31.14/VERSION.cmake 2023-06-15 12:42:04.000000000 +0200 +++ new/libzypp-17.31.15/VERSION.cmake 2023-06-28 12:42:04.000000000 +0200 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "17") SET(LIBZYPP_COMPATMINOR "22") SET(LIBZYPP_MINOR "31") -SET(LIBZYPP_PATCH "14") +SET(LIBZYPP_PATCH "15") # -# LAST RELEASED: 17.31.14 (22) +# LAST RELEASED: 17.31.15 (22) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/cmake/modules/FindProtobuf.cmake new/libzypp-17.31.15/cmake/modules/FindProtobuf.cmake --- old/libzypp-17.31.14/cmake/modules/FindProtobuf.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-17.31.15/cmake/modules/FindProtobuf.cmake 2023-06-28 12:42:04.000000000 +0200 @@ -0,0 +1,663 @@ +# Distributed under the OSI-approved BSD 3-Clause License. See accompanying +# file Copyright.txt or https://cmake.org/licensing for details. + +#[=======================================================================[.rst: +FindProtobuf +------------ + +Locate and configure the Google Protocol Buffers library. + +The following variables can be set and are optional: + +``Protobuf_SRC_ROOT_FOLDER`` + When compiling with MSVC, if this cache variable is set + the protobuf-default VS project build locations + (vsprojects/Debug and vsprojects/Release + or vsprojects/x64/Debug and vsprojects/x64/Release) + will be searched for libraries and binaries. +``Protobuf_IMPORT_DIRS`` + List of additional directories to be searched for + imported .proto files. +``Protobuf_DEBUG`` + Show debug messages. +``Protobuf_USE_STATIC_LIBS`` + Set to ON to force the use of the static libraries. + Default is OFF. + +Defines the following variables: + +``Protobuf_FOUND`` + Found the Google Protocol Buffers library + (libprotobuf & header files) +``Protobuf_VERSION`` + Version of package found. +``Protobuf_INCLUDE_DIRS`` + Include directories for Google Protocol Buffers +``Protobuf_LIBRARIES`` + The protobuf libraries +``Protobuf_PROTOC_LIBRARIES`` + The protoc libraries +``Protobuf_LITE_LIBRARIES`` + The protobuf-lite libraries + +The following :prop_tgt:`IMPORTED` targets are also defined: + +``protobuf::libprotobuf`` + The protobuf library. +``protobuf::libprotobuf-lite`` + The protobuf lite library. +``protobuf::libprotoc`` + The protoc library. +``protobuf::protoc`` + The protoc compiler. + +The following cache variables are also available to set or use: + +``Protobuf_LIBRARY`` + The protobuf library +``Protobuf_PROTOC_LIBRARY`` + The protoc library +``Protobuf_INCLUDE_DIR`` + The include directory for protocol buffers +``Protobuf_PROTOC_EXECUTABLE`` + The protoc compiler +``Protobuf_LIBRARY_DEBUG`` + The protobuf library (debug) +``Protobuf_PROTOC_LIBRARY_DEBUG`` + The protoc library (debug) +``Protobuf_LITE_LIBRARY`` + The protobuf lite library +``Protobuf_LITE_LIBRARY_DEBUG`` + The protobuf lite library (debug) + +Example: + +.. code-block:: cmake + + find_package(Protobuf REQUIRED) + include_directories(${Protobuf_INCLUDE_DIRS}) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS foo.proto) + protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS EXPORT_MACRO DLL_EXPORT foo.proto) + protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS DESCRIPTORS PROTO_DESCS foo.proto) + protobuf_generate_python(PROTO_PY foo.proto) + add_executable(bar bar.cc ${PROTO_SRCS} ${PROTO_HDRS}) + target_link_libraries(bar ${Protobuf_LIBRARIES}) + +.. note:: + The ``protobuf_generate_cpp`` and ``protobuf_generate_python`` + functions and :command:`add_executable` or :command:`add_library` + calls only work properly within the same directory. + +.. command:: protobuf_generate_cpp + + Add custom commands to process ``.proto`` files to C++:: + + protobuf_generate_cpp (<SRCS> <HDRS> + [DESCRIPTORS <DESC>] [EXPORT_MACRO <MACRO>] [<ARGN>...]) + + ``SRCS`` + Variable to define with autogenerated source files + ``HDRS`` + Variable to define with autogenerated header files + ``DESCRIPTORS`` + Variable to define with autogenerated descriptor files, if requested. + ``EXPORT_MACRO`` + is a macro which should expand to ``__declspec(dllexport)`` or + ``__declspec(dllimport)`` depending on what is being compiled. + ``ARGN`` + ``.proto`` files + +.. command:: protobuf_generate_python + + Add custom commands to process ``.proto`` files to Python:: + + protobuf_generate_python (<PY> [<ARGN>...]) + + ``PY`` + Variable to define with autogenerated Python files + ``ARGN`` + ``.proto`` files +#]=======================================================================] + +function(protobuf_generate) + set(_options APPEND_PATH DESCRIPTORS) + set(_singleargs LANGUAGE OUT_VAR EXPORT_MACRO PROTOC_OUT_DIR) + if(COMMAND target_sources) + list(APPEND _singleargs TARGET) + endif() + set(_multiargs PROTOS IMPORT_DIRS GENERATE_EXTENSIONS) + + cmake_parse_arguments(protobuf_generate "${_options}" "${_singleargs}" "${_multiargs}" "${ARGN}") + + if(NOT protobuf_generate_PROTOS AND NOT protobuf_generate_TARGET) + message(SEND_ERROR "Error: protobuf_generate called without any targets or source files") + return() + endif() + + if(NOT protobuf_generate_OUT_VAR AND NOT protobuf_generate_TARGET) + message(SEND_ERROR "Error: protobuf_generate called without a target or output variable") + return() + endif() + + if(NOT protobuf_generate_LANGUAGE) + set(protobuf_generate_LANGUAGE cpp) + endif() + string(TOLOWER ${protobuf_generate_LANGUAGE} protobuf_generate_LANGUAGE) + + if(NOT protobuf_generate_PROTOC_OUT_DIR) + set(protobuf_generate_PROTOC_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}) + endif() + + if(protobuf_generate_EXPORT_MACRO AND protobuf_generate_LANGUAGE STREQUAL cpp) + set(_dll_export_decl "dllexport_decl=${protobuf_generate_EXPORT_MACRO}:") + endif() + + if(NOT protobuf_generate_GENERATE_EXTENSIONS) + if(protobuf_generate_LANGUAGE STREQUAL cpp) + set(protobuf_generate_GENERATE_EXTENSIONS .pb.h .pb.cc) + elseif(protobuf_generate_LANGUAGE STREQUAL python) + set(protobuf_generate_GENERATE_EXTENSIONS _pb2.py) + else() + message(SEND_ERROR "Error: protobuf_generate given unknown Language ${LANGUAGE}, please provide a value for GENERATE_EXTENSIONS") + return() + endif() + endif() + + if(protobuf_generate_TARGET) + get_target_property(_source_list ${protobuf_generate_TARGET} SOURCES) + foreach(_file ${_source_list}) + if(_file MATCHES "proto$") + list(APPEND protobuf_generate_PROTOS ${_file}) + endif() + endforeach() + endif() + + if(NOT protobuf_generate_PROTOS) + message(SEND_ERROR "Error: protobuf_generate could not find any .proto files") + return() + endif() + + if(protobuf_generate_APPEND_PATH) + # Create an include path for each file specified + foreach(_file ${protobuf_generate_PROTOS}) + get_filename_component(_abs_file ${_file} ABSOLUTE) + get_filename_component(_abs_path ${_abs_file} PATH) + list(FIND _protobuf_include_path ${_abs_path} _contains_already) + if(${_contains_already} EQUAL -1) + list(APPEND _protobuf_include_path -I ${_abs_path}) + endif() + endforeach() + else() + set(_protobuf_include_path -I ${CMAKE_CURRENT_SOURCE_DIR}) + endif() + + foreach(DIR ${protobuf_generate_IMPORT_DIRS}) + get_filename_component(ABS_PATH ${DIR} ABSOLUTE) + list(FIND _protobuf_include_path ${ABS_PATH} _contains_already) + if(${_contains_already} EQUAL -1) + list(APPEND _protobuf_include_path -I ${ABS_PATH}) + endif() + endforeach() + + set(_generated_srcs_all) + foreach(_proto ${protobuf_generate_PROTOS}) + get_filename_component(_abs_file ${_proto} ABSOLUTE) + get_filename_component(_abs_dir ${_abs_file} DIRECTORY) + get_filename_component(_basename ${_proto} NAME_WE) + file(RELATIVE_PATH _rel_dir ${CMAKE_CURRENT_SOURCE_DIR} ${_abs_dir}) + + set(_possible_rel_dir) + if (NOT protobuf_generate_APPEND_PATH) + set(_possible_rel_dir ${_rel_dir}/) + endif() + + set(_generated_srcs) + foreach(_ext ${protobuf_generate_GENERATE_EXTENSIONS}) + list(APPEND _generated_srcs "${protobuf_generate_PROTOC_OUT_DIR}/${_possible_rel_dir}${_basename}${_ext}") + endforeach() + + if(protobuf_generate_DESCRIPTORS AND protobuf_generate_LANGUAGE STREQUAL cpp) + set(_descriptor_file "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.desc") + set(_dll_desc_out "--descriptor_set_out=${_descriptor_file}") + list(APPEND _generated_srcs ${_descriptor_file}) + endif() + list(APPEND _generated_srcs_all ${_generated_srcs}) + + add_custom_command( + OUTPUT ${_generated_srcs} + COMMAND protobuf::protoc + ARGS --${protobuf_generate_LANGUAGE}_out ${_dll_export_decl}${protobuf_generate_PROTOC_OUT_DIR} ${_dll_desc_out} ${_protobuf_include_path} ${_abs_file} + DEPENDS ${_abs_file} protobuf::protoc + COMMENT "Running ${protobuf_generate_LANGUAGE} protocol buffer compiler on ${_proto}" + VERBATIM ) + endforeach() + + set_source_files_properties(${_generated_srcs_all} PROPERTIES GENERATED TRUE) + if(protobuf_generate_OUT_VAR) + set(${protobuf_generate_OUT_VAR} ${_generated_srcs_all} PARENT_SCOPE) + endif() + if(protobuf_generate_TARGET) + target_sources(${protobuf_generate_TARGET} PRIVATE ${_generated_srcs_all}) + endif() +endfunction() + +function(PROTOBUF_GENERATE_CPP SRCS HDRS) + cmake_parse_arguments(protobuf_generate_cpp "" "EXPORT_MACRO;DESCRIPTORS" "" ${ARGN}) + + set(_proto_files "${protobuf_generate_cpp_UNPARSED_ARGUMENTS}") + if(NOT _proto_files) + message(SEND_ERROR "Error: PROTOBUF_GENERATE_CPP() called without any proto files") + return() + endif() + + if(PROTOBUF_GENERATE_CPP_APPEND_PATH) + set(_append_arg APPEND_PATH) + endif() + + if(protobuf_generate_cpp_DESCRIPTORS) + set(_descriptors DESCRIPTORS) + endif() + + if(DEFINED PROTOBUF_IMPORT_DIRS AND NOT DEFINED Protobuf_IMPORT_DIRS) + set(Protobuf_IMPORT_DIRS "${PROTOBUF_IMPORT_DIRS}") + endif() + + if(DEFINED Protobuf_IMPORT_DIRS) + set(_import_arg IMPORT_DIRS ${Protobuf_IMPORT_DIRS}) + endif() + + set(_outvar) + protobuf_generate(${_append_arg} ${_descriptors} LANGUAGE cpp EXPORT_MACRO ${protobuf_generate_cpp_EXPORT_MACRO} OUT_VAR _outvar ${_import_arg} PROTOS ${_proto_files}) + + set(${SRCS}) + set(${HDRS}) + if(protobuf_generate_cpp_DESCRIPTORS) + set(${protobuf_generate_cpp_DESCRIPTORS}) + endif() + + foreach(_file ${_outvar}) + if(_file MATCHES "cc$") + list(APPEND ${SRCS} ${_file}) + elseif(_file MATCHES "desc$") + list(APPEND ${protobuf_generate_cpp_DESCRIPTORS} ${_file}) + else() + list(APPEND ${HDRS} ${_file}) + endif() + endforeach() + set(${SRCS} ${${SRCS}} PARENT_SCOPE) + set(${HDRS} ${${HDRS}} PARENT_SCOPE) + if(protobuf_generate_cpp_DESCRIPTORS) + set(${protobuf_generate_cpp_DESCRIPTORS} "${${protobuf_generate_cpp_DESCRIPTORS}}" PARENT_SCOPE) + endif() +endfunction() + +function(PROTOBUF_GENERATE_PYTHON SRCS) + if(NOT ARGN) + message(SEND_ERROR "Error: PROTOBUF_GENERATE_PYTHON() called without any proto files") + return() + endif() + + if(PROTOBUF_GENERATE_CPP_APPEND_PATH) + set(_append_arg APPEND_PATH) + endif() + + if(DEFINED PROTOBUF_IMPORT_DIRS AND NOT DEFINED Protobuf_IMPORT_DIRS) + set(Protobuf_IMPORT_DIRS "${PROTOBUF_IMPORT_DIRS}") + endif() + + if(DEFINED Protobuf_IMPORT_DIRS) + set(_import_arg IMPORT_DIRS ${Protobuf_IMPORT_DIRS}) + endif() + + set(_outvar) + protobuf_generate(${_append_arg} LANGUAGE python OUT_VAR _outvar ${_import_arg} PROTOS ${ARGN}) + set(${SRCS} ${_outvar} PARENT_SCOPE) +endfunction() + + +if(Protobuf_DEBUG) + # Output some of their choices + message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " + "Protobuf_USE_STATIC_LIBS = ${Protobuf_USE_STATIC_LIBS}") +endif() + + +# Backwards compatibility +# Define camel case versions of input variables +foreach(UPPER + PROTOBUF_SRC_ROOT_FOLDER + PROTOBUF_IMPORT_DIRS + PROTOBUF_DEBUG + PROTOBUF_LIBRARY + PROTOBUF_PROTOC_LIBRARY + PROTOBUF_INCLUDE_DIR + PROTOBUF_PROTOC_EXECUTABLE + PROTOBUF_LIBRARY_DEBUG + PROTOBUF_PROTOC_LIBRARY_DEBUG + PROTOBUF_LITE_LIBRARY + PROTOBUF_LITE_LIBRARY_DEBUG + ) + if (DEFINED ${UPPER}) + string(REPLACE "PROTOBUF_" "Protobuf_" Camel ${UPPER}) + if (NOT DEFINED ${Camel}) + set(${Camel} ${${UPPER}}) + endif() + endif() +endforeach() + +if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(_PROTOBUF_ARCH_DIR x64/) +endif() + + +# Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES +if( Protobuf_USE_STATIC_LIBS ) + set( _protobuf_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) + if(WIN32) + set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) + else() + set(CMAKE_FIND_LIBRARY_SUFFIXES .a ) + endif() +endif() + +include(SelectLibraryConfigurations) + +# Internal function: search for normal library as well as a debug one +# if the debug one is specified also include debug/optimized keywords +# in *_LIBRARIES variable +function(_protobuf_find_libraries name filename) + if(${name}_LIBRARIES) + # Use result recorded by a previous call. + return() + elseif(${name}_LIBRARY) + # Honor cache entry used by CMake 3.5 and lower. + set(${name}_LIBRARIES "${${name}_LIBRARY}" PARENT_SCOPE) + else() + find_library(${name}_LIBRARY_RELEASE + NAMES ${filename} + NAMES_PER_DIR + PATHS ${Protobuf_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Release) + mark_as_advanced(${name}_LIBRARY_RELEASE) + + find_library(${name}_LIBRARY_DEBUG + NAMES ${filename}d ${filename} + NAMES_PER_DIR + PATHS ${Protobuf_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Debug) + mark_as_advanced(${name}_LIBRARY_DEBUG) + + select_library_configurations(${name}) + + if(UNIX AND Threads_FOUND AND ${name}_LIBRARY) + list(APPEND ${name}_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + endif() + + set(${name}_LIBRARY "${${name}_LIBRARY}" PARENT_SCOPE) + set(${name}_LIBRARIES "${${name}_LIBRARIES}" PARENT_SCOPE) + endif() +endfunction() + +# +# Main. +# + +# By default have PROTOBUF_GENERATE_CPP macro pass -I to protoc +# for each directory where a proto file is referenced. +if(NOT DEFINED PROTOBUF_GENERATE_CPP_APPEND_PATH) + set(PROTOBUF_GENERATE_CPP_APPEND_PATH TRUE) +endif() + + +# Google's provided vcproj files generate libraries with a "lib" +# prefix on Windows +if(MSVC) + set(Protobuf_ORIG_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES}") + set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "") + + find_path(Protobuf_SRC_ROOT_FOLDER protobuf.pc.in) +endif() + +if(UNIX) + # Protobuf headers may depend on threading. + find_package(Threads QUIET) +endif() + +# The Protobuf library +_protobuf_find_libraries(Protobuf protobuf) +#DOC "The Google Protocol Buffers RELEASE Library" + +_protobuf_find_libraries(Protobuf_LITE protobuf-lite) + +# The Protobuf Protoc Library +_protobuf_find_libraries(Protobuf_PROTOC protoc) + +# Restore original find library prefixes +if(MSVC) + set(CMAKE_FIND_LIBRARY_PREFIXES "${Protobuf_ORIG_FIND_LIBRARY_PREFIXES}") +endif() + +# Find the include directory +find_path(Protobuf_INCLUDE_DIR + google/protobuf/service.h + PATHS ${Protobuf_SRC_ROOT_FOLDER}/src +) +mark_as_advanced(Protobuf_INCLUDE_DIR) + +# Find the protoc Executable +find_program(Protobuf_PROTOC_EXECUTABLE + NAMES protoc + DOC "The Google Protocol Buffers Compiler" + PATHS + ${Protobuf_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Release + ${Protobuf_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Debug +) +mark_as_advanced(Protobuf_PROTOC_EXECUTABLE) + +if(Protobuf_DEBUG) + message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " + "requested version of Google Protobuf is ${Protobuf_FIND_VERSION}") +endif() + +if(Protobuf_INCLUDE_DIR) + set(_PROTOBUF_COMMON_HEADER ${Protobuf_INCLUDE_DIR}/google/protobuf/stubs/common.h) + + if(Protobuf_DEBUG) + message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " + "location of common.h: ${_PROTOBUF_COMMON_HEADER}") + endif() + + set(Protobuf_VERSION "") + set(Protobuf_LIB_VERSION "") + file(STRINGS ${_PROTOBUF_COMMON_HEADER} _PROTOBUF_COMMON_H_CONTENTS REGEX "#define[ \t]+GOOGLE_PROTOBUF_VERSION[ \t]+") + if(_PROTOBUF_COMMON_H_CONTENTS MATCHES "#define[ \t]+GOOGLE_PROTOBUF_VERSION[ \t]+([0-9]+)") + set(Protobuf_LIB_VERSION "${CMAKE_MATCH_1}") + endif() + unset(_PROTOBUF_COMMON_H_CONTENTS) + + math(EXPR _PROTOBUF_MAJOR_VERSION "${Protobuf_LIB_VERSION} / 1000000") + math(EXPR _PROTOBUF_MINOR_VERSION "${Protobuf_LIB_VERSION} / 1000 % 1000") + math(EXPR _PROTOBUF_SUBMINOR_VERSION "${Protobuf_LIB_VERSION} % 1000") + set(Protobuf_VERSION "${_PROTOBUF_MAJOR_VERSION}.${_PROTOBUF_MINOR_VERSION}.${_PROTOBUF_SUBMINOR_VERSION}") + + if(Protobuf_DEBUG) + message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " + "${_PROTOBUF_COMMON_HEADER} reveals protobuf ${Protobuf_VERSION}") + endif() + + if(Protobuf_PROTOC_EXECUTABLE) + # Check Protobuf compiler version to be aligned with libraries version + execute_process(COMMAND ${Protobuf_PROTOC_EXECUTABLE} --version + OUTPUT_VARIABLE _PROTOBUF_PROTOC_EXECUTABLE_VERSION) + + if("${_PROTOBUF_PROTOC_EXECUTABLE_VERSION}" MATCHES "libprotoc ([0-9.]+)") + set(_PROTOBUF_PROTOC_EXECUTABLE_VERSION "${CMAKE_MATCH_1}") + endif() + + if(Protobuf_DEBUG) + message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " + "${Protobuf_PROTOC_EXECUTABLE} reveals version ${_PROTOBUF_PROTOC_EXECUTABLE_VERSION}") + endif() + + if(NOT "${_PROTOBUF_PROTOC_EXECUTABLE_VERSION}" VERSION_EQUAL "${Protobuf_VERSION}") + message(WARNING "Protobuf compiler version ${_PROTOBUF_PROTOC_EXECUTABLE_VERSION}" + " doesn't match library version ${Protobuf_VERSION}") + endif() + endif() + + if(Protobuf_LIBRARY) + if(NOT TARGET protobuf::libprotobuf) + add_library(protobuf::libprotobuf UNKNOWN IMPORTED) + set_target_properties(protobuf::libprotobuf PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}") + if(EXISTS "${Protobuf_LIBRARY}") + set_target_properties(protobuf::libprotobuf PROPERTIES + IMPORTED_LOCATION "${Protobuf_LIBRARY}") + endif() + if(EXISTS "${Protobuf_LIBRARY_RELEASE}") + set_property(TARGET protobuf::libprotobuf APPEND PROPERTY + IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(protobuf::libprotobuf PROPERTIES + IMPORTED_LOCATION_RELEASE "${Protobuf_LIBRARY_RELEASE}") + endif() + if(EXISTS "${Protobuf_LIBRARY_DEBUG}") + set_property(TARGET protobuf::libprotobuf APPEND PROPERTY + IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(protobuf::libprotobuf PROPERTIES + IMPORTED_LOCATION_DEBUG "${Protobuf_LIBRARY_DEBUG}") + endif() + if (Protobuf_VERSION VERSION_GREATER_EQUAL "3.6") + set_property(TARGET protobuf::libprotobuf APPEND PROPERTY + INTERFACE_COMPILE_FEATURES cxx_std_11 + ) + endif() + if (MSVC AND NOT Protobuf_USE_STATIC_LIBS) + set_property(TARGET protobuf::libprotobuf APPEND PROPERTY + INTERFACE_COMPILE_DEFINITIONS "PROTOBUF_USE_DLLS" + ) + endif() + if(UNIX AND TARGET Threads::Threads) + set_property(TARGET protobuf::libprotobuf APPEND PROPERTY + INTERFACE_LINK_LIBRARIES Threads::Threads) + endif() + endif() + endif() + + if(Protobuf_LITE_LIBRARY) + if(NOT TARGET protobuf::libprotobuf-lite) + add_library(protobuf::libprotobuf-lite UNKNOWN IMPORTED) + set_target_properties(protobuf::libprotobuf-lite PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}") + if(EXISTS "${Protobuf_LITE_LIBRARY}") + set_target_properties(protobuf::libprotobuf-lite PROPERTIES + IMPORTED_LOCATION "${Protobuf_LITE_LIBRARY}") + endif() + if(EXISTS "${Protobuf_LITE_LIBRARY_RELEASE}") + set_property(TARGET protobuf::libprotobuf-lite APPEND PROPERTY + IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(protobuf::libprotobuf-lite PROPERTIES + IMPORTED_LOCATION_RELEASE "${Protobuf_LITE_LIBRARY_RELEASE}") + endif() + if(EXISTS "${Protobuf_LITE_LIBRARY_DEBUG}") + set_property(TARGET protobuf::libprotobuf-lite APPEND PROPERTY + IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(protobuf::libprotobuf-lite PROPERTIES + IMPORTED_LOCATION_DEBUG "${Protobuf_LITE_LIBRARY_DEBUG}") + endif() + if (MSVC AND NOT Protobuf_USE_STATIC_LIBS) + set_property(TARGET protobuf::libprotobuf-lite APPEND PROPERTY + INTERFACE_COMPILE_DEFINITIONS "PROTOBUF_USE_DLLS" + ) + endif() + if(UNIX AND TARGET Threads::Threads) + set_property(TARGET protobuf::libprotobuf-lite APPEND PROPERTY + INTERFACE_LINK_LIBRARIES Threads::Threads) + endif() + endif() + endif() + + if(Protobuf_PROTOC_LIBRARY) + if(NOT TARGET protobuf::libprotoc) + add_library(protobuf::libprotoc UNKNOWN IMPORTED) + set_target_properties(protobuf::libprotoc PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}") + if(EXISTS "${Protobuf_PROTOC_LIBRARY}") + set_target_properties(protobuf::libprotoc PROPERTIES + IMPORTED_LOCATION "${Protobuf_PROTOC_LIBRARY}") + endif() + if(EXISTS "${Protobuf_PROTOC_LIBRARY_RELEASE}") + set_property(TARGET protobuf::libprotoc APPEND PROPERTY + IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(protobuf::libprotoc PROPERTIES + IMPORTED_LOCATION_RELEASE "${Protobuf_PROTOC_LIBRARY_RELEASE}") + endif() + if(EXISTS "${Protobuf_PROTOC_LIBRARY_DEBUG}") + set_property(TARGET protobuf::libprotoc APPEND PROPERTY + IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(protobuf::libprotoc PROPERTIES + IMPORTED_LOCATION_DEBUG "${Protobuf_PROTOC_LIBRARY_DEBUG}") + endif() + if (Protobuf_VERSION VERSION_GREATER_EQUAL "3.6") + set_property(TARGET protobuf::libprotoc APPEND PROPERTY + INTERFACE_COMPILE_FEATURES cxx_std_11 + ) + endif() + if (MSVC AND NOT Protobuf_USE_STATIC_LIBS) + set_property(TARGET protobuf::libprotoc APPEND PROPERTY + INTERFACE_COMPILE_DEFINITIONS "PROTOBUF_USE_DLLS" + ) + endif() + if(UNIX AND TARGET Threads::Threads) + set_property(TARGET protobuf::libprotoc APPEND PROPERTY + INTERFACE_LINK_LIBRARIES Threads::Threads) + endif() + endif() + endif() + + if(Protobuf_PROTOC_EXECUTABLE) + if(NOT TARGET protobuf::protoc) + add_executable(protobuf::protoc IMPORTED) + if(EXISTS "${Protobuf_PROTOC_EXECUTABLE}") + set_target_properties(protobuf::protoc PROPERTIES + IMPORTED_LOCATION "${Protobuf_PROTOC_EXECUTABLE}") + endif() + endif() + endif() +endif() + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Protobuf + REQUIRED_VARS Protobuf_LIBRARIES Protobuf_INCLUDE_DIR + VERSION_VAR Protobuf_VERSION +) + +if(Protobuf_FOUND) + set(Protobuf_INCLUDE_DIRS ${Protobuf_INCLUDE_DIR}) +endif() + +# Restore the original find library ordering +if( Protobuf_USE_STATIC_LIBS ) + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_protobuf_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) +endif() + +# Backwards compatibility +# Define upper case versions of output variables +foreach(Camel + Protobuf_SRC_ROOT_FOLDER + Protobuf_IMPORT_DIRS + Protobuf_DEBUG + Protobuf_INCLUDE_DIRS + Protobuf_LIBRARIES + Protobuf_PROTOC_LIBRARIES + Protobuf_LITE_LIBRARIES + Protobuf_LIBRARY + Protobuf_PROTOC_LIBRARY + Protobuf_INCLUDE_DIR + Protobuf_PROTOC_EXECUTABLE + Protobuf_LIBRARY_DEBUG + Protobuf_PROTOC_LIBRARY_DEBUG + Protobuf_LITE_LIBRARY + Protobuf_LITE_LIBRARY_DEBUG + ) + string(TOUPPER ${Camel} UPPER) + set(${UPPER} ${${Camel}}) +endforeach() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/libzypp.spec.cmake new/libzypp-17.31.15/libzypp.spec.cmake --- old/libzypp-17.31.14/libzypp.spec.cmake 2023-05-15 11:42:04.000000000 +0200 +++ new/libzypp-17.31.15/libzypp.spec.cmake 2023-06-28 11:42:04.000000000 +0200 @@ -101,12 +101,8 @@ %endif BuildRequires: libsolv-devel >= 0.7.24 -%if 0%{?suse_version} >= 1100 BuildRequires: libsolv-tools %requires_eq libsolv-tools -%else -Requires: libsolv-tools -%endif BuildRequires: glib2-devel BuildRequires: libsigc++2-devel @@ -148,18 +144,12 @@ %endif %define min_curl_version 7.19.4 +BuildRequires: libcurl-devel >= %{min_curl_version} %if 0%{?suse_version} -%if 0%{?suse_version} >= 1100 # Code11+ -BuildRequires: libcurl-devel >= %{min_curl_version} Requires: libcurl4 >= %{min_curl_version} %else -# Code10 -BuildRequires: curl-devel -%endif -%else # Other distros (Fedora) -BuildRequires: libcurl-devel >= %{min_curl_version} Requires: libcurl >= %{min_curl_version} %endif @@ -219,18 +209,13 @@ Requires: zlib-devel Requires: libudev-devel %if 0%{?suse_version} -%if 0%{?suse_version} >= 1100 # Code11+ Requires: libcurl-devel >= %{min_curl_version} %else -# Code10 -Requires: curl-devel -%endif -%else # Other distros (Fedora) Requires: libcurl-devel >= %{min_curl_version} %endif -%if 0%{?suse_version} >= 1100 +%if 0%{?suse_version} %requires_ge libsolv-devel %else Requires: libsolv-devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/package/libzypp.changes new/libzypp-17.31.15/package/libzypp.changes --- old/libzypp-17.31.14/package/libzypp.changes 2023-06-15 12:42:04.000000000 +0200 +++ new/libzypp-17.31.15/package/libzypp.changes 2023-06-28 12:42:04.000000000 +0200 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Wed Jun 28 12:34:18 CEST 2023 - ma(a)suse.de + +- Fix build against protobuf >= 22 (fixes #465, closes #466) + Port away from protobuf_generate_cpp. Upstream protobuf does not + export protobuf_generate_cpp by default anymore. + Use protobuf_generate instead, which is also available on older + versions. +- Remove SUSE < SLE11 constructs (fixes #464). +- version 17.31.15 (22) + +------------------------------------------------------------------- Thu Jun 15 12:00:07 CEST 2023 - ma(a)suse.de - build: honor libproxy.pc's includedir (bsc#1212222) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/tests/zyppng/media/Provider_test.cc new/libzypp-17.31.15/tests/zyppng/media/Provider_test.cc --- old/libzypp-17.31.14/tests/zyppng/media/Provider_test.cc 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/tests/zyppng/media/Provider_test.cc 2023-06-28 12:42:04.000000000 +0200 @@ -14,7 +14,7 @@ #include <zypp-core/zyppng/rpc/zerocopystreams.h> #include <zypp-core/zyppng/base/private/linuxhelpers_p.h> -#include <zypp-proto/tvm.pb.h> +#include <zypp-proto/test/tvm.pb.h> #include <iostream> #include <fstream> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/tools/zypp-media-chksum/CMakeLists.txt new/libzypp-17.31.15/tools/zypp-media-chksum/CMakeLists.txt --- old/libzypp-17.31.14/tools/zypp-media-chksum/CMakeLists.txt 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/tools/zypp-media-chksum/CMakeLists.txt 2023-06-28 12:42:04.000000000 +0200 @@ -3,8 +3,6 @@ set (CMAKE_CXX_STANDARD 17) SET (CMAKE_CXX_EXTENSIONS OFF) -FIND_PACKAGE(Protobuf REQUIRED) - SET( SOURCES main.cc ) @@ -13,7 +11,6 @@ target_link_libraries( ${PROJECT_NAME} zypp-media ) target_link_libraries( ${PROJECT_NAME} zypp-core ) target_link_libraries( ${PROJECT_NAME} zypp-protobuf ) -target_link_libraries( ${PROJECT_NAME} ${PROTOBUF_LITE_LIBRARIES} ) IF ( INSTALL_NG_BINARIES ) INSTALL( TARGETS ${PROJECT_NAME} DESTINATION "${ZYPP_LIBEXEC_INSTALL_DIR}/workers" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/tools/zypp-media-copy/CMakeLists.txt new/libzypp-17.31.15/tools/zypp-media-copy/CMakeLists.txt --- old/libzypp-17.31.14/tools/zypp-media-copy/CMakeLists.txt 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/tools/zypp-media-copy/CMakeLists.txt 2023-06-28 12:42:04.000000000 +0200 @@ -3,8 +3,6 @@ set (CMAKE_CXX_STANDARD 17) SET (CMAKE_CXX_EXTENSIONS OFF) -FIND_PACKAGE(Protobuf REQUIRED) - SET( SOURCES main.cc ) @@ -13,7 +11,6 @@ target_link_libraries( ${PROJECT_NAME} zypp-media ) target_link_libraries( ${PROJECT_NAME} zypp-core ) target_link_libraries( ${PROJECT_NAME} zypp-protobuf ) -target_link_libraries( ${PROJECT_NAME} ${PROTOBUF_LITE_LIBRARIES} ) IF ( INSTALL_NG_BINARIES ) INSTALL( TARGETS ${PROJECT_NAME} DESTINATION "${ZYPP_LIBEXEC_INSTALL_DIR}/workers" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/tools/zypp-media-dir/CMakeLists.txt new/libzypp-17.31.15/tools/zypp-media-dir/CMakeLists.txt --- old/libzypp-17.31.14/tools/zypp-media-dir/CMakeLists.txt 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/tools/zypp-media-dir/CMakeLists.txt 2023-06-28 12:42:04.000000000 +0200 @@ -3,8 +3,6 @@ set (CMAKE_CXX_STANDARD 17) SET (CMAKE_CXX_EXTENSIONS OFF) -FIND_PACKAGE(Protobuf REQUIRED) - SET( SOURCES main.cc dirprovider.cc @@ -15,7 +13,6 @@ target_link_libraries( ${PROJECT_NAME} zypp-media ) target_link_libraries( ${PROJECT_NAME} zypp-core ) target_link_libraries( ${PROJECT_NAME} zypp-protobuf ) -target_link_libraries( ${PROJECT_NAME} ${PROTOBUF_LITE_LIBRARIES} ) IF ( INSTALL_NG_BINARIES ) INSTALL( TARGETS ${PROJECT_NAME} DESTINATION "${ZYPP_LIBEXEC_INSTALL_DIR}/workers" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/tools/zypp-media-disc/CMakeLists.txt new/libzypp-17.31.15/tools/zypp-media-disc/CMakeLists.txt --- old/libzypp-17.31.14/tools/zypp-media-disc/CMakeLists.txt 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/tools/zypp-media-disc/CMakeLists.txt 2023-06-28 12:42:04.000000000 +0200 @@ -3,8 +3,6 @@ set (CMAKE_CXX_STANDARD 17) SET (CMAKE_CXX_EXTENSIONS OFF) -FIND_PACKAGE(Protobuf REQUIRED) - SET( SOURCES main.cc discprovider.cc @@ -15,7 +13,6 @@ target_link_libraries( ${PROJECT_NAME} zypp-media ) target_link_libraries( ${PROJECT_NAME} zypp-core ) target_link_libraries( ${PROJECT_NAME} zypp-protobuf ) -target_link_libraries( ${PROJECT_NAME} ${PROTOBUF_LITE_LIBRARIES} ) IF ( INSTALL_NG_BINARIES ) INSTALL( TARGETS ${PROJECT_NAME} DESTINATION "${ZYPP_LIBEXEC_INSTALL_DIR}/workers" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/tools/zypp-media-disk/CMakeLists.txt new/libzypp-17.31.15/tools/zypp-media-disk/CMakeLists.txt --- old/libzypp-17.31.14/tools/zypp-media-disk/CMakeLists.txt 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/tools/zypp-media-disk/CMakeLists.txt 2023-06-28 12:42:04.000000000 +0200 @@ -3,8 +3,6 @@ set (CMAKE_CXX_STANDARD 17) SET (CMAKE_CXX_EXTENSIONS OFF) -FIND_PACKAGE(Protobuf REQUIRED) - SET( SOURCES main.cc diskprovider.cc @@ -15,7 +13,6 @@ target_link_libraries( ${PROJECT_NAME} zypp-media ) target_link_libraries( ${PROJECT_NAME} zypp-core ) target_link_libraries( ${PROJECT_NAME} zypp-protobuf ) -target_link_libraries( ${PROJECT_NAME} ${PROTOBUF_LITE_LIBRARIES} ) IF ( INSTALL_NG_BINARIES ) INSTALL( TARGETS ${PROJECT_NAME} DESTINATION "${ZYPP_LIBEXEC_INSTALL_DIR}/workers" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/tools/zypp-media-http/CMakeLists.txt new/libzypp-17.31.15/tools/zypp-media-http/CMakeLists.txt --- old/libzypp-17.31.14/tools/zypp-media-http/CMakeLists.txt 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/tools/zypp-media-http/CMakeLists.txt 2023-06-28 12:42:04.000000000 +0200 @@ -3,8 +3,6 @@ set (CMAKE_CXX_STANDARD 17) SET (CMAKE_CXX_EXTENSIONS OFF) -FIND_PACKAGE(Protobuf REQUIRED) - SET( SOURCES main.cc networkprovider.cc @@ -16,7 +14,6 @@ target_link_libraries( ${PROJECT_NAME} zypp-media ) target_link_libraries( ${PROJECT_NAME} zypp-core ) target_link_libraries( ${PROJECT_NAME} zypp-protobuf ) -target_link_libraries( ${PROJECT_NAME} ${PROTOBUF_LITE_LIBRARIES} ) IF ( INSTALL_NG_BINARIES ) INSTALL( TARGETS ${PROJECT_NAME} DESTINATION "${ZYPP_LIBEXEC_INSTALL_DIR}/workers" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/tools/zypp-media-iso/CMakeLists.txt new/libzypp-17.31.15/tools/zypp-media-iso/CMakeLists.txt --- old/libzypp-17.31.14/tools/zypp-media-iso/CMakeLists.txt 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/tools/zypp-media-iso/CMakeLists.txt 2023-06-28 12:42:04.000000000 +0200 @@ -3,8 +3,6 @@ set (CMAKE_CXX_STANDARD 17) SET (CMAKE_CXX_EXTENSIONS OFF) -FIND_PACKAGE(Protobuf REQUIRED) - SET( SOURCES main.cc isoprovider.cc @@ -30,7 +28,6 @@ target_link_libraries( ${PROJECT_NAME} zypp-media ) target_link_libraries( ${PROJECT_NAME} zypp-core ) target_link_libraries( ${PROJECT_NAME} zypp-protobuf ) -target_link_libraries( ${PROJECT_NAME} ${PROTOBUF_LITE_LIBRARIES} ) IF ( INSTALL_NG_BINARIES ) INSTALL( TARGETS ${PROJECT_NAME} DESTINATION "${ZYPP_LIBEXEC_INSTALL_DIR}/workers" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/tools/zypp-media-nfs/CMakeLists.txt new/libzypp-17.31.15/tools/zypp-media-nfs/CMakeLists.txt --- old/libzypp-17.31.14/tools/zypp-media-nfs/CMakeLists.txt 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/tools/zypp-media-nfs/CMakeLists.txt 2023-06-28 12:42:04.000000000 +0200 @@ -3,8 +3,6 @@ set (CMAKE_CXX_STANDARD 17) SET (CMAKE_CXX_EXTENSIONS OFF) -FIND_PACKAGE(Protobuf REQUIRED) - SET( SOURCES main.cc nfsprovider.cc @@ -15,7 +13,6 @@ target_link_libraries( ${PROJECT_NAME} zypp-media ) target_link_libraries( ${PROJECT_NAME} zypp-core ) target_link_libraries( ${PROJECT_NAME} zypp-protobuf ) -target_link_libraries( ${PROJECT_NAME} ${PROTOBUF_LITE_LIBRARIES} ) IF ( INSTALL_NG_BINARIES ) INSTALL( TARGETS ${PROJECT_NAME} DESTINATION "${ZYPP_LIBEXEC_INSTALL_DIR}/workers" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/tools/zypp-media-smb/CMakeLists.txt new/libzypp-17.31.15/tools/zypp-media-smb/CMakeLists.txt --- old/libzypp-17.31.14/tools/zypp-media-smb/CMakeLists.txt 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/tools/zypp-media-smb/CMakeLists.txt 2023-06-28 12:42:04.000000000 +0200 @@ -3,8 +3,6 @@ set (CMAKE_CXX_STANDARD 17) SET (CMAKE_CXX_EXTENSIONS OFF) -FIND_PACKAGE(Protobuf REQUIRED) - SET( SOURCES main.cc smbprovider.cc @@ -15,7 +13,6 @@ target_link_libraries( ${PROJECT_NAME} zypp-media ) target_link_libraries( ${PROJECT_NAME} zypp-core ) target_link_libraries( ${PROJECT_NAME} zypp-protobuf ) -target_link_libraries( ${PROJECT_NAME} ${PROTOBUF_LITE_LIBRARIES} ) IF ( INSTALL_NG_BINARIES ) INSTALL( TARGETS ${PROJECT_NAME} DESTINATION "${ZYPP_LIBEXEC_INSTALL_DIR}/workers" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/tools/zypp-media-tvm/CMakeLists.txt new/libzypp-17.31.15/tools/zypp-media-tvm/CMakeLists.txt --- old/libzypp-17.31.14/tools/zypp-media-tvm/CMakeLists.txt 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/tools/zypp-media-tvm/CMakeLists.txt 2023-06-28 12:42:04.000000000 +0200 @@ -3,8 +3,6 @@ set (CMAKE_CXX_STANDARD 17) SET (CMAKE_CXX_EXTENSIONS OFF) -FIND_PACKAGE(Protobuf REQUIRED) - SET( SOURCES main.cc testvmprovider.cc @@ -15,7 +13,6 @@ target_link_libraries( ${PROJECT_NAME} zypp-media ) target_link_libraries( ${PROJECT_NAME} zypp-core ) target_link_libraries( ${PROJECT_NAME} zypp-protobuf ) -target_link_libraries( ${PROJECT_NAME} ${PROTOBUF_LITE_LIBRARIES} ) set_target_properties( ${PROJECT_NAME} PROPERTIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/tools/zypp-media-tvm/testvmprovider.cc new/libzypp-17.31.15/tools/zypp-media-tvm/testvmprovider.cc --- old/libzypp-17.31.14/tools/zypp-media-tvm/testvmprovider.cc 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/tools/zypp-media-tvm/testvmprovider.cc 2023-06-28 12:42:04.000000000 +0200 @@ -13,7 +13,7 @@ #include <zypp-core/AutoDispose.h> #include <zypp-core/base/StringV.h> #include <zypp-media/ng/MediaVerifier> -#include <zypp-proto/tvm.pb.h> +#include <zypp-proto/test/tvm.pb.h> #include <zypp-core/zyppng/rpc/zerocopystreams.h> #include <zypp-core/zyppng/base/private/linuxhelpers_p.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/tools/zypp-rpm/CMakeLists.txt new/libzypp-17.31.15/tools/zypp-rpm/CMakeLists.txt --- old/libzypp-17.31.14/tools/zypp-rpm/CMakeLists.txt 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/tools/zypp-rpm/CMakeLists.txt 2023-06-28 12:42:04.000000000 +0200 @@ -3,8 +3,6 @@ set (CMAKE_CXX_STANDARD 17) SET (CMAKE_CXX_EXTENSIONS OFF) -FIND_PACKAGE(Protobuf REQUIRED) - FIND_PACKAGE(Rpm REQUIRED) IF ( NOT RPM_FOUND) MESSAGE( FATAL_ERROR " rpm-devel not found" ) @@ -36,7 +34,6 @@ target_link_libraries( ${PROJECT_NAME} zypp-core ) target_link_libraries( ${PROJECT_NAME} zypp-protobuf ) target_link_libraries( ${PROJECT_NAME} util ) -target_link_libraries( ${PROJECT_NAME} ${PROTOBUF_LITE_LIBRARIES} ) target_link_libraries( ${PROJECT_NAME} ${RPM_LIBRARY} ${RPMIO_LIBRARY} ) INSTALL( TARGETS ${PROJECT_NAME} DESTINATION "${ZYPP_LIBEXEC_INSTALL_DIR}" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/tools/zypp-rpm/main.cc new/libzypp-17.31.15/tools/zypp-rpm/main.cc --- old/libzypp-17.31.14/tools/zypp-rpm/main.cc 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/tools/zypp-rpm/main.cc 2023-06-28 12:42:04.000000000 +0200 @@ -1,4 +1,4 @@ -#include <zypp-proto/commit.pb.h> +#include <zypp-proto/target/commit.pb.h> #include <zypp-core/zyppng/core/ByteArray> #include <zypp-core/zyppng/rpc/rpc.h> #include <zypp-core/zyppng/base/private/linuxhelpers_p.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/zypp/CMakeLists.txt new/libzypp-17.31.15/zypp/CMakeLists.txt --- old/libzypp-17.31.14/zypp/CMakeLists.txt 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/zypp/CMakeLists.txt 2023-06-28 12:42:04.000000000 +0200 @@ -913,7 +913,6 @@ TARGET_LINK_LIBRARIES(${LIBNAME} ${Boost_THREAD_LIBRARY}) TARGET_LINK_LIBRARIES(${LIBNAME} ${GPGME_PTHREAD_LIBRARIES}) target_link_libraries(${LIBNAME} ${YAML_CPP_LIBRARIES}) - target_link_libraries(${LIBNAME} ${PROTOBUF_LITE_LIBRARIES}) TARGET_LINK_LIBRARIES(${LIBNAME} pthread ) IF ( UDEV_FOUND ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/zypp/target/TargetImpl.cc new/libzypp-17.31.15/zypp/target/TargetImpl.cc --- old/libzypp-17.31.14/zypp/target/TargetImpl.cc 2023-04-26 18:42:04.000000000 +0200 +++ new/libzypp-17.31.15/zypp/target/TargetImpl.cc 2023-06-28 12:42:04.000000000 +0200 @@ -66,8 +66,8 @@ #include <zypp-core/zyppng/rpc/rpc.h> #include <zypp-core/zyppng/base/private/linuxhelpers_p.h> #include <zypp-core/zyppng/base/EventDispatcher> -#include <zypp-proto/commit.pb.h> -#include <zypp-proto/envelope.pb.h> +#include <zypp-proto/target/commit.pb.h> +#include <zypp-proto/core/envelope.pb.h> #include <zypp-core/zyppng/rpc/zerocopystreams.h> #include <zypp/target/rpm/RpmException.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/zypp-core/proto/CMakeLists.txt new/libzypp-17.31.15/zypp-core/proto/CMakeLists.txt --- old/libzypp-17.31.14/zypp-core/proto/CMakeLists.txt 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/zypp-core/proto/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -SET( zypp_core_PROTOBUF_SOURCES -) - -protobuf_generate_cpp(ZYPPCORE_PROTO_SRCS ZYPPCORE_PROTO_HDRS ${zypp_core_PROTOBUF_SOURCES}) - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/zypp-core/zyppng/rpc/messagestream.h new/libzypp-17.31.15/zypp-core/zyppng/rpc/messagestream.h --- old/libzypp-17.31.14/zypp-core/zyppng/rpc/messagestream.h 2023-04-05 08:42:04.000000000 +0200 +++ new/libzypp-17.31.15/zypp-core/zyppng/rpc/messagestream.h 2023-06-28 12:42:04.000000000 +0200 @@ -20,7 +20,7 @@ #include <zypp-core/zyppng/base/Timer> #include <zypp-core/zyppng/io/IODevice> #include <zypp-core/zyppng/pipelines/expected.h> -#include <zypp-proto/envelope.pb.h> +#include <zypp-proto/core/envelope.pb.h> #include <zypp-core/zyppng/rpc/rpc.h> #include <deque> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/zypp-core/zyppng/rpc/rpc.h new/libzypp-17.31.15/zypp-core/zyppng/rpc/rpc.h --- old/libzypp-17.31.14/zypp-core/zyppng/rpc/rpc.h 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/zypp-core/zyppng/rpc/rpc.h 2023-06-28 12:42:04.000000000 +0200 @@ -9,7 +9,7 @@ #ifndef ZYPP_NG_RPC_RPC_H_INCLUDED #define ZYPP_NG_RPC_RPC_H_INCLUDED -#include <zypp-proto/envelope.pb.h> +#include <zypp-proto/core/envelope.pb.h> namespace zyppng::rpc { /*! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/zypp-media/ng/private/provide_p.h new/libzypp-17.31.15/zypp-media/ng/private/provide_p.h --- old/libzypp-17.31.14/zypp-media/ng/private/provide_p.h 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/zypp-media/ng/private/provide_p.h 2023-06-28 12:42:04.000000000 +0200 @@ -22,8 +22,8 @@ #include <zypp-media/ng/Provide> #include <zypp-media/ng/ProvideItem> #include <zypp-media/ng/ProvideSpec> -#include <zypp-proto/envelope.pb.h> -#include <zypp-proto/provider.pb.h> +#include <zypp-proto/core/envelope.pb.h> +#include <zypp-proto/media/provider.pb.h> #include <zypp-core/zyppng/base/private/base_p.h> #include <zypp-core/zyppng/base/Timer> #include <zypp-core/ManagedFile.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/zypp-media/ng/private/providemessage_p.h new/libzypp-17.31.15/zypp-media/ng/private/providemessage_p.h --- old/libzypp-17.31.14/zypp-media/ng/private/providemessage_p.h 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/zypp-media/ng/private/providemessage_p.h 2023-06-28 12:42:04.000000000 +0200 @@ -22,7 +22,7 @@ #include <zypp-media/ng/HeaderValueMap> #include <variant> #include <functional> -#include <zypp-proto/provider.pb.h> +#include <zypp-proto/media/provider.pb.h> namespace zypp::proto { class ProvideMessage; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/zypp-media/ng/private/providequeue_p.h new/libzypp-17.31.15/zypp-media/ng/private/providequeue_p.h --- old/libzypp-17.31.14/zypp-media/ng/private/providequeue_p.h 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/zypp-media/ng/private/providequeue_p.h 2023-06-28 12:42:04.000000000 +0200 @@ -16,7 +16,7 @@ #include "providefwd_p.h" #include <zypp-media/ng/Provide> -#include <zypp-proto/provider.pb.h> +#include <zypp-proto/media/provider.pb.h> #include <zypp-core/zyppng/io/Process> #include <zypp-core/ByteCount.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/zypp-media/ng/worker/provideworker.h new/libzypp-17.31.15/zypp-media/ng/worker/provideworker.h --- old/libzypp-17.31.14/zypp-media/ng/worker/provideworker.h 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/zypp-media/ng/worker/provideworker.h 2023-06-28 12:42:04.000000000 +0200 @@ -16,7 +16,7 @@ #include <zypp-core/zyppng/io/AsyncDataSource> #include <zypp-core/zyppng/rpc/MessageStream> #include <zypp-core/zyppng/pipelines/Expected> -#include <zypp-proto/provider.pb.h> +#include <zypp-proto/media/provider.pb.h> #include <zypp-media/ng/provide-configvars.h> #include <zypp-media/ng/private/providemessage_p.h> #include <zypp-media/ng/HeaderValueMap> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.14/zypp-proto/CMakeLists.txt new/libzypp-17.31.15/zypp-proto/CMakeLists.txt --- old/libzypp-17.31.14/zypp-proto/CMakeLists.txt 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.15/zypp-proto/CMakeLists.txt 2023-06-28 12:42:04.000000000 +0200 @@ -1,27 +1,9 @@ -SET( zypp_core_PROTOBUF_SOURCES - core/envelope.proto -) - -SET( zypp_media_PROTOBUF_SOURCES - media/provider.proto -) - -SET( zypp_target_PROTOBUF_SOURCES - target/commit.proto +ADD_LIBRARY( zypp-protobuf STATIC + core/envelope.proto media/provider.proto target/commit.proto test/tvm.proto ) -SET( zypp_test_PROTOBUF_SOURCES - test/tvm.proto -) +protobuf_generate( TARGET zypp-protobuf ) -protobuf_generate_cpp( ZYPPCORE_PROTO_SRCS ZYPPCORE_PROTO_HDRS ${zypp_core_PROTOBUF_SOURCES} ) -protobuf_generate_cpp( ZYPPMEDIA_PROTO_SRCS ZYPPMEDIA_PROTO_HDRS ${zypp_media_PROTOBUF_SOURCES} ) -protobuf_generate_cpp( ZYPPTARGET_PROTO_SRCS ZYPPTARGET_PROTO_HDRS ${zypp_target_PROTOBUF_SOURCES} ) -protobuf_generate_cpp( ZYPPTEST_PROTO_SRCS ZYPPTEST_PROTO_HDRS ${zypp_test_PROTOBUF_SOURCES} ) +target_include_directories ( zypp-protobuf PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ) -ADD_LIBRARY( zypp-protobuf STATIC - ${ZYPPCORE_PROTO_SRCS} ${ZYPPCORE_PROTO_HDRS} - ${ZYPPMEDIA_PROTO_SRCS} ${ZYPPMEDIA_PROTO_HDRS} - ${ZYPPTARGET_PROTO_HDRS} ${ZYPPTARGET_PROTO_SRCS} - ${ZYPPTEST_PROTO_HDRS} ${ZYPPTEST_PROTO_SRCS} -) +target_link_libraries( zypp-protobuf PUBLIC protobuf::libprotobuf-lite )

1 0

commit open-vm-tools for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at 2023-06-30 19:58:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-vm-tools (Old) and /work/SRC/openSUSE:Factory/.open-vm-tools.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "open-vm-tools" Fri Jun 30 19:58:20 2023 rev:113 rq:1095693 version:12.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/open-vm-tools/open-vm-tools.changes 2023-06-22 23:24:57.921664064 +0200 +++ /work/SRC/openSUSE:Factory/.open-vm-tools.new.13546/open-vm-tools.changes 2023-06-30 19:58:31.557519891 +0200 @@ -1,0 +2,5 @@ +Tue Jun 27 19:54:05 UTC 2023 - Dirk M��ller <dmueller(a)suse.com> + +- limit to protobuf < 22 for now until build failures have been fixed + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.PmyZ88/_old 2023-06-30 19:58:32.377524768 +0200 +++ /var/tmp/diff_new_pack.PmyZ88/_new 2023-06-30 19:58:32.381524792 +0200 @@ -73,7 +73,7 @@ BuildRequires: containerd-devel BuildRequires: grpc-devel BuildRequires: libcurl-devel -BuildRequires: protobuf-devel +BuildRequires: protobuf-devel < 22 %define arg_containerinfo --enable-containerinfo=yes %else %define arg_containerinfo --enable-containerinfo=no

1 0

commit libphonenumber for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libphonenumber for openSUSE:Factory checked in at 2023-06-30 19:58:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libphonenumber (Old) and /work/SRC/openSUSE:Factory/.libphonenumber.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libphonenumber" Fri Jun 30 19:58:15 2023 rev:5 rq:1095368 version:8.13.15 Changes: -------- --- /work/SRC/openSUSE:Factory/libphonenumber/libphonenumber.changes 2021-05-23 23:30:28.100771227 +0200 +++ /work/SRC/openSUSE:Factory/.libphonenumber.new.13546/libphonenumber.changes 2023-06-30 19:58:29.773509280 +0200 @@ -1,0 +2,34 @@ +Mon Jun 26 09:00:14 UTC 2023 - Fabian Vogt <fvogt(a)suse.com> + +- absl is also needed for using the -devel package + +------------------------------------------------------------------- +Fri Jun 23 06:14:07 UTC 2023 - Fabian Vogt <fvogt(a)suse.com> + +- Update to version 8.13.15: + * Updated phone metadata for region code(s): BE, BF, IL, MN, NE, OM, SO, SV + * Updated carrier data for country calling code(s): + 226 (en), 227 (en), 252 (en), 351 (en), 968 (en), 972 (en) + +------------------------------------------------------------------- +Wed Jun 14 06:51:08 UTC 2023 - Fabian Vogt <fvogt(a)suse.com> + +- Update to version 8.13.14: + * Many data changes + * Removal of unused leading_zero_possible proto field in + phonemetadata.proto and all generated code + * https://github.com/google/libphonenumber/blob/v8.13.14/release_notes.txt +- Depends on abseil now +- Turn metadata regeneration off explicitly, wasn't done previously + either. This allows dropping the java dependency. +- Add patches to fix building: + * 0001-Build-with-C-17.patch + * 0001-Revert-Fix-typo-in-arguments-to-add_metadata_gen_tar.patch +- protobuf got fixed, builds fine with 22 now + +------------------------------------------------------------------- +Tue Jun 13 16:03:57 UTC 2023 - Dirk M��ller <dmueller(a)suse.com> + +- prefer protobuf 21 as it is not compatible with v22 + +------------------------------------------------------------------- Old: ---- libphonenumber-8.12.23.obscpio New: ---- 0001-Build-with-C-17.patch 0001-Revert-Fix-typo-in-arguments-to-add_metadata_gen_tar.patch libphonenumber-8.13.15.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libphonenumber.spec ++++++ --- /var/tmp/diff_new_pack.uNvIoS/_old 2023-06-30 19:58:31.193517726 +0200 +++ /var/tmp/diff_new_pack.uNvIoS/_new 2023-06-30 19:58:31.197517750 +0200 @@ -1,7 +1,7 @@ # # spec file for package libphonenumber # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,26 @@ Name: libphonenumber -Version: 8.12.23 +Version: 8.13.15 Release: 0 %define lib_ver 8 -%define lib_ver2 8.12 +%define lib_ver2 8.13 Summary: Library for parsing, formatting, and validating international phone numbers License: Apache-2.0 Group: Development/Libraries/C and C++ URL: https://github.com/google/libphonenumber Source: %{name}-%{version}.tar.xz +# PATCH-FIX-DOWNSTREAM (for using system abseil) +Patch1: 0001-Build-with-C-17.patch +# PATCH-FIX-DOWNSTREAM (see https://github.com/google/libphonenumber/pull/2874) +Patch2: 0001-Revert-Fix-typo-in-arguments-to-add_metadata_gen_tar.patch BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: java BuildRequires: libboost_date_time-devel BuildRequires: libboost_system-devel BuildRequires: libboost_thread-devel +# Actual version requirement unknown +BuildRequires: cmake(absl) BuildRequires: pkgconfig(gtest) BuildRequires: pkgconfig(icu-i18n) >= 4.4 BuildRequires: pkgconfig(icu-uc) >= 4.4 @@ -55,6 +60,7 @@ Summary: Library for parsing, formatting, and validating international phone numbers Group: Development/Libraries/C and C++ Requires: %{name}%{lib_ver} = %{version} +Requires: cmake(absl) Requires: pkgconfig(protobuf) >= 2.4 %description devel @@ -74,7 +80,7 @@ cd cpp # Enabling the geocoder breaks quite a lot due to broken cmakelists # (https://github.com/google/libphonenumber/pull/2556) -%cmake -DBUILD_STATIC_LIB=OFF -DBUILD_SHARED_LIB=ON -DBUILD_TESTING=ON -DBUILD_GEOCODER=OFF +%cmake -DBUILD_STATIC_LIB=OFF -DBUILD_SHARED_LIB=ON -DBUILD_TESTING=ON -DBUILD_GEOCODER=OFF -DREGENERATE_METADATA=OFF %make_jobs %install @@ -96,5 +102,7 @@ %files devel %{_libdir}/libphonenumber.so %{_includedir}/phonenumbers/ +%dir %{_libdir}/cmake/ +%{_libdir}/cmake/libphonenumber/ %changelog ++++++ 0001-Build-with-C-17.patch ++++++ From 027de3b5d44f6291bd4785ec7530661ac98cbf53 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fvogt(a)suse.de> Date: Wed, 14 Jun 2023 09:06:02 +0200 Subject: [PATCH] Build with C++17 Recent abseil requires C++14 and TW builds it with C++17, so just use 17 directly. --- cpp/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index cdd7a08..bc331aa 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -19,8 +19,8 @@ cmake_minimum_required (VERSION 3.11) project (libphonenumber VERSION 8.13.0) # Pick the C++ standard to compile with. -# Abseil currently supports C++11, C++14, and C++17. -set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard used to compile this project") +# Abseil currently supports C++14, and C++17. +set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard used to compile this project") set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) -- 2.41.0 ++++++ 0001-Revert-Fix-typo-in-arguments-to-add_metadata_gen_tar.patch ++++++ From f5684c3a2c220fde377c277dbe7784afbc0013cb Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fvogt(a)suse.de> Date: Wed, 14 Jun 2023 09:35:29 +0200 Subject: [PATCH] Revert "Fix typo in arguments to add_metadata_gen_target() (#2874)" This reverts commit 0ecc3d9af734d96d5b01cdf52f0ecdf848a33d68. --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index bc331aa..5b7d2b2 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -394,7 +394,7 @@ add_metadata_gen_target ( ${TEST_METADATA_TARGET} "${RESOURCES_DIR}/PhoneNumberMetadataForTesting.xml" "test_metadata" - "test_metadata" + "metadata" ) list (APPEND TESTING_LIBRARY_SOURCES "src/phonenumbers/test_metadata.cc") -- 2.41.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.uNvIoS/_old 2023-06-30 19:58:31.253518083 +0200 +++ /var/tmp/diff_new_pack.uNvIoS/_new 2023-06-30 19:58:31.257518106 +0200 @@ -2,7 +2,7 @@ <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/google/libphonenumber.git</param> <param name="scm">git</param> - <param name="revision">v8.12.23</param> + <param name="revision">v8.13.15</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param>  ++++++ libphonenumber-8.12.23.obscpio -> libphonenumber-8.13.15.obscpio ++++++ /work/SRC/openSUSE:Factory/libphonenumber/libphonenumber-8.12.23.obscpio /work/SRC/openSUSE:Factory/.libphonenumber.new.13546/libphonenumber-8.13.15.obscpio differ: char 19, line 1 ++++++ libphonenumber.obsinfo ++++++ --- /var/tmp/diff_new_pack.uNvIoS/_old 2023-06-30 19:58:31.305518392 +0200 +++ /var/tmp/diff_new_pack.uNvIoS/_new 2023-06-30 19:58:31.305518392 +0200 @@ -1,6 +1,5 @@ name: libphonenumber -version: 8.12.23 -mtime: 1620724866 -commit: 8767b3e904f2864c1874f3b8e39eeb8bca7d7238 - +version: 8.13.15 +mtime: 1687328489 +commit: d3e97dd640066087e534ea1a1a41137c797b040e

1 0

commit protobuf for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package protobuf for openSUSE:Factory checked in at 2023-06-30 19:58:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/protobuf (Old) and /work/SRC/openSUSE:Factory/.protobuf.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "protobuf" Fri Jun 30 19:58:15 2023 rev:73 rq:1093088 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/protobuf/protobuf.changes 2023-04-29 17:27:52.938477289 +0200 +++ /work/SRC/openSUSE:Factory/.protobuf.new.13546/protobuf.changes 2023-06-30 19:58:25.373483109 +0200 @@ -1,0 +2,42 @@ +Wed Jun 14 08:32:55 UTC 2023 - Fabian Vogt <fvogt(a)suse.com> + +- Add patch to fix linking ThreadSafeArena: + * 0001-Use-the-same-ABI-for-static-and-shared-libraries-on-.patch +- Drop the protobuf-source package, no longer used + +------------------------------------------------------------------- +Tue Jun 13 06:12:11 UTC 2023 - Dirk M��ller <dmueller(a)suse.com> + +- update to 22.5: + C++ + * Add missing cstdint header + * Fix: missing -DPROTOBUF_USE_DLLS in pkg-config (#12700) + * Avoid using string(JOIN..., which requires cmake 3.12 + * Explicitly include GTest package in examples + * Bump Abseil submodule to 20230125.3 (#12660) +- update to 22.4: + C++ + * Fix libprotoc: export useful symbols from .so + * Fix btree issue in map tests. + Python + * Fix bug in _internal_copy_files where the rule would fail in + downstream repositories. + Other + * Bump utf8_range to version with working pkg-config (#12584) + * Fix declared dependencies for pkg-config + * Update abseil dependency and reorder dependencies to ensure + we use the version specified in protobuf_deps. + * Turn off clang::musttail on i386 + +------------------------------------------------------------------- +Sun Jun 11 19:19:40 UTC 2023 - Dirk M��ller <dmueller(a)suse.com> + +- drop python2 handling +- fix version handling and package the private libs again + +------------------------------------------------------------------- +Tue May 9 09:26:46 UTC 2023 - Martin Pluskal <mpluskal(a)suse.com> + +- Fix confusion in versions + +------------------------------------------------------------------- @@ -10,0 +53,48 @@ + +------------------------------------------------------------------- +Mon Apr 24 12:30:51 UTC 2023 - Adrian Schr��ter <adrian(a)suse.de> + +- update to v22.3 + UPB (Python/PHP/Ruby C-Extension) + * Remove src prefix from proto import + * Fix .gitmodules to use the correct absl branch + * Remove erroneous dependency on googletest +- update to 22.2: + Java + * Add version to intra proto dependencies and add kotlin stdlib + dependency + * Add $ back for osgi header + * Remove $ in pom files +- update to 22.1: + * Add visibility of plugin.proto to python directory + * Strip "src" from file name of plugin.proto + * Add OSGi headers to pom files. + * Remove errorprone dependency from kotlin protos. + * Version protoc according to the compiler version number. +- update to 22.0: + * This version includes breaking changes to: Cpp. + Please refer to the migration guide for information: + https://protobuf.dev/support/migration/#compiler-22 + + * [Cpp] Migrate to Abseil's logging library. + * [Cpp] `proto2::Map::value_type` changes to `std::pair`. + * [Cpp] Mark final ZeroCopyInputStream, ZeroCopyOutputStream, + and DefaultFieldComparator classes. + * [Cpp] Add a dependency on Abseil (#10416) + * [Cpp] Remove all autotools usage (#10132) + * [Cpp] Add C++20 reserved keywords + * [Cpp] Dropped C++11 Support + * [Cpp] Delete Arena::Init + * [Cpp] Replace JSON parser with new implementation + * [Cpp] Make RepeatedField::GetArena non-const in order to + support split RepeatedFields. + * long list of bindings specific fixes see + https://github.com/protocolbuffers/protobuf/releases/tag/v22.0 +- python sub packages version is set 4.22.3 as defined in + python/google/protobuf/__init__.py to stay compatible +- skip python2 builds by default +- drop patches: + * 10355.patch, + * gcc12-disable-__constinit-with-c++-11.patch (merged upstream) +- added patches: + * add-missing-stdint-header.patch added for compile fixes Old: ---- 10355.patch gcc12-disable-__constinit-with-c++-11.patch protobuf-21.12.tar.gz New: ---- 0001-Use-the-same-ABI-for-static-and-shared-libraries-on-.patch add-missing-stdint-header.patch protobuf-22.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ protobuf.spec ++++++ --- /var/tmp/diff_new_pack.XW40WF/_old 2023-06-30 19:58:26.273488462 +0200 +++ /var/tmp/diff_new_pack.XW40WF/_new 2023-06-30 19:58:26.289488558 +0200 @@ -18,17 +18,17 @@ %{!?make_build:%global make_build make %{?_smp_mflags}} %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define sover 3_21_12 %define tarname protobuf -%define src_install_dir %{_prefix}/src/%{name} %define extra_java_flags -source 7 -target 7 # requires gmock, which is not yet in the distribution %bcond_with check %bcond_without java -%bcond_without python2 %bcond_without python3 Name: protobuf -Version: 21.12 +Version: 22.5 +# python module have their own version specified in python/google/protobuf/__init__.py +%global gversion 22.5 +%global sover 22_5_0 Release: 0 Summary: Protocol Buffers - Google's data interchange format License: BSD-3-Clause @@ -38,17 +38,17 @@ Source1: manifest.txt.in Source2: baselibs.conf Source1000: %{name}-rpmlintrc -Patch0: gcc12-disable-__constinit-with-c++-11.patch -# https://github.com/protocolbuffers/protobuf/pull/10355 -Patch1: 10355.patch +Patch0: add-missing-stdint-header.patch +# PATCH-FIX-UPSTREAM https://github.com/protocolbuffers/protobuf/commit/4329fde9cf3fab7d1b3a9abe… +Patch1: 0001-Use-the-same-ABI-for-static-and-shared-libraries-on-.patch +BuildRequires: %{python_module abseil} BuildRequires: %{python_module devel} BuildRequires: %{python_module python-dateutil} BuildRequires: %{python_module setuptools} -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: abseil-cpp-devel >= 20230125 +BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: python-rpm-macros BuildRequires: pkgconfig(zlib) @@ -105,76 +105,56 @@ %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries/C and C++ +Requires: abseil-cpp-devel >= 20230125 Requires: gcc-c++ -Requires: libprotobuf%{sover} = %{version} +Requires: libprotobuf%{sover} = %{gversion} Requires: libprotobuf-lite%{sover} Requires: pkgconfig(zlib) Conflicts: protobuf2-devel -Provides: libprotobuf-devel = %{version} +Conflicts: protobuf21-devel +Provides: libprotobuf-devel = %{gversion} %description devel Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. -%package source -Summary: Source code of protobuf -Group: Development/Sources -BuildArch: noarch - -%description source -Protocol Buffers are a way of encoding structured data in an efficient yet -extensible format. Google uses Protocol Buffers for almost all of its internal -RPC protocols and file formats. - -This package contains source code for Protocol Buffers. - -%package -n %{name}-java -Summary: Java Bindings for Google Protocol Buffers -Group: Development/Libraries/Java -Requires: java >= 1.6.0 - -%description -n %{name}-java -This package contains the Java bindings for Google Protocol Buffers. - %if 0%{?python_subpackage_only} %package -n python-%{name} +Version: 4.%{gversion} Summary: Python Bindings for Google Protocol Buffers Group: Development/Libraries/Python -Requires: python-six >= 1.9 %description -n python-%{name} This package contains the Python bindings for Google Protocol Buffers. %else -%package -n python2-%{name} -Summary: Python2 Bindings for Google Protocol Buffers -Group: Development/Libraries/Python -Provides: python-%{name} = %{version} -Obsoletes: python-%{name} < %{version} -Requires: python2-six >= 1.9 - -%description -n python2-%{name} -This package contains the Python bindings for Google Protocol Buffers. - %package -n python3-%{name} +Version: 4.%{gversion} Summary: Python3 Bindings for Google Protocol Buffers Group: Development/Libraries/Python -Requires: python3-six >= 1.9 %description -n python3-%{name} This package contains the Python bindings for Google Protocol Buffers. %endif +%package -n %{name}-java +Summary: Java Bindings for Google Protocol Buffers +Group: Development/Libraries/Java +Requires: java >= 1.6.0 + +%description -n %{name}-java +This package contains the Java bindings for Google Protocol Buffers. + %prep -%autosetup -p1 -n %{tarname}-%{version} +%autosetup -p1 -n %{tarname}-%{gversion} # The previous blank line is crucial for older system being able # to use the autosetup macro mkdir gmock -%if %{with python2} || %{with python3} +%if %{with python3} # only needed for test suite which we don't call anyways. # googleapis is broken on sle12 sed -i '/apputils/d' python/setup.py @@ -184,15 +164,17 @@ sed -i -e '/env python/d' python/google/protobuf/internal/*.py %build -autoreconf -fvi -%configure \ - --disable-static +%global _lto_cflags %{_lto_cflags} -ffat-lto-objects -%make_build +# tests are not part of offical tar ball +%cmake \ + -Dprotobuf_BUILD_TESTS=OFF \ + -Dprotobuf_ABSL_PROVIDER=package +%cmake_build %if %{with java} -pushd java -../src/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto +pushd ../java +../build/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto mkdir classes javac %{extra_java_flags} -d classes core/src/main/java/com/google/protobuf/*.java sed -e 's/@VERSION@/%{version}/' < %{SOURCE1} > manifest.txt @@ -200,7 +182,8 @@ popd %endif -pushd python +pushd ../python +export PROTOC=../build/protoc %python_build popd @@ -210,10 +193,8 @@ %endif %install -%make_install +%cmake_install install -Dm 0644 editors/proto.vim %{buildroot}%{_datadir}/vim/site/syntax/proto.vim -# no need for that -find %{buildroot} -type f -name "*.la" -delete -print %if %{with java} pushd java @@ -229,27 +210,11 @@ %endif pushd python +export PROTOC=../build/protoc %python_install popd %python_expand %fdupes %{buildroot}%{$python_sitelib} -mkdir -p %{buildroot}%{src_install_dir} -tar -xzf %{SOURCE0} --strip-components=1 -C %{buildroot}%{src_install_dir} -%fdupes %{buildroot}%{src_install_dir} -# Fix env-script-interpreter rpmlint error -find %{buildroot}%{src_install_dir} -type f -name "*.js" -exec sed -i 's|#!.*%{_bindir}/env node|#!%{_bindir}/node|' "{}" + -find %{buildroot}%{src_install_dir} -type f -name "*.py" -exec sed -i 's|#!.*%{_bindir}/env python2.7|#!%{_bindir}/python2.7|' "{}" + -find %{buildroot}%{src_install_dir} -type f -name "*.py" -exec sed -i 's|#!.*%{_bindir}/env python|#!%{_bindir}/python|' "{}" + -find %{buildroot}%{src_install_dir} -type f -name "*.rb" -exec sed -i 's|#!.*%{_bindir}/env ruby|#!%{_bindir}/ruby|' "{}" + -find %{buildroot}%{src_install_dir} -type f -name "*.sh" -exec sed -i 's|#!.*%{_bindir}/env bash|#!/bin/bash|' "{}" + -# And stop requiring ridiculously old Python version -find %{buildroot}%{src_install_dir} -type f -name "*.py" -exec sed -i 's|#!%{_bindir}/python2.4|#!%{_bindir}/python2.7|' "{}" + -# Fix spurious-executable-perm rpmlint error -chmod -x %{buildroot}%{src_install_dir}/src/google/protobuf/arenastring.h -chmod -x %{buildroot}%{src_install_dir}/src/google/protobuf/reflection.h -# Fix version-control-internal-file rpmlint warning -find %{buildroot}%{src_install_dir} -type f -name ".gitignore" -exec rm -f "{}" + - %fdupes %{buildroot}%{_prefix} %post -n libprotobuf%{sover} -p /sbin/ldconfig @@ -261,42 +226,41 @@ %files -n libprotobuf%{sover} %license LICENSE -%{_libdir}/libprotobuf-3.%{version}.so +%{_libdir}/libprotobuf.so.%{gversion}.0 %files -n libprotoc%{sover} -%{_libdir}/libprotoc-3.%{version}.so +%{_libdir}/libprotoc.so.%{gversion}.0 %files -n libprotobuf-lite%{sover} -%{_libdir}/libprotobuf-lite-3.%{version}.so +%{_libdir}/libprotobuf-lite.so.%{gversion}.0 %files devel -%doc CHANGES.txt CONTRIBUTORS.txt README.md -%{_bindir}/protoc +%doc CONTRIBUTORS.txt README.md +%{_bindir}/protoc* %{_includedir}/google +%{_includedir}/*.h +%{_libdir}/cmake/protobuf +%{_libdir}/cmake/utf8_range %{_libdir}/pkgconfig/* %{_libdir}/libprotobuf-lite.so %{_libdir}/libprotobuf.so %{_libdir}/libprotoc.so +%{_libdir}/libutf8_range.a +%{_libdir}/libutf8_validity.a %{_datadir}/vim -%files source -%{src_install_dir} - %if %{with java} %files -n %{name}-java -f java/.mfiles %{_javadir}/%{name}.jar %endif -%if %{with python2} && ! 0%{?python_subpackage_only} -%files -n python2-%{name} -%license LICENSE -%{python2_sitelib}/* -%endif - -%if %{with python3} || ( %{with python2} && 0%{?python_subpackage_only} ) +%if %{with python3} %files %{python_files %{name}} %license LICENSE -%{python_sitelib}/* +%dir %{python_sitelib}/google +%{python_sitelib}/google/protobuf +%{python_sitelib}/protobuf*nspkg.pth +%{python_sitelib}/protobuf*info %endif %changelog ++++++ 0001-Use-the-same-ABI-for-static-and-shared-libraries-on-.patch ++++++ From 9820a511465c6f31a19bb3cad276e680ed9f2ee9 Mon Sep 17 00:00:00 2001 From: "Romain Geissler @ Amadeus" <romain.geissler(a)amadeus.com> Date: Tue, 6 Jun 2023 10:49:55 -0700 Subject: [PATCH] Use the same ABI for static and shared libraries on non-Windows platforms (#12983) Hi, It seems that until last year, the logic behind `PROTOBUF_USE_DLLS` was for Windows (MSCV) only. It was changed to all platforms here in https://github.com/protocolbuffers/protobuf/commit/5a0887fc6529596eff5c0f72… Last month, the generated pkg config files were updated to reflect the protobuf build-time value of `PROTOBUF_USE_DLLS` as it was indeed noted that it changes the ABI. This was done in https://github.com/protocolbuffers/protobuf/pull/12700 In the commit message it is mentionned that most likely we shall rather have a stable ABI. Finally in https://github.com/protocolbuffers/protobuf/issues/12746 which at some point mentions https://issuetracker.google.com/issues/283987730#comment7 where a Google employee hits the linker issue: ``` undefined reference to `google::protobuf::internal::ThreadSafeArena::thread_cache_' ``` which denotes a mix of some .o or libs built `PROTOBUF_USE_DLLS` defined and some others build with `PROTOBUF_USE_DLLS` undefined, resulting in ABI incompatibilities. I also hit this issue while trying to include protobuf in a corporate environment using it's own proprietary build system in which it is expected that .a and .so use a compatible ABI. From my own understanding, ideally we should always use `thread_local` variables, but experience has shown that: - old iOS (iOS < 9) didn't seem to accept `thread_local`, leading to the `GOOGLE_PROTOBUF_NO_THREADLOCAL` macro later renamed `PROTOBUF_NO_THREADLOCAL` which allowed to disable this, but it is not set anywhere in the protobuf code base. Also I doubt you still want to support such old iOS now, so maybe you should consider removing all `PROTOBUF_NO_THREADLOCAL` related code paths (this pull request doesn't do this). - MSVC's DLL interface doesn't seem to accept exporting thread local variables (at least from what I understood, I know absolutely nothing about the Windows ecosystem), yet we can "hide" a thread local variable in a static function using a thread local variable. However in that case the access to TLS variable is not inlined, leading to worse performances, this hack shall be done only for Windows (actually when using MSVC) *AND* we build a shared library. - In all other cases, a classical `thread_local` shall be used, no matter if we build a static or a shared library. In particular on Linux which I guess is the target Google cares the more about for its own production. This pull request achieves this. Am I right in my conclusion ? Closes #12983 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/… from Romain-Geissler-1A:stable-abi-use-dll-non-windows dc23ff50f67cf0c8e45900a78700d1fc3e8bec39 PiperOrigin-RevId: 538230923 (cherry picked from commit 4329fde9cf3fab7d1b3a9abe0fbeee1ad8a8b111) --- src/google/protobuf/arena.cc | 2 +- src/google/protobuf/thread_safe_arena.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/google/protobuf/arena.cc b/src/google/protobuf/arena.cc index 071360f14..0e4f12140 100644 --- a/src/google/protobuf/arena.cc +++ b/src/google/protobuf/arena.cc @@ -493,7 +493,7 @@ ThreadSafeArena::ThreadCache& ThreadSafeArena::thread_cache() { new internal::ThreadLocalStorage<ThreadCache>(); return *thread_cache_->Get(); } -#elif defined(PROTOBUF_USE_DLLS) +#elif defined(PROTOBUF_USE_DLLS) && defined(_MSC_VER) ThreadSafeArena::ThreadCache& ThreadSafeArena::thread_cache() { static PROTOBUF_THREAD_LOCAL ThreadCache thread_cache; return thread_cache; diff --git a/src/google/protobuf/thread_safe_arena.h b/src/google/protobuf/thread_safe_arena.h index d2a3e6e72..bcb9869d5 100644 --- a/src/google/protobuf/thread_safe_arena.h +++ b/src/google/protobuf/thread_safe_arena.h @@ -257,9 +257,9 @@ class PROTOBUF_EXPORT ThreadSafeArena { // iOS does not support __thread keyword so we use a custom thread local // storage class we implemented. static ThreadCache& thread_cache(); -#elif defined(PROTOBUF_USE_DLLS) - // Thread local variables cannot be exposed through DLL interface but we can - // wrap them in static functions. +#elif defined(PROTOBUF_USE_DLLS) && defined(_MSC_VER) + // Thread local variables cannot be exposed through MSVC DLL interface but we + // can wrap them in static functions. static ThreadCache& thread_cache(); #else PROTOBUF_CONSTINIT static PROTOBUF_THREAD_LOCAL ThreadCache thread_cache_; -- 2.41.0 ++++++ add-missing-stdint-header.patch ++++++ --- a/src/google/protobuf/port.h.orig 2023-04-24 14:27:40.734888878 +0200 +++ b/src/google/protobuf/port.h 2023-04-24 14:27:53.607255222 +0200 @@ -33,6 +33,8 @@ // port_def.inc and port_undef.inc so they are not visible from outside of // protobuf. +#include <stdint.h> + #ifndef GOOGLE_PROTOBUF_PORT_H__ #define GOOGLE_PROTOBUF_PORT_H__ ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.XW40WF/_old 2023-06-30 19:58:26.365489010 +0200 +++ /var/tmp/diff_new_pack.XW40WF/_new 2023-06-30 19:58:26.369489033 +0200 @@ -1,4 +1,4 @@ -libprotobuf3_21_12 -libprotoc3_21_12 -libprotobuf-lite3_21_12 +libprotobuf22_5_0 +libprotoc22_5_0 +libprotobuf-lite22_5_0 ++++++ protobuf-21.12.tar.gz -> protobuf-22.5.tar.gz ++++++ ++++ 602260 lines of diff (skipped)

1 0

commit protobuf-c for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package protobuf-c for openSUSE:Factory checked in at 2023-06-30 19:58:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/protobuf-c (Old) and /work/SRC/openSUSE:Factory/.protobuf-c.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "protobuf-c" Fri Jun 30 19:58:13 2023 rev:26 rq:1092721 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/protobuf-c/protobuf-c.changes 2023-04-25 16:54:14.770649700 +0200 +++ /work/SRC/openSUSE:Factory/.protobuf-c.new.13546/protobuf-c.changes 2023-06-30 19:58:23.729473331 +0200 @@ -1,0 +2,6 @@ +Mon Jun 12 20:06:14 UTC 2023 - Dirk M��ller <dmueller(a)suse.com> + +- limit to protobuf < 22 as it is not compatible with newer + versions (gh#protobuf-c#544) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ protobuf-c.spec ++++++ --- /var/tmp/diff_new_pack.2amQil/_old 2023-06-30 19:58:24.665478898 +0200 +++ /var/tmp/diff_new_pack.2amQil/_new 2023-06-30 19:58:24.709479160 +0200 @@ -33,7 +33,9 @@ BuildRequires: libtool BuildRequires: make BuildRequires: pkgconfig -BuildRequires: protobuf-devel >= 2.6.0 +# not compatible with v22 due to https://protobuf.dev/news/2022-08-03/#cpp-changes +# see https://github.com/protobuf-c/protobuf-c/issues/544 +BuildRequires: (protobuf-devel >= 2.6.0 with protobuf-devel < 22) %description This package provides a code generator and runtime libraries to use Protocol @@ -53,7 +55,7 @@ Summary: C bindings for Google's Protocol Buffers Group: Development/Libraries/C and C++ Requires: libprotobuf-c%sover = %version -Recommends: protobuf-devel +Recommends: (protobuf-devel >= 2.6.0 with protobuf-devel < 22) Provides: %name = %version Obsoletes: %name <= 1.4.0

1 0

commit python-pycryptodome for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pycryptodome for openSUSE:Factory checked in at 2023-06-30 19:58:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pycryptodome (Old) and /work/SRC/openSUSE:Factory/.python-pycryptodome.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pycryptodome" Fri Jun 30 19:58:10 2023 rev:26 rq:1096020 version:3.18.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pycryptodome/python-pycryptodome.changes 2023-06-04 00:11:42.257211813 +0200 +++ /work/SRC/openSUSE:Factory/.python-pycryptodome.new.13546/python-pycryptodome.changes 2023-06-30 19:58:20.377453394 +0200 @@ -1,0 +2,5 @@ +Wed Jun 28 13:36:37 UTC 2023 - ecsos <ecsos(a)opensuse.org> + +- Add %{?sle15_python_module_pythons} + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pycryptodome.spec ++++++ --- /var/tmp/diff_new_pack.1ohafj/_old 2023-06-30 19:58:21.109457747 +0200 +++ /var/tmp/diff_new_pack.1ohafj/_new 2023-06-30 19:58:21.109457747 +0200 @@ -18,6 +18,7 @@ %define oldpython python %define min_version %{lua:rpm.expand("%{version}"):gsub("^(%d+%.%d+).*", "%1")} +%{?sle15_python_module_pythons} Name: python-pycryptodome Version: 3.18.0 Release: 0

1 0

commit hwloc for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hwloc for openSUSE:Factory checked in at 2023-06-30 19:58:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwloc (Old) and /work/SRC/openSUSE:Factory/.hwloc.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hwloc" Fri Jun 30 19:58:09 2023 rev:29 rq:1096014 version:2.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/hwloc/hwloc.changes 2023-06-29 17:27:50.698089420 +0200 +++ /work/SRC/openSUSE:Factory/.hwloc.new.13546/hwloc.changes 2023-06-30 19:58:19.445447850 +0200 @@ -1,0 +2,9 @@ +Tue Jun 20 20:22:08 UTC 2023 - Dirk M��ller <dmueller(a)suse.com> + +- update to 2.9.1: + * Fix a failed assertion in hwloc_topology_restrict() when some + NUMA nodes are removed because of + HWLOC_RESTRICT_FLAG_REMOVE_CPULESS but no PUs are. + * Mark HPE Cray Slingshot NICs with subtype "Slingshot". + +------------------------------------------------------------------- Old: ---- hwloc-2.9.0.tar.bz2 New: ---- hwloc-2.9.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwloc.spec ++++++ --- /var/tmp/diff_new_pack.daWu7w/_old 2023-06-30 19:58:20.161452109 +0200 +++ /var/tmp/diff_new_pack.daWu7w/_new 2023-06-30 19:58:20.169452156 +0200 @@ -29,7 +29,7 @@ %global lname libhwloc15 Name: hwloc -Version: 2.9.0 +Version: 2.9.1 Release: 0 Summary: Portable Hardware Locality License: BSD-3-Clause ++++++ hwloc-2.9.0.tar.bz2 -> hwloc-2.9.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/hwloc/hwloc-2.9.0.tar.bz2 /work/SRC/openSUSE:Factory/.hwloc.new.13546/hwloc-2.9.1.tar.bz2 differ: char 11, line 1

1 0