Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ueberzugpp for openSUSE:Factory checked in at 2023-08-28 17:15:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ueberzugpp (Old) and /work/SRC/openSUSE:Factory/.ueberzugpp.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ueberzugpp" Mon Aug 28 17:15:51 2023 rev:7 rq:1106184 version:2.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ueberzugpp/ueberzugpp.changes 2023-08-15 16:40:18.611111423 +0200 +++ /work/SRC/openSUSE:Factory/.ueberzugpp.new.1766/ueberzugpp.changes 2023-08-28 17:16:01.274387424 +0200 @@ -1,0 +2,7 @@ +Sun Aug 20 17:12:43 UTC 2023 - Scott Bradnick <scott.bradn...@suse.com> + +- Update to version 2.9.1: + * Fix compilation errors on spdlog 1.12, fmt 10.x and turbo-base64 + * Bump internal dependencies versions + +------------------------------------------------------------------- Old: ---- ueberzugpp-2.9.0.tar.gz New: ---- ueberzugpp-2.9.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ueberzugpp.spec ++++++ --- /var/tmp/diff_new_pack.hEWzbR/_old 2023-08-28 17:16:02.366426640 +0200 +++ /var/tmp/diff_new_pack.hEWzbR/_new 2023-08-28 17:16:02.370426783 +0200 @@ -18,7 +18,7 @@ %define short_name ueberzug Name: ueberzugpp -Version: 2.9.0 +Version: 2.9.1 Release: 0 Summary: Utility to render images in terminals License: GPL-3.0 ++++++ ueberzugpp-2.9.0.tar.gz -> ueberzugpp-2.9.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ueberzugpp-2.9.0/CMakeLists.txt new/ueberzugpp-2.9.1/CMakeLists.txt --- old/ueberzugpp-2.9.0/CMakeLists.txt 2023-08-08 02:30:24.000000000 +0200 +++ new/ueberzugpp-2.9.1/CMakeLists.txt 2023-08-19 06:41:57.000000000 +0200 @@ -22,16 +22,15 @@ endif() cmake_policy(SET CMP0075 NEW) -set(CMAKE_C_STANDARD 11) +set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD_REQUIRED ON) -set(CMAKE_C_EXTENSIONS OFF) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_BUILD_TYPE Debug CACHE STRING "Build type.") -project(ueberzugpp LANGUAGES CXX C VERSION 2.9.0) +project(ueberzugpp LANGUAGES CXX C VERSION 2.9.1) add_executable(ueberzug) option(ENABLE_X11 "Enable X11 canvas." ON) @@ -59,7 +58,6 @@ find_package(Microsoft.GSL CONFIG QUIET) if (NOT Microsoft.GSL_FOUND) - option(GSL_TEST OFF) FetchContent_Declare(GSL URL https://github.com/microsoft/GSL/archive/refs/tags/v4.0.0.tar.gz ) @@ -86,22 +84,23 @@ list(APPEND FC_LIBS nlohmann_json) endif() -find_package(spdlog QUIET) -if(NOT spdlog_FOUND) - FetchContent_Declare(spdlog - URL https://github.com/gabime/spdlog/archive/refs/tags/v1.11.0.tar.gz - ) - list(APPEND FC_LIBS spdlog) -endif() - find_package(fmt QUIET) if(NOT fmt_FOUND) FetchContent_Declare(fmt - URL https://github.com/fmtlib/fmt/archive/refs/tags/9.1.0.tar.gz + URL https://github.com/fmtlib/fmt/archive/refs/tags/10.1.0.tar.gz ) list(APPEND FC_LIBS fmt) endif() +find_package(spdlog QUIET) +if(NOT spdlog_FOUND) + set(SPDLOG_FMT_EXTERNAL ON) + FetchContent_Declare(spdlog + URL https://github.com/gabime/spdlog/archive/refs/tags/v1.12.0.tar.gz + ) + list(APPEND FC_LIBS spdlog) +endif() + if(FC_LIBS) FetchContent_MakeAvailable(${FC_LIBS}) endif() @@ -203,7 +202,7 @@ if (NOT turbobase64_FOUND) FetchContent_Declare( turbobase64 - URL https://github.com/powturbo/Turbo-Base64/archive/refs/tags/2023.04.tar.gz + URL https://github.com/powturbo/Turbo-Base64/archive/refs/tags/2023.08.tar.gz ) FetchContent_Populate(turbobase64) add_subdirectory(${turbobase64_SOURCE_DIR} ${turbobase64_BINARY_DIR} EXCLUDE_FROM_ALL) @@ -276,8 +275,8 @@ nlohmann_json::nlohmann_json CLI11::CLI11 Threads::Threads - spdlog::spdlog fmt::fmt + spdlog::spdlog OpenSSL::Crypto Microsoft.GSL::GSL TBB::tbb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ueberzugpp-2.9.0/src/application.cpp new/ueberzugpp-2.9.1/src/application.cpp --- old/ueberzugpp-2.9.0/src/application.cpp 2023-08-08 02:30:24.000000000 +0200 +++ new/ueberzugpp-2.9.1/src/application.cpp 2023-08-19 06:41:57.000000000 +0200 @@ -57,7 +57,8 @@ } tmux::register_hooks(); socket_thread = std::thread([this] { - logger->info("Listening for commands on socket {}", util::get_socket_path()); + const auto sock_path = util::get_socket_path(); + logger->info("Listening for commands on socket {}", sock_path); socket_loop(); }); if (flags->no_cache) { @@ -93,7 +94,8 @@ logger->error("Command received is not valid json"); return; } - logger->info("Command received: {}", json.dump()); + const auto json_str = json.dump(); + logger->info("Command received: {}", json_str); const std::string& action = json.at("action"); if (action == "tmux") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ueberzugpp-2.9.0/src/canvas/x11/x11.cpp new/ueberzugpp-2.9.1/src/canvas/x11/x11.cpp --- old/ueberzugpp-2.9.0/src/canvas/x11/x11.cpp 2023-08-08 02:30:24.000000000 +0200 +++ new/ueberzugpp-2.9.1/src/canvas/x11/x11.cpp 2023-08-19 06:41:57.000000000 +0200 @@ -21,6 +21,8 @@ #include "application.hpp" #include "flags.hpp" +#include <string_view> + #include <spdlog/spdlog.h> #ifdef ENABLE_OPENGL @@ -231,9 +233,11 @@ const char *major = xcb_errors_get_name_for_major_code(err_ctx, err->major_code); const char *minor = xcb_errors_get_name_for_minor_code(err_ctx, err->major_code, err->minor_code); const char *error = xcb_errors_get_name_for_error(err_ctx, err->error_code, &extension); + + const std::string_view ext_str = extension != nullptr ? extension : "no_extension"; + const std::string_view minor_str = minor != nullptr ? minor : "no_minor"; logger->error("XCB: {}:{}, {}:{}, resource {} sequence {}", - error, extension != nullptr ? extension : "no_extension", - major, minor != nullptr ? minor : "no_minor", + error, ext_str, major, minor_str, err->resource_id, err->sequence); #else logger->error("XCB: resource {} sequence {}", err->resource_id, err->sequence); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ueberzugpp-2.9.0/src/dimensions.cpp new/ueberzugpp-2.9.1/src/dimensions.cpp --- old/ueberzugpp-2.9.0/src/dimensions.cpp 2023-08-08 02:30:24.000000000 +0200 +++ new/ueberzugpp-2.9.1/src/dimensions.cpp 2023-08-19 06:41:57.000000000 +0200 @@ -36,7 +36,7 @@ void Dimensions::read_offsets() { - auto [offset_x, offset_y] = tmux::get_offset(); + const auto [offset_x, offset_y] = tmux::get_offset(); x = orig_x + offset_x; y = orig_y + offset_y; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ueberzugpp-2.9.0/src/main.cpp new/ueberzugpp-2.9.1/src/main.cpp --- old/ueberzugpp-2.9.0/src/main.cpp 2023-08-08 02:30:24.000000000 +0200 +++ new/ueberzugpp-2.9.1/src/main.cpp 2023-08-19 06:41:57.000000000 +0200 @@ -14,13 +14,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see <https://www.gnu.org/licenses/>. +#include <csignal> + #include <CLI/App.hpp> #include <CLI/Formatter.hpp> #include <CLI/Config.hpp> -#include <csignal> -#include <fmt/format.h> - -#include <spdlog/spdlog-inl.h> +#include <spdlog/spdlog.h> #include <spdlog/cfg/env.h> #include "application.hpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ueberzugpp-2.9.0/src/util/egl.cpp new/ueberzugpp-2.9.1/src/util/egl.cpp --- old/ueberzugpp-2.9.0/src/util/egl.cpp 2023-08-08 02:30:24.000000000 +0200 +++ new/ueberzugpp-2.9.1/src/util/egl.cpp 2023-08-19 06:41:57.000000000 +0200 @@ -76,7 +76,8 @@ logger = spdlog::get("opengl"); if (display == EGL_NO_DISPLAY) { - logger->error("Could not obtain display, error {}", error_to_string()); + const auto err = error_to_string(); + logger->error("Could not obtain display, error {}", err); throw std::runtime_error(""); } @@ -84,7 +85,8 @@ EGLint egl_minor = 0; EGLBoolean eglres = eglInitialize(display, &egl_major, &egl_minor); if (eglres != EGL_TRUE) { - logger->error("Could not initialize display, error {}", error_to_string()); + const auto err = error_to_string(); + logger->error("Could not initialize display, error {}", err); throw std::runtime_error(""); } if (egl_major != egl_major_version && egl_minor != egl_minor_version) { @@ -94,14 +96,16 @@ eglres = eglBindAPI(EGL_OPENGL_API); if (eglres != EGL_TRUE) { - logger->error("Could not bind to OpenGL API, error {}", error_to_string()); + const auto err = error_to_string(); + logger->error("Could not bind to OpenGL API, error {}", err); throw std::runtime_error(""); } int num_config = 0; eglres = eglChooseConfig(display, config_attrs.data(), &config, 1, &num_config); if (eglres != EGL_TRUE || num_config != 1) { - logger->error("Could not create config, error {}", error_to_string()); + const auto err = error_to_string(); + logger->error("Could not create config, error {}", err); throw std::runtime_error(""); } @@ -140,7 +144,8 @@ { EGLContext context = eglCreateContext(display, config, EGL_NO_CONTEXT, context_attrs.data()); if (context == EGL_NO_CONTEXT) { - logger->error("Could not create context, error {}", error_to_string()); + const auto err = error_to_string(); + logger->error("Could not create context, error {}", err); return context; } @@ -159,7 +164,8 @@ { EGLSurface surface = eglCreatePlatformWindowSurface(display, config, native_window, nullptr); if (surface == EGL_NO_SURFACE) { - logger->error("Could not create surface, error {}", error_to_string()); + const auto err = error_to_string(); + logger->error("Could not create surface, error {}", err); } return surface; }