[OE-core] [PATCH] fotowall: Add patch which adds ui_wizard.h as a make dependency to ExportWizard.o

Andrei Gherzan andrei at gherzan.ro
Mon May 7 11:25:53 UTC 2012


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 at 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 at 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





More information about the Openembedded-core mailing list