From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/usbguard/files/, sys-apps/usbguard/
Date: Sat, 28 Jan 2023 03:42:34 +0000 (UTC) [thread overview]
Message-ID: <1674877087.a476c8790b1af7e68090acf82fd18dea8bb04daa.sam@gentoo> (raw)
commit: a476c8790b1af7e68090acf82fd18dea8bb04daa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 03:38:05 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 03:38:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a476c879
sys-apps/usbguard: fix build w/ gcc 13
There's another PR upstream which drops a redundant include but I'd rather
just go with the obviously-correct one (as adding an include like this isn't
going to be a problem for standard headers guarded properly) to unblock
more testing.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/usbguard/files/usbguard-1.1.2-gcc-13.patch | 19 +++++++++++++++++++
sys-apps/usbguard/usbguard-1.1.2.ebuild | 6 +++++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/sys-apps/usbguard/files/usbguard-1.1.2-gcc-13.patch b/sys-apps/usbguard/files/usbguard-1.1.2-gcc-13.patch
new file mode 100644
index 000000000000..79168f584ded
--- /dev/null
+++ b/sys-apps/usbguard/files/usbguard-1.1.2-gcc-13.patch
@@ -0,0 +1,19 @@
+https://github.com/USBGuard/usbguard/pull/582
+
+From a0083fd0eea3a513613a37262d40dfbe96e02e46 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 24 Jan 2023 14:54:28 -0500
+Subject: [PATCH] Fix compile with GCC 13
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+--- a/src/Library/Base64.hpp
++++ b/src/Library/Base64.hpp
+@@ -24,6 +24,7 @@
+
+ #include <string>
+ #include <cstddef>
++#include <cstdint>
+
+ namespace usbguard
+ {
+
diff --git a/sys-apps/usbguard/usbguard-1.1.2.ebuild b/sys-apps/usbguard/usbguard-1.1.2.ebuild
index 77e050da627a..d3722e624db9 100644
--- a/sys-apps/usbguard/usbguard-1.1.2.ebuild
+++ b/sys-apps/usbguard/usbguard-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -52,6 +52,10 @@ DEPEND="${CDEPEND}
RESTRICT="!test? ( test )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.2-gcc-13.patch
+)
+
src_prepare() {
default
eautoreconf
next reply other threads:[~2023-01-28 3:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-28 3:42 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-01-03 0:23 [gentoo-commits] repo/gentoo:master commit in: sys-apps/usbguard/files/, sys-apps/usbguard/ Sebastian Pipping
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1674877087.a476c8790b1af7e68090acf82fd18dea8bb04daa.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox