From 5ff3415971b7a8675c5238cebe4184ab7abfb0b6 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 1 Mar 2021 11:50:49 +0100 Subject: [PATCH] fix build with GCC-11 --- libebml-gcc11.patch | 22 ++++++++++++++++++++++ libebml.spec | 4 ++++ 2 files changed, 26 insertions(+) create mode 100644 libebml-gcc11.patch diff --git a/libebml-gcc11.patch b/libebml-gcc11.patch new file mode 100644 index 0000000..859f763 --- /dev/null +++ b/libebml-gcc11.patch @@ -0,0 +1,22 @@ +diff -up libebml-1.4.2/src/EbmlString.cpp.gcc11 libebml-1.4.2/src/EbmlString.cpp +--- libebml-1.4.2/src/EbmlString.cpp.gcc11 2021-02-18 12:42:59.000000000 +0100 ++++ libebml-1.4.2/src/EbmlString.cpp 2021-03-01 11:42:02.122854703 +0100 +@@ -34,6 +34,7 @@ + \author Steve Lhomme + */ + #include ++#include + + #include "ebml/EbmlString.h" + +diff -up libebml-1.4.2/src/EbmlUnicodeString.cpp.gcc11 libebml-1.4.2/src/EbmlUnicodeString.cpp +--- libebml-1.4.2/src/EbmlUnicodeString.cpp.gcc11 2021-03-01 11:42:02.121854696 +0100 ++++ libebml-1.4.2/src/EbmlUnicodeString.cpp 2021-03-01 11:42:21.772995170 +0100 +@@ -36,6 +36,7 @@ + */ + + #include ++#include + + #include "ebml/EbmlUnicodeString.h" + diff --git a/libebml.spec b/libebml.spec index 8b21ecd..000f227 100644 --- a/libebml.spec +++ b/libebml.spec @@ -6,6 +6,8 @@ License: LGPLv2+ URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz Patch0: %{name}-use-system-utf8cpp.patch +# https://github.com/Matroska-Org/libebml/pull/81 +Patch1: %{name}-gcc11.patch BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: utf8cpp-devel @@ -34,6 +36,7 @@ will use the Extensible Binary Meta Language library. %prep %setup -q %patch0 -p1 -b .utf8cpp +%patch1 -p1 -b .gcc11 rm -r src/lib/utf8-cpp @@ -69,6 +72,7 @@ rm -r src/lib/utf8-cpp * Wed Feb 24 2021 Dominik Mierzejewski - 1.4.2-1 - update to 1.4.2 (#1930172) - fixes CVE-2021-3405 (#1926991) +- fix build with GCC-11 * Tue Jan 26 2021 Fedora Release Engineering - 1.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild