Patchwork fotowall: Add #include ui_wizard.h to ExportWizard.cpp

login
register
mail settings
Submitter Andrei Gherzan
Date May 10, 2012, 2:21 p.m.
Message ID <1336659690-27308-1-git-send-email-andrei@gherzan.ro>
Download mbox | patch
Permalink /patch/27445/
State New
Headers show

Comments

Andrei Gherzan - May 10, 2012, 2:21 p.m.
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>
---
 .../ExportWizard-depends-on-ui_wizard.patch        |   12 ++++++++++++
 meta/recipes-qt/qt-apps/fotowall_0.9.bb            |    6 ++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch
Saul Wold - May 10, 2012, 7:53 p.m.
On 05/10/2012 07:21 AM, 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>
> ---
>   .../ExportWizard-depends-on-ui_wizard.patch        |   12 ++++++++++++
>   meta/recipes-qt/qt-apps/fotowall_0.9.bb            |    6 ++++--
>   2 files changed, 16 insertions(+), 2 deletions(-)
>   create mode 100644 meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch
>
> diff --git a/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch b/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch
> new file mode 100644
> index 0000000..3ad5774
> --- /dev/null
> +++ b/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch

Missing Patch header (SOB and Upstream-Status:)

Thanks
	Sau!

> @@ -0,0 +1,12 @@
> +Index: Fotowall-0.9/App/ExportWizard.cpp
> +===================================================================
> +--- Fotowall-0.9.orig/App/ExportWizard.cpp	2009-11-30 13:21:31.000000000 +0200
> ++++ Fotowall-0.9/App/ExportWizard.cpp	2012-05-10 17:12:06.765230830 +0300
> +@@ -23,6 +23,7 @@
> + #include "imageloaderqt.h"
> + #include "posterazorcore.h"
> + #include "wizard.h"
> ++#include "ui_wizard.h"
> +
> + #include<QDesktopServices>
> + #include<QDesktopWidget>
> diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
> index 52dd727..3cb79a3 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"

Patch

diff --git a/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch b/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch
new file mode 100644
index 0000000..3ad5774
--- /dev/null
+++ b/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch
@@ -0,0 +1,12 @@ 
+Index: Fotowall-0.9/App/ExportWizard.cpp
+===================================================================
+--- Fotowall-0.9.orig/App/ExportWizard.cpp	2009-11-30 13:21:31.000000000 +0200
++++ Fotowall-0.9/App/ExportWizard.cpp	2012-05-10 17:12:06.765230830 +0300
+@@ -23,6 +23,7 @@
+ #include "imageloaderqt.h"
+ #include "posterazorcore.h"
+ #include "wizard.h"
++#include "ui_wizard.h"
+ 
+ #include <QDesktopServices>
+ #include <QDesktopWidget>
diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
index 52dd727..3cb79a3 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"