From: Christophe Vu-Brugier <christophe.vu-brug...@seagate.com> Drop patch 0001-include-missing-cstdint.patch because it was merged upstream. See this commit in usbguard:
* 22b1e08 Fix build for GCC 13 + make GitHub Actions cover build with GCC 13 (#586) Signed-off-by: Christophe Vu-Brugier <christophe.vu-brug...@seagate.com> --- .../0001-include-missing-cstdint.patch | 45 ------------------- .../{usbguard_1.1.2.bb => usbguard_1.1.3.bb} | 3 +- 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch rename meta-oe/recipes-security/usbguard/{usbguard_1.1.2.bb => usbguard_1.1.3.bb} (95%) diff --git a/meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch b/meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch deleted file mode 100644 index 5cbe64091..000000000 --- a/meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1da0cfbb9ae978822d961d8b22d8d5125c11247a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.k...@gmail.com> -Date: Thu, 26 Jan 2023 23:46:56 -0800 -Subject: [PATCH] include missing <cstdint> - -gcc 13 moved some includes around and as a result <cstdint> is no -longer transitively included [1]. Explicitly include it for -uint8_t. - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Upstream-Status: Submitted [https://github.com/USBGuard/usbguard/pull/583] -Signed-off-by: Khem Raj <raj.k...@gmail.com> ---- - src/Library/Base64.cpp | 1 - - src/Library/Base64.hpp | 1 + - 2 files changed, 1 insertion(+), 1 deletion(-) - -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 <stdexcept> --#include <cstdint> - - namespace usbguard - { -diff --git a/src/Library/Base64.hpp b/src/Library/Base64.hpp -index 0947f21..e0c745c 100644 ---- a/src/Library/Base64.hpp -+++ b/src/Library/Base64.hpp -@@ -23,6 +23,7 @@ - #endif - - #include <string> -+#include <cstdint> - #include <cstddef> - - namespace usbguard --- -2.39.1 - diff --git a/meta-oe/recipes-security/usbguard/usbguard_1.1.2.bb b/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb similarity index 95% rename from meta-oe/recipes-security/usbguard/usbguard_1.1.2.bb rename to meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb index c062f2705..752938057 100644 --- a/meta-oe/recipes-security/usbguard/usbguard_1.1.2.bb +++ b/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb @@ -12,10 +12,9 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/USBGuard/usbguard/releases/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ - file://0001-include-missing-cstdint.patch \ file://0001-Add-and-use-pkgconfig-instead-of-libgcrypt-config.patch" -SRC_URI[sha256sum] = "dcf5c90f3f93030e04df1baeb8d388b678c40dd48b135ea12a7be7dee8944934" +SRC_URI[sha256sum] = "707dad2938923202697f636c2b4e0be80f192242039a2af3fc7ac35d03f78551" inherit autotools-brokensep bash-completion pkgconfig systemd github-releases -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110830): https://lists.openembedded.org/g/openembedded-devel/message/110830 Mute This Topic: https://lists.openembedded.org/mt/106618722/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-