Remove the patches that are no longer needed.
Signed-off-by: Gowtham Tammana <g-tamm...@ti.com>
---
...e-to-use-GL_NoX-version-of-GraphicsS.patch | 29 ----------------
.../qt5/qtwebkit/GraphicsSurfaceToken.h.patch | 33 -------------------
.../recipes-qt/qt5/qtwebkit/WebCore.pri.patch | 17 ----------
.../recipes-qt/qt5/qtwebkit_%.bbappend | 6 +---
4 files changed, 1 insertion(+), 84 deletions(-)
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
delete mode 100644
meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
delete mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
diff --git
a/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
b/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
deleted file mode 100644
index 55a4c032..00000000
---
a/meta-arago-distro/recipes-qt/qt5/qtwebkit/0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 90de2ab42bdd51b92dd00f700d6766ca1ffd23c0 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <de...@ti.com>
-Date: Thu, 17 Jul 2014 16:11:46 -0400
-Subject: [PATCH] Target.pri: update to use GL_NoX version of GraphicsSurface
- sources
-
-Signed-off-by: Denys Dmytriyenko <de...@ti.com>
----
- Source/WebCore/Target.pri | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
-index e2044bc..cc9bdd4 100644
---- a/Source/WebCore/Target.pri
-+++ b/Source/WebCore/Target.pri
-@@ -4283,6 +4283,10 @@ use?(GRAPHICS_SURFACE) {
- platform/graphics/surfaces/glx/X11Helper.cpp \
- platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp
- }
-+ contains(QT_CONFIG, opengles2) {
-+ SOURCES -= platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp
-+ SOURCES += platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp
-+ }
- }
-
- build?(qttestsupport) {
---
-2.0.0
-
diff --git
a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
deleted file mode 100644
index 722df392..00000000
--- a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
+++ /dev/null
@@ -1,33 +0,0 @@
----
qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h.orig
2013-09-07 13:44:47.906849335 +0530
-+++ qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h
2013-09-07 13:46:12.554845618 +0530
-@@ -50,17 +50,30 @@ struct GraphicsSurfaceToken {
- {
- return frontBufferHandle != rhs.frontBufferHandle;
- }
-
- bool isValid() const
- {
- return frontBufferHandle;
- }
-+#elif PLATFORM(QT)
-+ GraphicsSurfaceToken(uint32_t windowID = 0)
-+ : frontBufferHandle(windowID)
-+ { }
-+
-+ bool operator!=(const GraphicsSurfaceToken &rhs) const
-+ {
-+ return frontBufferHandle != rhs.frontBufferHandle;
-+ }
-
-+ bool isValid() const
-+ {
-+ return frontBufferHandle;
-+ }
- #endif
-
- #if OS(DARWIN) || OS(WINDOWS)
- GraphicsSurfaceToken(BufferHandle frontBuffer = 0, BufferHandle
backBuffer = 0)
- : frontBufferHandle(frontBuffer)
- , backBufferHandle(backBuffer)
- { }
-
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
b/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
deleted file mode 100644
index 276b3cf8..00000000
--- a/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
-index 0189394..00f7090 100644
---- a/Source/WebCore/WebCore.pri
-+++ b/Source/WebCore/WebCore.pri
-@@ -227,8 +227,10 @@ use?(3D_GRAPHICS) {
- use?(GRAPHICS_SURFACE) {
- mac: LIBS += -framework IOSurface -framework CoreFoundation
- linux-*: {
-- LIBS += -lXcomposite -lXrender
-- CONFIG *= x11
-+ xlibAvailable() {
-+ LIBS += -lXcomposite -lXrender
-+ CONFIG *= x11
-+ }
- }
- }
-
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
index 308f3f25..5bcef47f 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_%.bbappend
@@ -1,15 +1,11 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-# file://GraphicsSurfaceToken.h.patch
-# file://0001-Target.pri-update-to-use-GL_NoX-version-of-GraphicsS.patch
-# file://WebCore.pri.patch
-
SRC_URI += " \
file://GraphicsSurfaceGL_NoX.cpp.patch \
file://0001-WebCore-PlatformQt.cmake-Fix-no-x11-build.patch \
"
-PR_append = ".arago8"
+PR_append = ".arago9"
EXTRA_OECMAKE_append = " -DCMAKE_BUILD_TYPE=Release"
--
2.31.1
_______________________________________________
meta-arago mailing list
meta-arago@arago-project.org
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
