summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt-apps
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei@gherzan.ro>2012-05-10 21:06:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-31 20:15:14 (GMT)
commit16281590289222266b64ea645b5aa05fcb86ade8 (patch)
tree50e9a094ea4632068c9d73a509a1c2c2b02ec529 /meta/recipes-qt/qt-apps
parentb477f676e336beee5ed660d3075b84d638eef00d (diff)
downloadpoky-16281590289222266b64ea645b5aa05fcb86ade8.tar.gz
fotowall: Add #include ui_wizard.h to ExportWizard.cpp
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] (From OE-Core rev: d7bf94647f17c0382caad8af0bdda837b14b22dc) Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt-apps')
-rw-r--r--meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch18
-rw-r--r--meta/recipes-qt/qt-apps/fotowall_0.9.bb6
2 files changed, 22 insertions, 2 deletions
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..d8b2b23
--- /dev/null
+++ b/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch
@@ -0,0 +1,18 @@
1App/ExportWizard.cpp depends on wizard.h which depends on ui_wizard. The last one
2should be already generated before compiling ExportWizard.cpp.
3
4Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
5Upstream-Status: Pending
6
7Index: Fotowall-0.9/App/ExportWizard.cpp
8===================================================================
9--- Fotowall-0.9.orig/App/ExportWizard.cpp 2009-11-30 13:21:31.000000000 +0200
10+++ Fotowall-0.9/App/ExportWizard.cpp 2012-05-10 17:12:06.765230830 +0300
11@@ -23,6 +23,7 @@
12 #include "imageloaderqt.h"
13 #include "posterazorcore.h"
14 #include "wizard.h"
15+#include "ui_wizard.h"
16
17 #include <QDesktopServices>
18 #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 \
7 file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc" 7 file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc"
8SECTION = "x11/apps" 8SECTION = "x11/apps"
9 9
10PR = "r2" 10PR = "r3"
11 11
12DEPENDS = "qt4-x11-free" 12DEPENDS = "qt4-x11-free"
13RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff" 13RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff"
14 14
15SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2" 15SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2 \
16 file://ExportWizard-depends-on-ui_wizard.patch \
17 "
16 18
17SRC_URI[md5sum] = "142ef697332e0777c6d22c5bc96cc438" 19SRC_URI[md5sum] = "142ef697332e0777c6d22c5bc96cc438"
18SRC_URI[sha256sum] = "e4d0c005d2cb1d7c09438bfc3098eadebc08946e4fbc0655b7fc8b046de3810d" 20SRC_URI[sha256sum] = "e4d0c005d2cb1d7c09438bfc3098eadebc08946e4fbc0655b7fc8b046de3810d"