From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-qt5][WIP][PATCH 4/5] qtwebengine: simplify SRC_URI
Date: Mon, 20 Oct 2014 19:33:51 +0200 [thread overview]
Message-ID: <1413826432-483-4-git-send-email-Martin.Jansa@gmail.com> (raw)
In-Reply-To: <1413826432-483-1-git-send-email-Martin.Jansa@gmail.com>
* now when it was moved from qt-labs to qt prefix we can reuse the
SRC_URI from qt5-git.bb
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes-qt/qt5/qtwebengine_5.3.2+git.bb | 9 +++------
recipes-qt/qt5/qtwebengine_git.bb | 9 +++------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/recipes-qt/qt5/qtwebengine_5.3.2+git.bb b/recipes-qt/qt5/qtwebengine_5.3.2+git.bb
index c9a6ea4..9c65d7a 100644
--- a/recipes-qt/qt5/qtwebengine_5.3.2+git.bb
+++ b/recipes-qt/qt5/qtwebengine_5.3.2+git.bb
@@ -9,12 +9,8 @@ DEFAULT_PREFERENCE = "1"
QT_MODULE_BRANCH = "1.0"
QT_MODULE_BRANCH_CHROMIUM = "33.0.1750.170-based"
-# For now we have to define SRC_URI here again as qt5-git.inc points to
-# qt.gitorious.org/qt/ but qtwebengine is still on qt.gitorious.org/qt-labs/ which will
-# switch soon.
-SRC_URI = " \
- git://gitorious.org/qt/qtwebengine.git;name=qtwebengine;protocol=git;branch=${QT_MODULE_BRANCH} \
- git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;protocol=git;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
+SRC_URI += " \
+ git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
file://0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch \
file://0002-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
file://0003-functions.prf-Try-to-add-_moc-suffix.patch \
@@ -24,5 +20,6 @@ SRC_URI = " \
"
SRCREV_qtwebengine = "21f6ce84ecca9a4ff2aa980b21d2e5174c78d14b"
SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff"
+SRCREV = "${SRCREV_qtwebengine}"
SRCREV_FORMAT = "qtwebengine"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 7fe2190..a2f685a 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -4,12 +4,8 @@ require ${PN}.inc
QT_MODULE_BRANCH = "1.0"
QT_MODULE_BRANCH_CHROMIUM = "33.0.1750.170-based"
-# For now we have to define SRC_URI here again as qt5-git.inc points to
-# qt.gitorious.org/qt/ but qtwebengine is still on qt.gitorious.org/qt-labs/ which will
-# switch soon.
-SRC_URI = " \
- git://gitorious.org/qt/qtwebengine.git;name=qtwebengine;protocol=git;branch=${QT_MODULE_BRANCH} \
- git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;protocol=git;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
+SRC_URI += " \
+ git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
file://0002-functions.prf-Try-to-add-_moc-suffix.patch \
file://0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch \
@@ -18,5 +14,6 @@ SRC_URI = " \
"
SRCREV_qtwebengine = "14fcf0d3193e2ee2bf904a305c9f34ff8d0e5ce7"
SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff"
+SRCREV = "${SRCREV_qtwebengine}"
SRCREV_FORMAT = "qtwebengine"
--
2.1.1
next prev parent reply other threads:[~2014-10-20 17:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-20 17:33 [meta-qt5][WIP][PATCH 1/5] qt5: upgrade git recipes to 5.4-beta1 Martin Jansa
2014-10-20 17:33 ` [meta-qt5][WIP][PATCH 2/5] qt5: update LICENSE in git recipes Martin Jansa
2014-10-20 17:33 ` [meta-qt5][WIP][PATCH 3/5] qtbase: delete mkspecs/macx-ios-clang to hide QA issue Martin Jansa
2014-10-20 17:33 ` Martin Jansa [this message]
2014-10-20 17:33 ` [meta-qt5][WIP][PATCH 5/5] qtwebengine: backport patches to fix ARM build failures Martin Jansa
2014-10-21 4:24 ` Jonathan Liu
2014-10-20 17:49 ` [meta-qt5][WIP][PATCH 1/5] qt5: upgrade git recipes to 5.4-beta1 Martin Jansa
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=1413826432-483-4-git-send-email-Martin.Jansa@gmail.com \
--to=martin.jansa@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox