From patchwork Fri Jan 27 18:04:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18747 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC962C61D97 for ; Fri, 27 Jan 2023 18:04:31 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web11.109244.1674842669370013876 for ; Fri, 27 Jan 2023 10:04:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Ga1Yo/lB; spf=pass (domain: gmail.com, ip: 209.85.216.50, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f50.google.com with SMTP id m11so5341507pji.0 for ; Fri, 27 Jan 2023 10:04:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=UEfF4cnC/ZlruXF0RlkL1Be8heZRn0AknCPATkZdQGE=; b=Ga1Yo/lBAsxcNqWJ9505U2HHvkso/kKlfqIVeR3wo5HrRsPYVso24pkCLbbMJyo6wi HLNYDDXHzr1aBcbhwa8e+ZMp+M5AcwRTusC9n5SH5bDFLcUxNcfOqVghnp7gq9rBPna7 6FI5NzJpLElOHN+Tjn4xldPvCZqBnkCeQfqmtnAGk4HtNo1IgIuR0waMFOp3b9lqrq41 ilp7SAK8dYEGKt/Rzdxusk/aMljp4YZ8M1BGUtxZY9zT4mC+tLV8pSbgPjve5zKhfKF+ hQU3AdK9xzTa9GuM8j+DwKBgoCm9jI8sPxURh1A3WKYeVvrP5lUEXJAF6koTdoDSrvb0 V2iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UEfF4cnC/ZlruXF0RlkL1Be8heZRn0AknCPATkZdQGE=; b=8EF2GhglL58NFL2VApXxCuYtZKc5/PUIhWa61uOkaTcY7MPeewhMtyDKz1soT2QDSa TfaOH4iTNiPllPDiR2lzLYA5SZG2sedrwQbbtyOpHLSpXX0+JoyBMczaEfmOMsXl0gzJ dSI8A0MRXTDcbRlzV35ONkDwXxRWKqpXBBisIZ45kQ6liqOY/dLJNJNrcLgosfP2o3vL wNaTR9rXNaH2PyW4X/qhDpqsUamIUh8CyoUJZeOPACG9NuD/x2S8CwnrMWGgHxBzAvsL yZAtzZ+HV27jDEsDd25BN4NcPIa878pmHE9FKuPy9uAL41bd9Qz2Q0roc9TZNJC3DxLx B8Pw== X-Gm-Message-State: AO0yUKWwM8wP6dafZHxtJcJPYRMvc0yowA5iMAR/nTEjl+zcXSK9lxdh c0X56y9d9SvdyeqBUgVq76W9Vmpp0Kxj4w== X-Google-Smtp-Source: AK7set+hr3cK8a8+mpraJHurspu4ukJyJNlEoDkQGzssF8nstuDMXTr0CNyLziADmn/R+oE4Hztvyg== X-Received: by 2002:a17:903:228e:b0:194:7c28:3fa4 with SMTP id b14-20020a170903228e00b001947c283fa4mr7319038plh.19.1674842668327; Fri, 27 Jan 2023 10:04:28 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id iy15-20020a170903130f00b00186748fe6ccsm3163554plb.214.2023.01.27.10.04.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 10:04:28 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 1/4] waylandpp: Fix build with gcc-13 Date: Fri, 27 Jan 2023 10:04:23 -0800 Message-Id: <20230127180426.754319-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 27 Jan 2023 18:04:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100823 Signed-off-by: Khem Raj --- .../0001-include-missing-cstdint.patch | 59 +++++++++++++++++++ .../wayland/waylandpp_1.0.0.bb | 3 +- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch diff --git a/meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch b/meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch new file mode 100644 index 0000000000..f2169c43c9 --- /dev/null +++ b/meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch @@ -0,0 +1,59 @@ +From 5e3243b163aa5d50083b4036c21f84c1204f2023 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 26 Jan 2023 23:25:05 -0800 +Subject: [PATCH] include missing + +gcc 13 moved some includes around and as a result is no longer transitively included [1]. Explicitly include it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/NilsBrause/waylandpp/pull/75] +Signed-off-by: Khem Raj +--- + include/wayland-client.hpp | 1 + + scanner/scanner.cpp | 3 +++ + 2 files changed, 4 insertions(+) + +diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp +index a3f782b..4598a0e 100644 +--- a/include/wayland-client.hpp ++++ b/include/wayland-client.hpp +@@ -29,6 +29,7 @@ + /** \file */ + + #include ++#include + #include + #include + #include +diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp +index bebd71e..c25746a 100644 +--- a/scanner/scanner.cpp ++++ b/scanner/scanner.cpp +@@ -15,6 +15,7 @@ + * along with this program. If not, see . + */ + ++#include + #include + #include + #include +@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[]) + wayland_hpp << "#pragma once" << std::endl + << std::endl + << "#include " << std::endl ++ << "#include " << std::endl + << "#include " << std::endl + << "#include " << std::endl + << "#include " << std::endl +@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[]) + wayland_server_hpp << "#pragma once" << std::endl + << std::endl + << "#include " << std::endl ++ << "#include " << std::endl + << "#include " << std::endl + << "#include " << std::endl + << "#include " << std::endl +-- +2.39.1 + diff --git a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb index 0deed332c6..5ba5aa7940 100644 --- a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb +++ b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb @@ -2,7 +2,8 @@ SUMMARY = " C++ binding for Wayland using the most modern C++ technology" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3aae28cc66d61975114c2b14df215407" -SRC_URI = "git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=master" +SRC_URI = "git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=master \ + file://0001-include-missing-cstdint.patch" DEPENDS = "pugixml" DEPENDS:append:class-target = " waylandpp-native wayland virtual/egl virtual/libgles2" From patchwork Fri Jan 27 18:04:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18748 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADD73C61DA4 for ; Fri, 27 Jan 2023 18:04:31 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.109245.1674842670189290740 for ; Fri, 27 Jan 2023 10:04:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=h8F6h/3r; spf=pass (domain: gmail.com, ip: 209.85.214.179, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f179.google.com with SMTP id k13so5868968plg.0 for ; Fri, 27 Jan 2023 10:04:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BKJU3yT81pRvl90ts/8JU+zx4y3Xbdc6By6XzVDZqk0=; b=h8F6h/3rv6ECMonc7tpoDx2Q1/Sn8S4VCkaEKm7Qevc/y0TKzlTGyMaAEufw4D3XZd YxsrqTdsHlPjuwTZCecfHlx8irQt6hQixqkGDihVMD8d0ld9As5tDyjlka01G3Xhx1lz VcuIk5Ems7yRG2XyecHrI+jy0JFi6YzMTxWsZV01Ct66fEw/e62KVyxnuCDv9uheOViv Hhs4BtfGTkncE8DLnUoVrrNjuPdeC5PL6UqQO7RKqdPwxMnziHdtnIW6MfiqpiI+TCB3 tbLCD0i0myXW2Qj3as0xBr9IHUIEOKj0yL5foONcDt9LPb5iSA6VKLY5GWYqbhkV5ZzV JyPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BKJU3yT81pRvl90ts/8JU+zx4y3Xbdc6By6XzVDZqk0=; b=VA1VZpXGtut66d8VZgtrzTkCwefBdNjQMVxbXsJdjq+Vz6gJil1qw5/MahhUMjz1WK wcKezgJEDx/hub/niI1yDskug2ub1wChFPp+LPjm4gBEZteQTmd7MJBsDgnfw9u/6he1 GgwAP4yzja6UohY085JckYeu+5R6OiMjudrV1PUg4px7qrEo1N8P48+7hKUTMsrFI/VV Qo9Gxgl57dxuu6pdEcu9fNINT33kcOvycl6/03cYtzhV+4JCNz8LowNDn9exLgw2HHS5 gtOakoJQ8Yr3hf0HwOEf7FOcCn05irD5QzrfdOUbOkcbLbMBVftuyVg2H9dXRF4F+5FT cm/Q== X-Gm-Message-State: AFqh2krXofhxlBo+oXnhyMC8rtHB2UDxRJK0xzvaPdtEYfuQdr066RIa Xc9vbzK+jGtdJLYFZp8Jks7xQ2o/RF8cdg== X-Google-Smtp-Source: AMrXdXsxyUvWI6R9HI+aZ4+l9cQBJn4/ImU6SIBVjH/GGrg5GkCnb9sx+EsNFT0Syi56PkvZyoZXlw== X-Received: by 2002:a17:902:8a98:b0:185:441f:70b1 with SMTP id p24-20020a1709028a9800b00185441f70b1mr37091396plo.54.1674842669426; Fri, 27 Jan 2023 10:04:29 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id iy15-20020a170903130f00b00186748fe6ccsm3163554plb.214.2023.01.27.10.04.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 10:04:28 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/4] sedutil: Fix build with gcc13 Date: Fri, 27 Jan 2023 10:04:24 -0800 Message-Id: <20230127180426.754319-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230127180426.754319-1-raj.khem@gmail.com> References: <20230127180426.754319-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 27 Jan 2023 18:04:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100824 Signed-off-by: Khem Raj --- .../files/0001-include-missing-cstdint.patch | 32 +++++++++++++++++++ .../recipes-extended/sedutil/sedutil_git.bb | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/sedutil/files/0001-include-missing-cstdint.patch diff --git a/meta-oe/recipes-extended/sedutil/files/0001-include-missing-cstdint.patch b/meta-oe/recipes-extended/sedutil/files/0001-include-missing-cstdint.patch new file mode 100644 index 0000000000..8afcb1fa48 --- /dev/null +++ b/meta-oe/recipes-extended/sedutil/files/0001-include-missing-cstdint.patch @@ -0,0 +1,32 @@ +From 927cd88cad7bea94c2eebecc18f7881f0defaccb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 26 Jan 2023 23:36:29 -0800 +Subject: [PATCH] include missing + +gcc 13 moved some includes around and as a result +is no longer transitively included [1]. Explicitly include +it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/Drive-Trust-Alliance/sedutil/pull/425] +Signed-off-by: Khem Raj +--- + Common/DtaOptions.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Common/DtaOptions.h b/Common/DtaOptions.h +index c012af1..7530a0b 100644 +--- a/Common/DtaOptions.h ++++ b/Common/DtaOptions.h +@@ -21,6 +21,7 @@ along with sedutil. If not, see . + #ifndef _DTAOPTIONS_H + #define _DTAOPTIONS_H + ++#include + /** Output modes */ + typedef enum _sedutiloutput { + sedutilNormal, +-- +2.39.1 + diff --git a/meta-oe/recipes-extended/sedutil/sedutil_git.bb b/meta-oe/recipes-extended/sedutil/sedutil_git.bb index a377d4ec5a..972a33c742 100644 --- a/meta-oe/recipes-extended/sedutil/sedutil_git.bb +++ b/meta-oe/recipes-extended/sedutil/sedutil_git.bb @@ -7,11 +7,11 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://Common/LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504" -BASEPV = "1.15.1" PV = "1.20.0" SRCREV = "d3de8e45e06a21d31cca0046ceb16ced1ef3563a" SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git;branch=master;protocol=https \ file://0001-Fix-build-on-big-endian-architectures.patch \ + file://0001-include-missing-cstdint.patch \ " S = "${WORKDIR}/git" From patchwork Fri Jan 27 18:04:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18749 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AEE12C54EAA for ; Fri, 27 Jan 2023 18:04:31 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web10.109334.1674842671068819965 for ; Fri, 27 Jan 2023 10:04:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Gr2B0YB7; spf=pass (domain: gmail.com, ip: 209.85.216.48, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f48.google.com with SMTP id b24-20020a17090a551800b0022beefa7a23so9356285pji.5 for ; Fri, 27 Jan 2023 10:04:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P9oygP9unV3XY7i2NXn8+/RZpaW2oqMF958CNq/aSc4=; b=Gr2B0YB75GAU391Cj9kvddl0nqe6ycO1evfgv+NDvHqr49pfR+1JjsJY42kLa2CgS9 r8RUpvsIhNQ/WUjXMdMa7miq3mNM9gOHGkJHw/8OLF7nrW7RdZOhcOM2LxPCiDAebL4k AL3+Q4XMncY7J3HkpPNFMATAzvYJEB6nQkCCc0rQh4ZnOREonVBo6Hf+lAhu4i8AwDj5 IvKeK8Qacq0a8Wn8X/4avAqxqkgJN63mQpW/u8myGE/rvVtKFx0vGmTrU4XEPf+teoB/ GwbobEK+YGL9CrIzKGam2DZq35fX1dJrNMhxeVGOraEIc9c6bGxi2L5dEZwWzkkGiCjz uHcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P9oygP9unV3XY7i2NXn8+/RZpaW2oqMF958CNq/aSc4=; b=5nU3kWQLXDaOHuiq29Q8xjU7fZPcx4VFcjSwM4jQLOTzaVEvgeORYVgFjzNeLZctns 3fu1YGBU9sUIZ/ppKFuz3sPIaekSq54U+RL7zPYE4zEgHdfPoevDOZgTAqtnfx+/zGG6 qSzhYhBePaAYtbx9Y091E6KGMtg1uja2JUeYlbUDhDs5TALuU4zGa47+S3tRdRXq5kn9 +Ae8jM7q1IOvasuiiWGF9t1ldET1aj079NOYpjD6j+tPS7L4QiEMNoS/MX9WnVrCzI6+ YaFqfhf9qaI8ivpbvdMsNhy5mwLU9CSewZbwDCQk3HYAaYyxxtEWM81AccMDaJdoXUSz yN5w== X-Gm-Message-State: AFqh2kozoQIx6P1j9JmpGMht52Z+t1TjVKzqwLXdfXMbYtbAtZkExfwZ GruSvRYIsiRVcri/GQZTW1XfT1tibmktTg== X-Google-Smtp-Source: AMrXdXv7WNEQBTDJQnbTwbk6xFwIFkjqlQTf+rVGSmhon93ypHjiqAGK30q8jd86erK2gB88UBKfZQ== X-Received: by 2002:a17:902:9b97:b0:193:3314:540d with SMTP id y23-20020a1709029b9700b001933314540dmr38012045plp.51.1674842670303; Fri, 27 Jan 2023 10:04:30 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id iy15-20020a170903130f00b00186748fe6ccsm3163554plb.214.2023.01.27.10.04.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 10:04:29 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 3/4] usbguard: Fix build with gcc13 Date: Fri, 27 Jan 2023 10:04:25 -0800 Message-Id: <20230127180426.754319-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230127180426.754319-1-raj.khem@gmail.com> References: <20230127180426.754319-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 27 Jan 2023 18:04:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100825 Signed-off-by: Khem Raj --- .../0001-include-missing-cstdint.patch | 45 +++++++++++++++++++ .../usbguard/usbguard_1.1.2.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch 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 new file mode 100644 index 0000000000..5cbe64091c --- /dev/null +++ b/meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch @@ -0,0 +1,45 @@ +From 1da0cfbb9ae978822d961d8b22d8d5125c11247a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 26 Jan 2023 23:46:56 -0800 +Subject: [PATCH] include missing + +gcc 13 moved some includes around and as a result 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 +--- + 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 +-#include + + 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 ++#include + #include + + 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.2.bb index e1e087a6d0..4e96b4f41e 100644 --- a/meta-oe/recipes-security/usbguard/usbguard_1.1.2.bb +++ b/meta-oe/recipes-security/usbguard/usbguard_1.1.2.bb @@ -12,6 +12,7 @@ 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" From patchwork Fri Jan 27 18:04:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18750 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EAC4C54EAA for ; Fri, 27 Jan 2023 18:04:41 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web10.109336.1674842671957390149 for ; Fri, 27 Jan 2023 10:04:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=SZdAyJNm; spf=pass (domain: gmail.com, ip: 209.85.214.178, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f178.google.com with SMTP id x5so2356908plr.2 for ; Fri, 27 Jan 2023 10:04:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IusjJgBt9urLUJ0GctUzVGCR1lGKwbmUmW/3LQcM6fY=; b=SZdAyJNmoF7TOqgTmILUNLrHFkoH3x21HEKCGz70Unm4gfSWejDTvKyUjtNS7P7Ql0 X8vSD4EpT2I4z0kKWY5v08xF4I95+/xZBWwdoFv2ys3NaFhXhXm1oHKzS+BxrwSs9sQh XAp/AQ/W9yX8RmDpA1yVvbisQhm1gWZ/zy70mFeA83fHGtC9stlkIzsE+V31xxn2Ivq5 PXsRe4YSWl6oldCrWkFJWSXBw+G6SIIwNOgafJaenRNIeLYt4+E6l/1oqruW+1okj5uT CAEEnAp+DnN5vGrAGmWfjoIBhqvmx0Gp2nsYjgeUJ5XWpc0YurUYm/c4Y4BVwRa58h8k CXeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IusjJgBt9urLUJ0GctUzVGCR1lGKwbmUmW/3LQcM6fY=; b=q4M3AsWcIx7NwWk8LvLXC1s2ijpCIW8q8dRBJ2/79Cgw6xd0SM/AwRxSzGamhI1kYC yTMvoEUmfJEqhz6lOmWUh0pkRrYlg0SUeIJw14XUNoywPlJaHqskHDYylKqE598rGZeP I75dJRvXIZfnraUDhKfsK8mq7Gk3IlrNZu8HdJjx3rTznNcCuLSNeBJrLotjjTy4QHpc JPPzQ1/SQ7rl5JM+qqIQJrhujvLsAbz8CES1L7gy9GtLl1v5U+8GKrw1zDObxa24HqL9 3uKKryvWfXLWlO1eQB8rxzVDa7ywFI7cw8GHD3Ulu7Xm4hX5N26KT5Lk4o5Wvli0Nb97 iqYw== X-Gm-Message-State: AFqh2kqBsHbjwSDrz38ZgepkiUTDYPopHsym5cXchF3OJSSVEehaxJun B/sw/yJgjxp2yub5tWnNAzvHdDMA0PjdAg== X-Google-Smtp-Source: AMrXdXuHD2ZHfd6C7ZqSBtHB9cNrEBUssKhEcrK7+qw2c+XDxtt/bt4hozj7iMcNqBYmSi5+OsyX0Q== X-Received: by 2002:a17:902:7089:b0:194:6414:12db with SMTP id z9-20020a170902708900b00194641412dbmr38660632plk.56.1674842671121; Fri, 27 Jan 2023 10:04:31 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id iy15-20020a170903130f00b00186748fe6ccsm3163554plb.214.2023.01.27.10.04.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 10:04:30 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 4/4] minifi-cpp: Fix build with gcc13 Date: Fri, 27 Jan 2023 10:04:26 -0800 Message-Id: <20230127180426.754319-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230127180426.754319-1-raj.khem@gmail.com> References: <20230127180426.754319-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 27 Jan 2023 18:04:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100826 Signed-off-by: Khem Raj --- ...-missing-includes-cstdint-and-cstdio.patch | 70 +++++++++++++++++++ .../minifi-cpp/minifi-cpp_0.7.0.bb | 1 + 2 files changed, 71 insertions(+) create mode 100644 meta-oe/recipes-extended/minifi-cpp/files/0001-Add-missing-includes-cstdint-and-cstdio.patch diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-Add-missing-includes-cstdint-and-cstdio.patch new file mode 100644 index 0000000000..0fce8dc64f --- /dev/null +++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-Add-missing-includes-cstdint-and-cstdio.patch @@ -0,0 +1,70 @@ +From 6e376601c990abaa5e261d1311f92acb3b370b8f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 24 Jan 2023 21:40:43 -0800 +Subject: [PATCH] Add missing includes and + +This is needed with GCC 13 and newer [1] + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Backport [https://github.com/facebook/rocksdb/commit/88edfbfb5e1cac228f7cc31fbec24bb637fe54b1] +Signed-off-by: Khem Raj +--- + .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h | 1 + + storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + + .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + + storage/rocksdb/rocksdb/util/slice.cc | 1 + + storage/rocksdb/rocksdb/util/string_util.h | 1 + + tpool/aio_linux.cc | 1 + + 6 files changed, 6 insertions(+) + +--- a/thirdparty/rocksdb/include/rocksdb/utilities/checkpoint.h ++++ b/thirdparty/rocksdb/include/rocksdb/utilities/checkpoint.h +@@ -8,6 +8,7 @@ + #pragma once + #ifndef ROCKSDB_LITE + ++#include + #include + #include "rocksdb/status.h" + +--- a/thirdparty/rocksdb/util/string_util.h ++++ b/thirdparty/rocksdb/util/string_util.h +@@ -6,6 +6,7 @@ + + #pragma once + ++#include + #include + #include + #include +--- a/extensions/expression-language/common/Value.h ++++ b/extensions/expression-language/common/Value.h +@@ -15,6 +15,7 @@ + * limitations under the License. + */ + ++#include + #include + #include + #include +--- a/libminifi/include/utils/StringUtils.h ++++ b/libminifi/include/utils/StringUtils.h +@@ -18,6 +18,7 @@ + #define LIBMINIFI_INCLUDE_IO_STRINGUTILS_H_ + #include + #include ++#include + #include + #ifdef WIN32 + #include +--- a/thirdparty/rocksdb/db/compaction_iteration_stats.h ++++ b/thirdparty/rocksdb/db/compaction_iteration_stats.h +@@ -5,6 +5,7 @@ + + #pragma once + ++#include + struct CompactionIterationStats { + // Compaction statistics + diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index b843f72a52..1bf99d4907 100644 --- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -31,6 +31,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;branch=master;protocol=ht file://0001-cxxopts-Add-limits-header.patch \ file://0001-Fix-build-with-libc.patch \ file://0001-civetweb-Disable-lto.patch \ + file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ file://minifi.service \ file://systemd-volatile.conf \ file://sysvinit-volatile.conf \