Re: [PATCH][meta-qt5][jansa/qt5-5.2.0]] qttools: add target build

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3732 bytes --]

On Fri, Jan 17, 2014 at 03:59:18PM +0100, Andreas Müller wrote:
> this does not build much yet but I was looking for qdbus

Do you want me to merge it now or should I wait a bit more? "build much"
means that it builds OK, but only some tools, right?
 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  recipes-qt/qt5/qttools.inc                         | 12 ++++++++
>  ...t-help-fix-linking-of-dependent-libraries.patch | 32 ++++++++++++++++++++++
>  recipes-qt/qt5/qttools_5.2.0.bb                    |  5 ++++
>  3 files changed, 49 insertions(+)
>  create mode 100644 recipes-qt/qt5/qttools.inc
>  create mode 100644 recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
>  create mode 100644 recipes-qt/qt5/qttools_5.2.0.bb
> 
> diff --git a/recipes-qt/qt5/qttools.inc b/recipes-qt/qt5/qttools.inc
> new file mode 100644
> index 0000000..e96a678
> --- /dev/null
> +++ b/recipes-qt/qt5/qttools.inc
> @@ -0,0 +1,12 @@
> +DEPENDS += "qtbase"
> +
> +QT_MODULE = "qttools"
> +
> +require qt5.inc
> +
> +SRC_URI += " \
> +	file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \
> +"
> +
> +FILES_${PN}-examples = "${datadir}/${QT_DIR_NAME}/examples"
> +
> diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
> new file mode 100644
> index 0000000..0f95333
> --- /dev/null
> +++ b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
> @@ -0,0 +1,32 @@
> +From 26228d3ed02a4a244d01b3cc2bf3633f25797bb7 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> +Date: Fri, 17 Jan 2014 14:33:19 +0100
> +Subject: [PATCH] assistant/help: fix linking of dependent libraries
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +else we get:
> +| ...ld: warning: libQt5CLucene.so.5, needed by ...libQt5Help.so, not found (try using -rpath or -rpath-link)
> +| ...undefined reference to `QCLucenePhraseQuery::getTerms() const'

This looks familiar, IIRC I was getting similar issues before disabling
other parts of qttools-native (as we were interested only in l* tools)

0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch

> +
> +Upstream-Status: Inappropriate [configuration]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> +---
> + src/assistant/help/help.pro | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro
> +index ed75c37..a2c55c7 100644
> +--- a/src/assistant/help/help.pro
> ++++ b/src/assistant/help/help.pro
> +@@ -70,3 +70,5 @@ HEADERS += qhelpenginecore.h \
> + # access to clucene
> + HEADERS += qhelpsearchindexwriter_clucene_p.h \
> +     qhelpsearchindexreader_clucene_p.h
> ++
> ++LIBS += -lQt5CLucene
> +-- 
> +1.8.3.1
> +
> diff --git a/recipes-qt/qt5/qttools_5.2.0.bb b/recipes-qt/qt5/qttools_5.2.0.bb
> new file mode 100644
> index 0000000..0effa1b
> --- /dev/null
> +++ b/recipes-qt/qt5/qttools_5.2.0.bb
> @@ -0,0 +1,5 @@
> +require qt5-${PV}.inc
> +require ${PN}.inc
> +
> +SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1"
> +SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0"
> -- 
> 1.8.3.1
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]