[oe-commits] Wayne Warren : qtserialport-e: Various fixes per openembedded-devel list comments.

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: dylan-next
Commit: 148a2395e9dc287e69e37929328bc33e7e4ee3ee
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=148a2395e9dc287e69e37929328bc33e7e4ee3ee

Author: Wayne Warren <steven.w.warren at gmail.com>
Date:   Mon Apr 22 18:45:11 2013 +0000

qtserialport-e: Various fixes per openembedded-devel list comments.

* Change DESCRIPTION to SUMMARY
 * Fix LICENSE declarations to be version-specific
 * Coding convention fixes * Don't modify Makefiles modified by qmake2; instead
   symlink qmake2 in to $WORKDIR to be run from there so that it uses
   $WORKDIR/qt.conf values

Signed-off-by: Wayne Warren <steven.w.warren at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../qtserialport/qtserialport-e_5.1.0.bb           |    6 +++
 meta-oe/recipes-qt/qtserialport/qtserialport.inc   |   34 ++++++++++++++------
 .../recipes-qt/qtserialport/qtserialport_5.1.0.bb  |    6 ---
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/meta-oe/recipes-qt/qtserialport/qtserialport-e_5.1.0.bb b/meta-oe/recipes-qt/qtserialport/qtserialport-e_5.1.0.bb
new file mode 100644
index 0000000..dcaac20
--- /dev/null
+++ b/meta-oe/recipes-qt/qtserialport/qtserialport-e_5.1.0.bb
@@ -0,0 +1,6 @@
+inherit qt4e
+
+require qtserialport.inc
+
+SRCREV = "22e45f0b0f956c025339d72ad53dca57ef684858"
+
diff --git a/meta-oe/recipes-qt/qtserialport/qtserialport.inc b/meta-oe/recipes-qt/qtserialport/qtserialport.inc
index 09f2f9a..fc2020d 100644
--- a/meta-oe/recipes-qt/qtserialport/qtserialport.inc
+++ b/meta-oe/recipes-qt/qtserialport/qtserialport.inc
@@ -1,15 +1,15 @@
-DESCRIPTION = "Qt Serial Port Library"
+SUMMARY = "Qt Serial Port Library"
 SECTION = "qt/libs"
 HOMEPAGE = "http://qt-project.org/wiki/QtSerialPort"
 
-LICENSE = "LGPL FDL GPL "
+LICENSE = "(LGPL-2.1 | GPL-3.0) & GFDL-1.3"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \
     file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
     "
 
-inherit qt4e pkgconfig
+inherit pkgconfig
 
 SRC_URI = " \
     git://gitorious.org/qt/qtserialport.git \
@@ -18,17 +18,31 @@ SRC_URI = " \
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/${BPN}-${PV}"
 
-QMAKE_PROFILES="${S}/qtserialport.pro"
-EXTRA_QMAKEVARS_PRE += "PREFIX=/usr"
+QMAKE_PROFILES = "${S}/qtserialport.pro"
 EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
+OE_QMAKE_QMAKE = "${WORKDIR}/qmake2"
 
-do_compile_append() {
- 	BOGUS_PREFIX=`qmake2 -query QT_INSTALL_PREFIX`
-	for f in `find ${B} -name "Makefile"` ;do 
-		sed -i -e "s|\(\$(INSTALL_ROOT)\)${BOGUS_PREFIX}|\1${prefix}|g" ${f}
-	done
+do_prepare_qmake_symlink() {
+    ln -sf "${STAGING_BINDIR_NATIVE}/qmake2" ${WORKDIR}
+}
+
+addtask prepare_qmake_symlink after do_generate_qt_config_file before do_configure
+
+do_configure_prepend() {
+    sed -i -e "s|\(Prefix\ =\).*|\1${prefix}|" ${WORKDIR}/qt.conf 
+    sed -i -r -e "/^(Binaries|Headers|Plugins|Mkspecs)/ d" ${WORKDIR}/qt.conf 
 }
 
 do_install() {
     oe_runmake install DESTDIR=${D} INCLUDEDIR=${includedir}
 }
+
+FILES_${PN}-dev += " \
+    ${includedir}/QtSerialPort/* \
+    ${prefix}/mkspecs/* \
+    ${libdir}/*.prl \
+"
+
+FILES_${PN}-dbg += " \
+    ${libdir}/.debug/* \
+"
diff --git a/meta-oe/recipes-qt/qtserialport/qtserialport_5.1.0.bb b/meta-oe/recipes-qt/qtserialport/qtserialport_5.1.0.bb
deleted file mode 100644
index d903eb3..0000000
--- a/meta-oe/recipes-qt/qtserialport/qtserialport_5.1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require qtserialport.inc
-
-PR = "r0"
-
-SRCREV="22e45f0b0f956c025339d72ad53dca57ef684858"
-