Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ccache for openSUSE:Factory checked in at 2024-07-19 15:25:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ccache (Old) and /work/SRC/openSUSE:Factory/.ccache.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ccache" Fri Jul 19 15:25:09 2024 rev:78 rq:1188414 version:4.10.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ccache/ccache.changes 2024-07-03 20:29:33.855448746 +0200 +++ /work/SRC/openSUSE:Factory/.ccache.new.17339/ccache.changes 2024-07-19 15:25:17.906319976 +0200 @@ -1,0 +2,5 @@ +Thu Jul 18 09:28:12 UTC 2024 - Ana Guerrero <ana.guerr...@suse.com> + +- Add patch to fix build with fmt 11: fmt_fix.patch + +------------------------------------------------------------------- New: ---- fmt_fix.patch BETA DEBUG BEGIN: New: - Add patch to fix build with fmt 11: fmt_fix.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ccache.spec ++++++ --- /var/tmp/diff_new_pack.6eyeWi/_old 2024-07-19 15:25:18.810355947 +0200 +++ /var/tmp/diff_new_pack.6eyeWi/_new 2024-07-19 15:25:18.810355947 +0200 @@ -31,6 +31,8 @@ Source0: https://github.com/ccache/ccache/releases/download/v%{version}/ccache-%{version}.tar.xz Source1: https://github.com/ccache/ccache/releases/download/v%{version}/ccache-%{version}.tar.xz.asc Source2: %{name}.keyring +# PATCH-FIX-UPSTREAM +Patch0: fmt_fix.patch BuildRequires: cmake BuildRequires: doctest-devel BuildRequires: fmt-devel ++++++ fmt_fix.patch ++++++ Includes two commits: https://github.com/ccache/ccache/commit/71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1 https://github.com/ccache/ccache/commit/3b09afc5f792f0bd0a15cf6b8408ea40eb069787 diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake index 55126a31..7c39291e 100644 --- a/cmake/FindFmt.cmake +++ b/cmake/FindFmt.cmake @@ -3,11 +3,20 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY) if(DEP_FMT STREQUAL "BUNDLED") message(STATUS "Using bundled Fmt as requested") else() - find_path(FMT_INCLUDE_DIR fmt/core.h) + find_path(FMT_INCLUDE_DIR NAMES fmt/base.h fmt/core.h) find_library(FMT_LIBRARY fmt) if(FMT_INCLUDE_DIR AND FMT_LIBRARY) - file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h) - string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}") + if(EXISTS "${FMT_INCLUDE_DIR}/fmt/base.h") + set(_fmt_h base.h) + else() + set(_fmt_h core.h) + endif() + file(READ "${FMT_INCLUDE_DIR}/fmt/${_fmt_h}" _fmt_h_content) + string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_h_content}") + if("${CMAKE_MATCH_0}" STREQUAL "") + message(FATAL_ERROR "FMT_VERSION not found") + return() + endif() math(EXPR _fmt_major "${CMAKE_MATCH_1} / 10000") math(EXPR _fmt_minor "${CMAKE_MATCH_1} / 100 % 100") math(EXPR _fmt_patch "${CMAKE_MATCH_1} % 100")
