public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/libebml] f45: update to 1.4.7 (resolves rhbz#2520272)
@ 2026-08-24  9:35 Dominik 'Rathann' Mierzejewski
  0 siblings, 0 replies; only message in thread
From: Dominik 'Rathann' Mierzejewski @ 2026-08-24  9:35 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/libebml
            Branch : f45
            Commit : 93b1371bf574ed717be19709c48dc79a4c1659c3
            Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
            Date   : 2026-08-24T10:23:26+02:00
            Stats  : +7/-67 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/libebml/c/93b1371bf574ed717be19709c48dc79a4c1659c3?branch=f45

            Log:
            update to 1.4.7 (resolves rhbz#2520272)

- drop merged patch

---
diff --git a/.gitignore b/.gitignore
index e72729c..0bd9252 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ libebml-1.0.0.tar.bz2
 /libebml-1.4.4.tar.xz
 /libebml-1.4.5.tar.xz
 /libebml-1.4.6.tar.xz
+/libebml-1.4.7.tar.xz

diff --git a/libebml-utf8cpp-4.patch b/libebml-utf8cpp-4.patch
deleted file mode 100644
index 8528fad..0000000
--- a/libebml-utf8cpp-4.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 7cf88e1b6caba995d284fe6dbd74b6cb0115ed5d Mon Sep 17 00:00:00 2001
-From: Moritz Bunkus <mo@bunkus.online>
-Date: Tue, 21 Jul 2026 19:32:11 +0200
-Subject: [PATCH] fix detecting & using utf8c++ 4.0.0 or newer
-
-`find_package` with version constraint `3.2.0` does not consider 4.x.y
-to be compatible. Therefore also look for 4.x.y in a secondary
-`find_package` call.
-
-The fallback for cloning from git if neither version is found via
-`cmake` remains in place.
-
-Furthermore, linking against a distro-packaged 4.x.y doesn't seem to
-work with the existing `target_link_libraries(ebml PRIVATE
-$<BUILD_INTERFACE:utf8cpp>)` & requires `PRIVATE
-utf8cpp::utf8cpp`. However, that doesn't work with a git-cloned copy
-nor with distro-packaged 3.2.x as those still requires `PRIVATE
-$<BUILD_INTERFACE:utf8cpp>`.
-
-Therefore make the argument depend on availability of the
-`utf8cpp::utf8cpp` target: it is available only for distro-packaged
-4.x.y. For the other two cases (distro-packaged < 4.x.y & cloned from
-git) we stay with `$<BUILD_INTERFACE:utf8cpp>`.
-
-fixes #344 ; see #345
----
- CMakeLists.txt | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f2469cf5..7ba184fd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,7 +48,7 @@ function(add_cxx_flag_if_supported)
-   endforeach()
- endfunction()
- 
--find_package(utf8cpp 3.2.0)
-+find_package(utf8cpp)
- if(NOT utf8cpp_FOUND)
-   include(FetchContent REQUIRED)
-   FetchContent_Declare(
-@@ -61,6 +61,11 @@ if(NOT utf8cpp_FOUND)
-     )
-     FetchContent_MakeAvailable(utf8cpp)
- endif()
-+if(TARGET utf8cpp::utf8cpp)
-+  set(libebml_utf8cpp_link_libraries utf8cpp::utf8cpp)
-+else()
-+  set(libebml_utf8cpp_link_libraries $<BUILD_INTERFACE:utf8cpp>)
-+endif()
- 
- if(DEV_MODE)
-   message(STATUS "Using developer mode for ${CMAKE_CXX_COMPILER_ID}")
-@@ -157,7 +162,7 @@ if(MSVC)
-   target_compile_definitions(ebml PRIVATE _CRT_SECURE_NO_WARNINGS)
- endif()
- 
--target_link_libraries(ebml PRIVATE $<BUILD_INTERFACE:utf8cpp>)
-+target_link_libraries(ebml PRIVATE ${libebml_utf8cpp_link_libraries})
- 
- include(GenerateExportHeader)
- generate_export_header(ebml EXPORT_MACRO_NAME EBML_DLL_API)

diff --git a/libebml.spec b/libebml.spec
index 333a4b4..cf77507 100644
--- a/libebml.spec
+++ b/libebml.spec
@@ -1,12 +1,10 @@
 Summary:    Extensible Binary Meta Language library
 Name:       libebml
-Version:    1.4.6
+Version:    1.4.7
 Release:    1%{?dist}
 License:    LGPL-2.1-or-later
 URL:        https://www.matroska.org/
 Source:     https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz
-# https://github.com/Matroska-Org/libebml/pull/346
-Patch:      https://github.com/Matroska-Org/libebml/commit/7cf88e1b6caba995d284fe6dbd74b6cb0115ed5d.patch#/libebml-utf8cpp-4.patch
 BuildRequires: cmake
 BuildRequires: gcc-c++
 BuildRequires: utf8cpp-devel
@@ -62,6 +60,10 @@ will use the Extensible Binary Meta Language library.
 
 
 %changelog
+* Mon Aug 24 2026 Dominik Mierzejewski <dominik@greysector.net> - 1.4.7-1
+- update to 1.4.7 (resolves rhbz#2520272)
+- drop merged patch
+
 * Thu Jul 23 2026 Dominik Mierzejewski <dominik@greysector.net> - 1.4.6-1
 - update to 1.4.6 (resolves rhbz#2502270)
 - drop merged patches

diff --git a/sources b/sources
index 6ede0b4..08426b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libebml-1.4.6.tar.xz) = 86b469a1c1352e9ea6f581267ab8fc357575f2e410a3a732b12203575744667b152c135cf314978500d6a19fac4ef4015b89fdcfcca43f5bfc49f63e27ecbce2
+SHA512 (libebml-1.4.7.tar.xz) = 4fbcfb71862d6ea3f04931ad75c01f1e88d3d32f28c225dfee2e22fd4d72bdc109df9d1149708ede40cc80b419a6ab3ae32371d170c9118a5d5be49b628d5ee5

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-24  9:35 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-24  9:35 [rpms/libebml] f45: update to 1.4.7 (resolves rhbz#2520272) Dominik 'Rathann' Mierzejewski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox