On Wed, Mar 05, 2014 at 08:36:06PM +0200, Florin Sarbu wrote: > Sorry, I'm not following what you want me to do now. Send another commit > up for review, this time with > > 7327781083aea593b4911b6da7105e4984e28c68 > > cherry-pick'ed?
Yes, because you added the fix.missing.v8.public.api.patch file only to qtwayland-5.1.0+git but included it in SRC_URI in qtwayland.inc so also for qtwayland_git which will now fail in do_fetch. Also mine commit has better commit message and commits to "release" branches should be cherry-picks from master where possible. > On 03/05/2014 08:23 PM, Martin Jansa wrote: > > On Tue, Mar 04, 2014 at 05:54:28PM +0200, Florin Sarbu wrote: > >> From: "florin.sarbu" <[email protected]> > > Cherry-pick 7327781083aea593b4911b6da7105e4984e28c68 from meta-qt5/master > > > > Your version is breaking recipes-qt/qt5/qtwayland_git.bb recipe I guess. > > > >> Cherry-picked from: > >> https://github.com/kvahlman/qtwayland/commit/b455f5acaec811b70ae3eb896c08a634909cb9d1 > >> > >> Signed-off-by: Florin Sarbu <[email protected]> > >> --- > >> .../fix.missing.v8.public.api.patch | 30 > >> ++++++++++++++++++++++ > >> recipes-qt/qt5/qtwayland.inc | 1 + > >> 2 files changed, 31 insertions(+) > >> create mode 100644 > >> recipes-qt/qt5/qtwayland-5.1.0+git/fix.missing.v8.public.api.patch > >> > >> diff --git > >> a/recipes-qt/qt5/qtwayland-5.1.0+git/fix.missing.v8.public.api.patch > >> b/recipes-qt/qt5/qtwayland-5.1.0+git/fix.missing.v8.public.api.patch > >> new file mode 100644 > >> index 0000000..6bbbaa1 > >> --- /dev/null > >> +++ b/recipes-qt/qt5/qtwayland-5.1.0+git/fix.missing.v8.public.api.patch > >> @@ -0,0 +1,30 @@ > >> +From b455f5acaec811b70ae3eb896c08a634909cb9d1 Mon Sep 17 00:00:00 2001 > >> +From: Carsten Munk <[email protected]> > >> +Date: Wed, 17 Jul 2013 07:28:04 +0000 > >> +Subject: [PATCH] Fix Project ERROR: Module v8 has no public API. make[1]: > >> *** > >> + [sub-qml-compositor-make_first] Error 3 > >> + > >> +Cherry-picked from: > >> +https://github.com/kvahlman/qtwayland/commit/b455f5acaec811b70ae3eb896c08a634909cb9d1 > >> + > >> +Signed-off-by: Carsten Munk <[email protected]> > >> +--- > >> + qtwayland/examples/qml-compositor/qml-compositor.pro | 2 +- > >> + 1 file changed, 1 insertion(+), 1 deletion(-) > >> + > >> +diff --git a/examples/qml-compositor/qml-compositor.pro > >> b/examples/qml-compositor/qml-compositor.pro > >> +index 0bc0b02..e397002 100644 > >> +--- a/examples/qml-compositor/qml-compositor.pro > >> ++++ b/examples/qml-compositor/qml-compositor.pro > >> +@@ -2,7 +2,7 @@ DEFINES += QT_COMPOSITOR_QUICK > >> + > >> + LIBS += -L ../../lib > >> + > >> +-QT += quick qml v8 > >> ++QT += quick qml > >> + QT += quick-private > >> + > >> + QT += compositor > >> +-- > >> +1.8.4 > >> + > >> diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc > >> index 40dd803..2d5d6af 100644 > >> --- a/recipes-qt/qt5/qtwayland.inc > >> +++ b/recipes-qt/qt5/qtwayland.inc > >> @@ -17,6 +17,7 @@ SRC_URI += " \ > >> file://0001-xcbcommon-should-not-be-a-mandatory-dependency.patch \ > >> > >> file://0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch \ > >> file://0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch \ > >> + file://fix.missing.v8.public.api.patch \ > >> " > >> > >> QT_WAYLAND_CONFIG ?= "wayland-compositor" > >> -- > >> 1.8.3.1 > >> > >> _______________________________________________ > >> Openembedded-devel mailing list > >> [email protected] > >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > > > > > _______________________________________________ > > Openembedded-devel mailing list > > [email protected] > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
