From 4009409c765d1b92da27bd5b06bcea5a35826dc7 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Oct 15 2020 21:34:24 +0000 Subject: Adjust includes for gcc-11 --- diff --git a/okteta-gcc11.patch b/okteta-gcc11.patch new file mode 100644 index 0000000..4fb7472 --- /dev/null +++ b/okteta-gcc11.patch @@ -0,0 +1,29 @@ +diff --git a/kasten/controllers/view/structures/allprimitivetypes.cpp b/kasten/controllers/view/structures/allprimitivetypes.cpp +index c4f6185..60c3fd2 100644 +--- a/kasten/controllers/view/structures/allprimitivetypes.cpp ++++ b/kasten/controllers/view/structures/allprimitivetypes.cpp +@@ -6,6 +6,7 @@ + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL + */ + ++#include + #include "allprimitivetypes.hpp" + #include "datatypes/primitive/primitivedatainformation.hpp" + +diff --git a/kasten/controllers/view/structures/datatypes/primitive/enumdefinition.cpp b/kasten/controllers/view/structures/datatypes/primitive/enumdefinition.cpp +index 384e0f7..cafedc1 100644 +--- a/kasten/controllers/view/structures/datatypes/primitive/enumdefinition.cpp ++++ b/kasten/controllers/view/structures/datatypes/primitive/enumdefinition.cpp +@@ -6,11 +6,11 @@ + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL + */ + ++#include + #include "enumdefinition.hpp" + + #include + #include +-#include + + #include "../../script/scriptlogger.hpp" + diff --git a/okteta.spec b/okteta.spec index ba44976..8132d51 100644 --- a/okteta.spec +++ b/okteta.spec @@ -4,7 +4,7 @@ Name: okteta Summary: Binary/hex editor Epoch: 1 Version: 0.26.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and GFDL URL: https://cgit.kde.org/%{name}.git @@ -16,6 +16,7 @@ URL: https://cgit.kde.org/%{name}.git %global stable stable %endif Source0: http://download.kde.org/%{stable}/okteta/%{version}/src/%{name}-%{version}.tar.xz +Patch0: okteta-gcc11.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -89,7 +90,7 @@ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %prep -%autosetup +%autosetup -p1 %build @@ -152,6 +153,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.okteta.deskto %changelog +* Thu Oct 15 2020 Jeff Law - 1:0.26.4-2 +- Adjust includes for gcc-11 + * Sun Aug 09 2020 Marie Loise Nolden - 1:0.26.4-1 - 0.26.4