From 1326d15e21d264f9215b908642d291b4c5fbdbf3 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 22 Feb 2024 12:58:50 -0500 Subject: qtbase: drop local backported patches Those patches were backported and the changes are now part of the latest Qt version. Bug-AGL: SPEC-5069 Change-Id: Id82254c5f5ba01efe565b40c2f096d252f4c2c69 Signed-off-by: Denys Dmytriyenko Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29718 ci-image-boot-test: Jenkins Job builder account Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller (cherry picked from commit 73886d069648abe492769325c81aea43335a972c) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29633 Tested-by: Jan-Simon Moeller --- .../dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc') diff --git a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc b/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc index 57fcfb48b..581f5de99 100644 --- a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc +++ b/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc @@ -1,10 +1,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/qtbase:" -SRC_URI:append = " \ - file://0001-Don-t-use-a-deprecated-function-if-built-linked-with.patch \ - file://0002-Adapt-for-q_EVP_PKEY_base_id-q_EVP_PKEY_get_base_id-.patch \ -" - PACKAGECONFIG_WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" PACKAGECONFIG_GL = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}" -- cgit 1.2.3-korg