All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Eric Bénard" <eric@eukrea.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-qt5][PATCH 5/8] qtbase-5.0.2: fix v8 and allow build of examples
Date: Tue, 28 May 2013 01:43:50 +0200	[thread overview]
Message-ID: <1369698233-4500-5-git-send-email-eric@eukrea.com> (raw)
In-Reply-To: <1369698233-4500-1-git-send-email-eric@eukrea.com>

- fix v8 segfault (at least on armv7)
- examples are only provided as sources but in our case, binaries
are more interesting for user to test the features on the target.

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 .../0001-qtbase-allow-build-of-examples.patch      |   49 ++++++++++++++++++++
 recipes-qt/qt5/qtbase_5.0.2.bb                     |    4 ++
 2 files changed, 53 insertions(+)
 create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch

diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch
new file mode 100644
index 0000000..17b951a
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch
@@ -0,0 +1,49 @@
+From 66558b78b5ff8c8ae9fa00a33d1d89285b8e3a00 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
+Date: Sat, 25 May 2013 17:34:32 +0200
+Subject: [PATCH] qtbase: allow build of examples
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+this revert the following commit :
+
+commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61
+Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
+Date:   Fri Dec 21 19:36:12 2012 +0100
+
+    do not actually build examples in production builds
+
+    -developer-build enables an actual build of examples, based on the
+    assumption that developers want to test it (it can be still disabled
+    with -nomake examples). regular users otoh want only the examples
+    sources installed.
+
+    Change-Id: Ifc6a108099929175a3960480802b271a758fdd38
+    Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
+
+Signed-off-by: Eric Bénard <eric@eukrea.com>
+---
+ mkspecs/features/qt_example_installs.prf | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
+index 479a16a..ca1b0c7 100644
+--- a/mkspecs/features/qt_example_installs.prf
++++ b/mkspecs/features/qt_example_installs.prf
+@@ -92,12 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
+         allfiles -= doc
+         !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles")
+     }
+-
+-    # Do not actually build the examples in production builds with -prefix
+-    !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) {
+-        TEMPLATE = aux
+-        CONFIG -= have_target qt staticlib dll
+-        SOURCES =
+-        INSTALLS -= target
+-    }
+ }
+-- 
+1.8.1.4
+
diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb
index 3df434e..357c06e 100644
--- a/recipes-qt/qt5/qtbase_5.0.2.bb
+++ b/recipes-qt/qt5/qtbase_5.0.2.bb
@@ -3,5 +3,9 @@ require ${PN}.inc
 
 PR = "${INC_PR}.0"
 
+SRC_URI += "file://0004-Disable-mkv8snapshot.patch \
+    file://0001-qtbase-allow-build-of-examples.patch \
+    "
+
 SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0"
 SRC_URI[sha256sum] = "31851ee2f844c100554506a9a446d4b6abb5270bca799c2a683e5f937456a9c8"
-- 
1.7.10.4



  parent reply	other threads:[~2013-05-27 23:43 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-27 23:43 [meta-qt5][PATCH 1/8] qt: package examples Eric Bénard
2013-05-27 23:43 ` [meta-qt5][PATCH 2/8] qtjsbackend: fix hardfloat detection in v8 Eric Bénard
2013-05-27 23:43 ` [meta-qt5][PATCH 3/8] qtbase: add 0004-Disable-mkv8snapshot.patch to 5.0.1 Eric Bénard
2013-05-27 23:43 ` [meta-qt5][PATCH 4/8] qtbase: remove non existing parts Eric Bénard
2013-05-27 23:43 ` Eric Bénard [this message]
2013-05-27 23:43 ` [meta-qt5][PATCH 6/8] qtdeclarative-5.0.2: fix examples compilation Eric Bénard
2013-05-27 23:43 ` [meta-qt5][PATCH 7/8] qtbase: install and split package fonts Eric Bénard
2013-05-28  8:28   ` Martin Jansa
2013-05-28  8:40     ` Eric Bénard
2013-05-28  8:50   ` Martin Jansa
2013-05-28  9:04     ` Eric Bénard
2013-05-28 13:03     ` [PATCH v2] " Eric Bénard
2013-05-27 23:43 ` [meta-qt5][PATCH 8/8] qtbase: add option to enable tslib support Eric Bénard
2013-05-28  8:46   ` Martin Jansa
2013-05-28  8:50     ` Eric Bénard
2013-05-28  9:25       ` Martin Jansa
2013-05-28  9:27         ` Eric Bénard
2013-05-28  9:30           ` Martin Jansa
2013-05-28  9:33             ` Eric Bénard
2013-05-28  9:59               ` Martin Jansa
2013-05-28 10:47                 ` Eric Bénard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1369698233-4500-5-git-send-email-eric@eukrea.com \
    --to=eric@eukrea.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.