This reverts commit 1e83ebf61bd22ca8ad04d5538db044d81330df2c. It is no longer needed as it is handled through build dependencies. --- ...atform.h-add-define-MESA_EGL_NO_X11_.patch | 30 ------------------- .../recipes-qt/qt5/qtwebkit_%.bbappend | 3 +- 2 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch deleted file mode 100644 index 29521a8e..00000000 --- a/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4a21fcedd886772b7e1bd40861835f1b4f33c7ff Mon Sep 17 00:00:00 2001 -From: Eric Ruei <[email protected]> -Date: Fri, 30 Aug 2019 17:41:13 -0400 -Subject: [PATCH] HACK: ANGLE/khrplatform.h: add #define - MESA_EGL_NO_X11_HEADERS - -Note: Only the KHR/khrplatform.h at sysroot/usr/include should be used. - This patch is a tentative workaround to make both files compatible - -Upstream-Status: Inappropriate [tentative workaround only] - -Signed-off-by: Eric Ruei <[email protected]> ---- - Source/ThirdParty/ANGLE/include/KHR/khrplatform.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h b/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h -index c9e6f17d3..4e3ff69a8 100644 ---- a/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h -+++ b/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h -@@ -279,4 +279,6 @@ typedef enum { - KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM - } khronos_boolean_enum_t; - -+#define MESA_EGL_NO_X11_HEADERS -+ - #endif /* __khrplatform_h_ */ --- -2.17.1 - diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend index 1dbe40d1..75213487 100644 --- a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend @@ -6,10 +6,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://GraphicsSurfaceGL_NoX.cpp.patch \ - file://0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch \ " -PR_append = ".arago8" +PR_append = ".arago7" EXTRA_OECMAKE_append = " -DCMAKE_BUILD_TYPE=Release" -- 2.31.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
