* [PATCH] fotowall: Add patch which adds ui_wizard.h as a make dependency to ExportWizard.o
@ 2012-05-07 11:25 Andrei Gherzan
2012-05-07 12:17 ` Richard Purdie
0 siblings, 1 reply; 3+ messages in thread
From: Andrei Gherzan @ 2012-05-07 11:25 UTC (permalink / raw)
To: openembedded-core
App/ExportWizard.cpp depends on wizard.h which depends on ui_wizard. The last one
should be already generated before compiling ExportWizard.cpp.
[YOCTO #2297]
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
meta/recipes-qt/qt-apps/fotowall_0.9.bb | 6 ++++--
.../ExportWizard-depends-on-ui_wizard.patch | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-qt/qt-apps/fotowall_0.9/ExportWizard-depends-on-ui_wizard.patch
diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
index 52dd727..04580ff 100644
--- a/meta/recipes-qt/qt-apps/fotowall_0.9.bb
+++ b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
@@ -7,12 +7,14 @@ LIC_FILES_CHKSUM = "file://GPL_V2;md5=79808397c3355f163c012616125c9e26 \
file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc"
SECTION = "x11/apps"
-PR = "r2"
+PR = "r3"
DEPENDS = "qt4-x11-free"
RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff"
-SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2"
+SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2 \
+ file://ExportWizard-depends-on-ui_wizard.patch \
+ "
SRC_URI[md5sum] = "142ef697332e0777c6d22c5bc96cc438"
SRC_URI[sha256sum] = "e4d0c005d2cb1d7c09438bfc3098eadebc08946e4fbc0655b7fc8b046de3810d"
diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9/ExportWizard-depends-on-ui_wizard.patch b/meta/recipes-qt/qt-apps/fotowall_0.9/ExportWizard-depends-on-ui_wizard.patch
new file mode 100644
index 0000000..4101e28
--- /dev/null
+++ b/meta/recipes-qt/qt-apps/fotowall_0.9/ExportWizard-depends-on-ui_wizard.patch
@@ -0,0 +1,20 @@
+App/ExportWizard.cpp depends on wizard.h which depends on ui_wizard. The last one
+should be already generated before compiling ExportWizard.cpp.
+
+Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+Upstream-Status: Pending
+
+Index: Fotowall-0.9/Makefile
+===================================================================
+--- Fotowall-0.9.orig/Makefile 2012-05-06 16:54:26.991254818 +0300
++++ Fotowall-0.9/Makefile 2012-05-06 16:52:57.000000000 +0300
+@@ -1074,7 +1074,8 @@
+ Canvas/CanvasModeInfo.h \
+ App/App.h \
+ App/Settings.h \
+- .build/ui_ExportWizard.h
++ .build/ui_ExportWizard.h \
++ .build/ui_wizard.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .build/ExportWizard.o App/ExportWizard.cpp
+
+ .build/FotowallFile.o: App/FotowallFile.cpp App/FotowallFile.h \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] fotowall: Add patch which adds ui_wizard.h as a make dependency to ExportWizard.o
2012-05-07 11:25 [PATCH] fotowall: Add patch which adds ui_wizard.h as a make dependency to ExportWizard.o Andrei Gherzan
@ 2012-05-07 12:17 ` Richard Purdie
2012-05-07 12:45 ` Andrei Gherzan
0 siblings, 1 reply; 3+ messages in thread
From: Richard Purdie @ 2012-05-07 12:17 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2012-05-07 at 14:25 +0300, Andrei Gherzan wrote:
> App/ExportWizard.cpp depends on wizard.h which depends on ui_wizard. The last one
> should be already generated before compiling ExportWizard.cpp.
>
> [YOCTO #2297]
>
> Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
> ---
> meta/recipes-qt/qt-apps/fotowall_0.9.bb | 6 ++++--
> .../ExportWizard-depends-on-ui_wizard.patch | 20 ++++++++++++++++++++
> 2 files changed, 24 insertions(+), 2 deletions(-)
> create mode 100644 meta/recipes-qt/qt-apps/fotowall_0.9/ExportWizard-depends-on-ui_wizard.patch
>
> diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
> index 52dd727..04580ff 100644
> --- a/meta/recipes-qt/qt-apps/fotowall_0.9.bb
> +++ b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
> @@ -7,12 +7,14 @@ LIC_FILES_CHKSUM = "file://GPL_V2;md5=79808397c3355f163c012616125c9e26 \
> file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc"
> SECTION = "x11/apps"
>
> -PR = "r2"
> +PR = "r3"
>
> DEPENDS = "qt4-x11-free"
> RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff"
>
> -SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2"
> +SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2 \
> + file://ExportWizard-depends-on-ui_wizard.patch \
> + "
>
> SRC_URI[md5sum] = "142ef697332e0777c6d22c5bc96cc438"
> SRC_URI[sha256sum] = "e4d0c005d2cb1d7c09438bfc3098eadebc08946e4fbc0655b7fc8b046de3810d"
> diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9/ExportWizard-depends-on-ui_wizard.patch b/meta/recipes-qt/qt-apps/fotowall_0.9/ExportWizard-depends-on-ui_wizard.patch
> new file mode 100644
> index 0000000..4101e28
> --- /dev/null
> +++ b/meta/recipes-qt/qt-apps/fotowall_0.9/ExportWizard-depends-on-ui_wizard.patch
> @@ -0,0 +1,20 @@
> +App/ExportWizard.cpp depends on wizard.h which depends on ui_wizard. The last one
> +should be already generated before compiling ExportWizard.cpp.
> +
> +Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
> +Upstream-Status: Pending
> +
> +Index: Fotowall-0.9/Makefile
> +===================================================================
> +--- Fotowall-0.9.orig/Makefile 2012-05-06 16:54:26.991254818 +0300
> ++++ Fotowall-0.9/Makefile 2012-05-06 16:52:57.000000000 +0300
> +@@ -1074,7 +1074,8 @@
> + Canvas/CanvasModeInfo.h \
> + App/App.h \
> + App/Settings.h \
> +- .build/ui_ExportWizard.h
> ++ .build/ui_ExportWizard.h \
> ++ .build/ui_wizard.h
> + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .build/ExportWizard.o App/ExportWizard.cpp
> +
> + .build/FotowallFile.o: App/FotowallFile.cpp App/FotowallFile.h \
Isn't this Makefile autogenerated?
Cheers,
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] fotowall: Add patch which adds ui_wizard.h as a make dependency to ExportWizard.o
2012-05-07 12:17 ` Richard Purdie
@ 2012-05-07 12:45 ` Andrei Gherzan
0 siblings, 0 replies; 3+ messages in thread
From: Andrei Gherzan @ 2012-05-07 12:45 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 3460 bytes --]
Slap. My bad. Brb with the real fix.
*@g*
On Mon, May 7, 2012 at 3:17 PM, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:
> On Mon, 2012-05-07 at 14:25 +0300, Andrei Gherzan wrote:
> > App/ExportWizard.cpp depends on wizard.h which depends on ui_wizard. The
> last one
> > should be already generated before compiling ExportWizard.cpp.
> >
> > [YOCTO #2297]
> >
> > Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
> > ---
> > meta/recipes-qt/qt-apps/fotowall_0.9.bb | 6 ++++--
> > .../ExportWizard-depends-on-ui_wizard.patch | 20
> ++++++++++++++++++++
> > 2 files changed, 24 insertions(+), 2 deletions(-)
> > create mode 100644
> meta/recipes-qt/qt-apps/fotowall_0.9/ExportWizard-depends-on-ui_wizard.patch
> >
> > diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bbb/meta/recipes-qt/qt-apps/
> fotowall_0.9.bb
> > index 52dd727..04580ff 100644
> > --- a/meta/recipes-qt/qt-apps/fotowall_0.9.bb
> > +++ b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
> > @@ -7,12 +7,14 @@ LIC_FILES_CHKSUM =
> "file://GPL_V2;md5=79808397c3355f163c012616125c9e26 \
> >
> file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc"
> > SECTION = "x11/apps"
> >
> > -PR = "r2"
> > +PR = "r3"
> >
> > DEPENDS = "qt4-x11-free"
> > RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif
> qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff"
> >
> > -SRC_URI = "
> http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2"
> > +SRC_URI = "
> http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2 \
> > + file://ExportWizard-depends-on-ui_wizard.patch \
> > + "
> >
> > SRC_URI[md5sum] = "142ef697332e0777c6d22c5bc96cc438"
> > SRC_URI[sha256sum] =
> "e4d0c005d2cb1d7c09438bfc3098eadebc08946e4fbc0655b7fc8b046de3810d"
> > diff --git
> a/meta/recipes-qt/qt-apps/fotowall_0.9/ExportWizard-depends-on-ui_wizard.patch
> b/meta/recipes-qt/qt-apps/fotowall_0.9/ExportWizard-depends-on-ui_wizard.patch
> > new file mode 100644
> > index 0000000..4101e28
> > --- /dev/null
> > +++
> b/meta/recipes-qt/qt-apps/fotowall_0.9/ExportWizard-depends-on-ui_wizard.patch
> > @@ -0,0 +1,20 @@
> > +App/ExportWizard.cpp depends on wizard.h which depends on ui_wizard.
> The last one
> > +should be already generated before compiling ExportWizard.cpp.
> > +
> > +Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
> > +Upstream-Status: Pending
> > +
> > +Index: Fotowall-0.9/Makefile
> > +===================================================================
> > +--- Fotowall-0.9.orig/Makefile 2012-05-06 16:54:26.991254818 +0300
> > ++++ Fotowall-0.9/Makefile 2012-05-06 16:52:57.000000000 +0300
> > +@@ -1074,7 +1074,8 @@
> > + Canvas/CanvasModeInfo.h \
> > + App/App.h \
> > + App/Settings.h \
> > +- .build/ui_ExportWizard.h
> > ++ .build/ui_ExportWizard.h \
> > ++ .build/ui_wizard.h
> > + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .build/ExportWizard.o
> App/ExportWizard.cpp
> > +
> > + .build/FotowallFile.o: App/FotowallFile.cpp App/FotowallFile.h \
>
>
> Isn't this Makefile autogenerated?
>
> Cheers,
>
> Richard
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 5125 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-07 12:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-07 11:25 [PATCH] fotowall: Add patch which adds ui_wizard.h as a make dependency to ExportWizard.o Andrei Gherzan
2012-05-07 12:17 ` Richard Purdie
2012-05-07 12:45 ` Andrei Gherzan
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.