package/qt5webkit: rename patch to the new convention
authorSamuel Martin <s.martin49@gmail.com>
Thu, 13 Nov 2014 22:54:27 +0000 (23:54 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Fri, 14 Nov 2014 12:20:26 +0000 (13:20 +0100)
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/qt5/qt5webkit/0001-egl-includepath.patch [new file with mode: 0644]
package/qt5/qt5webkit/qt5webkit-0001-egl-includepath.patch [deleted file]

diff --git a/package/qt5/qt5webkit/0001-egl-includepath.patch b/package/qt5/qt5webkit/0001-egl-includepath.patch
new file mode 100644 (file)
index 0000000..de5bcff
--- /dev/null
@@ -0,0 +1,40 @@
+From d6b1b33a12c0cf6c52667afafe34e58a7b00d0d8 Mon Sep 17 00:00:00 2001
+From: Floris Bos <bos@je-eigen-domein.nl>
+Date: Thu, 7 Mar 2013 19:25:17 +0100
+Subject: [PATCH] Webcore: add EGL and OpenGL (ES) INCDIR to INCLUDEPATH
+
+When building with 3D graphics support enabled, add the
+OpenGL (ES) and EGL include directories to the include path.
+
+Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
+---
+ Source/WebCore/Target.pri |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
+index 2669748..421a849 100644
+--- a/Source/WebCore/Target.pri
++++ b/Source/WebCore/Target.pri
+@@ -3992,15 +3992,19 @@ use?(3D_GRAPHICS) {
+     contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
+         !contains(QT_CONFIG, opengles2) {
++            INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
+             SOURCES += \
+                platform/graphics/opengl/GraphicsContext3DOpenGL.cpp \
+                platform/graphics/opengl/Extensions3DOpenGL.cpp
+         } else {
++            INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
+             SOURCES += \
+                platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp \
+                platform/graphics/opengl/Extensions3DOpenGLES.cpp
+         }
++        !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
++
+         HEADERS += platform/graphics/opengl/Extensions3DOpenGL.h
+         SOURCES += \
+-- 
+1.7.10.4
+
diff --git a/package/qt5/qt5webkit/qt5webkit-0001-egl-includepath.patch b/package/qt5/qt5webkit/qt5webkit-0001-egl-includepath.patch
deleted file mode 100644 (file)
index de5bcff..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From d6b1b33a12c0cf6c52667afafe34e58a7b00d0d8 Mon Sep 17 00:00:00 2001
-From: Floris Bos <bos@je-eigen-domein.nl>
-Date: Thu, 7 Mar 2013 19:25:17 +0100
-Subject: [PATCH] Webcore: add EGL and OpenGL (ES) INCDIR to INCLUDEPATH
-
-When building with 3D graphics support enabled, add the
-OpenGL (ES) and EGL include directories to the include path.
-
-Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
----
- Source/WebCore/Target.pri |    4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
-index 2669748..421a849 100644
---- a/Source/WebCore/Target.pri
-+++ b/Source/WebCore/Target.pri
-@@ -3992,15 +3992,19 @@ use?(3D_GRAPHICS) {
-     contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
-         !contains(QT_CONFIG, opengles2) {
-+            INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
-             SOURCES += \
-                platform/graphics/opengl/GraphicsContext3DOpenGL.cpp \
-                platform/graphics/opengl/Extensions3DOpenGL.cpp
-         } else {
-+            INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
-             SOURCES += \
-                platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp \
-                platform/graphics/opengl/Extensions3DOpenGLES.cpp
-         }
-+        !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
-+
-         HEADERS += platform/graphics/opengl/Extensions3DOpenGL.h
-         SOURCES += \
--- 
-1.7.10.4
-