From 4aa8929cbe66c18a6f24d1cffad3b14d58682af1 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Mon, 7 Jun 2021 18:00:21 -0400
Subject: qtbase: clean up bbappend

Changes:
- With the Wayland enabling changes being shifted to meta-agl-core,
  remove the duplicate ones from the bbappend here.
- Also remove unused patch and disabled qtbase-native bbappend, as
  neither seem required at this point.

Bug-AGL: SPEC-3972

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I3ac3a4fa1ec9de235ff1e35e063f1e35a362e5d1
---
 recipes-qt/qt/qtbase-native_git.bbappendTOCHECK    |  3 ---
 ...-to-make-introspect-for-every-findMetaObj.patch | 30 ----------------------
 recipes-qt/qt/qtbase_agldemo.inc                   | 17 +-----------
 3 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 recipes-qt/qt/qtbase-native_git.bbappendTOCHECK
 delete mode 100644 recipes-qt/qt/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch

diff --git a/recipes-qt/qt/qtbase-native_git.bbappendTOCHECK b/recipes-qt/qt/qtbase-native_git.bbappendTOCHECK
deleted file mode 100644
index b7cfe8dce..000000000
--- a/recipes-qt/qt/qtbase-native_git.bbappendTOCHECK
+++ /dev/null
@@ -1,3 +0,0 @@
-# Backport this fix from meta-qt5:
-# https://github.com/meta-qt5/meta-qt5/commit/bf7cdd963008f2d61bc4c324fff2bfafe511fb5f
-SRC_URI_remove = "file://0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch"
diff --git a/recipes-qt/qt/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch b/recipes-qt/qt/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch
deleted file mode 100644
index 10a1ddd88..000000000
--- a/recipes-qt/qt/qtbase/0001-Force-qdbus-to-make-introspect-for-every-findMetaObj.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a4943bb5c7fdf5eb297223d2c3bb02d2271bea48 Mon Sep 17 00:00:00 2001
-From: Risto Avila <risto.avila@theqtcompany.com>
-Date: Thu, 17 Dec 2015 04:22:53 +0200
-Subject: [PATCH] Force qdbus to make introspect for every findMetaObject
-
----
- src/dbus/qdbusintegrator.cpp | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
-index cce8b9c..ae2a9dc 100644
---- a/src/dbus/qdbusintegrator.cpp
-+++ b/src/dbus/qdbusintegrator.cpp
-@@ -2512,8 +2512,11 @@ QDBusConnectionPrivate::findMetaObject(const QString &service, const QString &pa
-     if (!interface.isEmpty()) {
-         QDBusReadLocker locker(FindMetaObject1Action, this);
-         QDBusMetaObject *mo = cachedMetaObjects.value(interface, 0);
--        if (mo)
--            return mo;
-+        if (mo) {
-+            // service is not unique. Remove cached object to force introspect
-+            cachedMetaObjects.remove(interface);
-+            delete mo;
-+        }
-     }
- 
-     // introspect the target object
--- 
-1.9.1
-
diff --git a/recipes-qt/qt/qtbase_agldemo.inc b/recipes-qt/qt/qtbase_agldemo.inc
index 357e1e8bb..7f48b4571 100644
--- a/recipes-qt/qt/qtbase_agldemo.inc
+++ b/recipes-qt/qt/qtbase_agldemo.inc
@@ -1,16 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
-
-PACKAGECONFIG_WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
-
-PACKAGECONFIG_GL = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}"
-# FIXME CLUSTER
-#PACKAGECONFIG_GL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', ' eglfs kms gbm', '', d)}"
-#
-PACKAGECONFIG_append = " ${PACKAGECONFIG_WAYLAND} icu accessibility"
-PACKAGECONFIG_append = " fontconfig"
-PACKAGECONFIG_append = " sql-sqlite"
-
-EXTRA_OECONF_append = ""
-
-# '-qpa wayland-egl' set wayland-egl as default of platform plagins
-PACKAGECONFIG[wayland]="-qpa wayland-egl -no-qpa-platform-guard"
+PACKAGECONFIG_append = " icu fontconfig sql-sqlite"
-- 
cgit 1.2.3-korg