* [PATCH] qtwebkit: adjust one of the patches to apply clean on some hosts
@ 2013-10-29 21:10 Denys Dmytriyenko
2013-10-29 21:41 ` Cooper Jr., Franklin
0 siblings, 1 reply; 2+ messages in thread
From: Denys Dmytriyenko @ 2013-10-29 21:10 UTC (permalink / raw)
To: meta-arago; +Cc: Franklin Cooper Jr.
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Cc: Franklin Cooper Jr. <fcooper@ti.com>
---
.../recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch | 4 ++--
meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.1.bbappend | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
index 46c93f7..89712a8 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
@@ -1,6 +1,6 @@
-diff -Nurp8 Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp Source/WebCore/platform/graphics/surfaces/qt_new/GraphicsSurfaceGL_NoX.cpp
+diff -Nurp8 Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp Source-new/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp
--- qtwebkit/Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp 1970-01-01 05:30:00.000000000 +0530
-+++ qtwebkit/Source/WebCore/platform/graphics/surfaces/qt_new/GraphicsSurfaceGL_NoX.cpp 2013-09-07 13:43:55.186851650 +0530
++++ qtwebkit-new/Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp 2013-09-07 13:43:55.186851650 +0530
@@ -0,0 +1,266 @@
+/*
+ Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.1.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.1.bbappend
index aed6b51..e86c8a2 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.1.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.1.bbappend
@@ -11,4 +11,4 @@ SRC_URI += " \
file://WebCore.pri.patch \
"
-PR_append = "-arago0"
+PR_append = "-arago1"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] qtwebkit: adjust one of the patches to apply clean on some hosts
2013-10-29 21:10 [PATCH] qtwebkit: adjust one of the patches to apply clean on some hosts Denys Dmytriyenko
@ 2013-10-29 21:41 ` Cooper Jr., Franklin
0 siblings, 0 replies; 2+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-29 21:41 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-arago
Acked-by: Franklin Cooper Jr. <fcooper@ti.com>
> -----Original Message-----
> From: Denys Dmytriyenko [mailto:denis@denix.org]
> Sent: Tuesday, October 29, 2013 4:11 PM
> To: meta-arago@arago-project.org
> Cc: Dmytriyenko, Denys; Cooper Jr., Franklin
> Subject: [PATCH] qtwebkit: adjust one of the patches to apply clean on some
> hosts
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> Cc: Franklin Cooper Jr. <fcooper@ti.com>
> ---
> .../recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch | 4 ++--
> meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.1.bbappend | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta-arago-distro/recipes-
> qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch b/meta-arago-
> distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
> index 46c93f7..89712a8 100644
> --- a/meta-arago-distro/recipes-
> qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cp
> +++ p.patch
> @@ -1,6 +1,6 @@
> -diff -Nurp8
> Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp
> Source/WebCore/platform/graphics/surfaces/qt_new/GraphicsSurfaceGL_NoX.
> cpp
> +diff -Nurp8
> +Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp
> +Source-
> new/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.
> +cpp
> ---
> qtwebkit/Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_
> NoX.cpp 1970-01-01 05:30:00.000000000 +0530
> -+++
> qtwebkit/Source/WebCore/platform/graphics/surfaces/qt_new/GraphicsSurfac
> eGL_NoX.cpp 2013-09-07 13:43:55.186851650 +0530
> ++++ qtwebkit-
> new/Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.
> cpp 2013-09-07 13:43:55.186851650 +0530
> @@ -0,0 +1,266 @@
> +/*
> + Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies) diff --git
> a/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.1.bbappend b/meta-arago-
> distro/recipes-qt/qt5/qtwebkit_5.1.1.bbappend
> index aed6b51..e86c8a2 100644
> --- a/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.1.bbappend
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.1.bbappend
> @@ -11,4 +11,4 @@ SRC_URI += " \
> file://WebCore.pri.patch \
> "
>
> -PR_append = "-arago0"
> +PR_append = "-arago1"
> --
> 1.8.3.2
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-29 21:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-29 21:10 [PATCH] qtwebkit: adjust one of the patches to apply clean on some hosts Denys Dmytriyenko
2013-10-29 21:41 ` Cooper Jr., Franklin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.