Patchwork [1/3] fotowall: tidy up

login
register
mail settings
Submitter Paul Eggleton
Date Dec. 5, 2012, 1:28 p.m.
Message ID <a5082fe0fa17b228c2a8486edffa04c2e4dfe89b.1354713989.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/40429/
State Accepted
Commit 166a0ca486f5ff6c457eb5a096c383d01c84230b
Headers show

Comments

Paul Eggleton - Dec. 5, 2012, 1:28 p.m.
* inherit qt4x11 which inherits qmake2 and sets DEPENDS already
* Remove pkgconfig from inherit since quicky doesn't actually use
  pkg-config nor does it produce a .pc file
* Move packaging definitions to the end

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-qt/qt-apps/fotowall_0.9.bb |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
index 3cb79a3..2e1fbaa 100644
--- a/meta/recipes-qt/qt-apps/fotowall_0.9.bb
+++ b/meta/recipes-qt/qt-apps/fotowall_0.9.bb
@@ -7,10 +7,7 @@  LIC_FILES_CHKSUM = "file://GPL_V2;md5=79808397c3355f163c012616125c9e26 \
                     file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc"
 SECTION = "x11/apps"
 
-PR = "r3"
-
-DEPENDS = "qt4-x11-free"
-RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff"
+PR = "r4"
 
 SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2 \
            file://ExportWizard-depends-on-ui_wizard.patch \
@@ -21,10 +18,13 @@  SRC_URI[sha256sum] = "e4d0c005d2cb1d7c09438bfc3098eadebc08946e4fbc0655b7fc8b046d
 
 S = "${WORKDIR}/Fotowall-${PV}"
 
-inherit qmake2 pkgconfig
+inherit qt4x11
 
 EXTRA_QMAKEVARS_PRE = "CONFIG+=no-webcam"
 
 do_install() {
 	oe_runmake INSTALL_ROOT=${D} install
 }
+
+# Ensure we have some plugins for some useful image formats
+RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff"