From 0b0f97bb141d1d0d8c2df3a5ccdaffda35476f800796280f2f83e632b4bfbdc0 Mon Sep 17 00:00:00 2001 From: Robert Frohl Date: Tue, 28 Mar 2023 08:44:07 +0000 Subject: [PATCH] Accepting request 1074918 from home:rfrohl:branches:hardware fix build failure with gcc13 OBS-URL: https://build.opensuse.org/request/show/1074918 OBS-URL: https://build.opensuse.org/package/show/hardware/usbguard?expand=0&rev=48 --- build_gcc13.patch | 24 ++++++++++++++++++++++++ usbguard.changes | 5 +++++ usbguard.spec | 4 +++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 build_gcc13.patch diff --git a/build_gcc13.patch b/build_gcc13.patch new file mode 100644 index 0000000..c542615 --- /dev/null +++ b/build_gcc13.patch @@ -0,0 +1,24 @@ +diff --git a/src/Library/Base64.cpp b/src/Library/Base64.cpp +index ddb28dc..0246a13 100644 +--- a/src/Library/Base64.cpp ++++ b/src/Library/Base64.cpp +@@ -22,7 +22,6 @@ + + #include "Base64.hpp" + #include +-#include + + namespace usbguard + { +diff --git a/src/Library/Base64.hpp b/src/Library/Base64.hpp +index 0947f21..aa76311 100644 +--- a/src/Library/Base64.hpp ++++ b/src/Library/Base64.hpp +@@ -24,6 +24,7 @@ + + #include + #include ++#include + + namespace usbguard + { diff --git a/usbguard.changes b/usbguard.changes index bfe2b4a..d3bb457 100644 --- a/usbguard.changes +++ b/usbguard.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 28 08:25:34 UTC 2023 - Robert Frohl + +- Fix build failure with gcc13, add build_gcc13.patch. + ------------------------------------------------------------------- Mon Sep 5 08:55:51 UTC 2022 - Robert Frohl diff --git a/usbguard.spec b/usbguard.spec index d8a0455..5d276bd 100644 --- a/usbguard.spec +++ b/usbguard.spec @@ -1,7 +1,7 @@ # # spec file for package usbguard # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,7 @@ Source2: usbguard.keyring Source3: usbguard-daemon.conf Source4: usbguard-rpmlintrc Patch0: usbguard-pthread.patch +Patch1: build_gcc13.patch BuildRequires: asciidoc BuildRequires: audit-devel BuildRequires: autoconf @@ -96,6 +97,7 @@ software framework. %prep %setup -q -n usbguard-%{version} %patch0 -p1 +%patch1 -p1 %build %if 0%{?suse_version} == 1500