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 - m...@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 - m...@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 - m...@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 )
