From: Denys Dmytriyenko <[email protected]> Uses qt-provider class to build against either Qt4 or Qt5 depending on global distro variable QT_PROVIDER.
Signed-off-by: Denys Dmytriyenko <[email protected]> Acked-by: Franklin S. Cooper Jr <[email protected]> Acked-by: Chase Maupin <[email protected]> --- .../matrix/matrix-gui-browser/qt5-gui-widgets-move.patch | 12 ++++++++++++ .../recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch | 12 ++++++++++++ .../recipes-core/matrix/matrix-gui-browser_2.0.bb | 12 ++++++++---- 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-gui-widgets-move.patch create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-gui-widgets-move.patch b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-gui-widgets-move.patch new file mode 100644 index 0000000..82e2728 --- /dev/null +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-gui-widgets-move.patch @@ -0,0 +1,12 @@ +diff -uNr git-orig/main.cpp git/main.cpp +--- git-orig/main.cpp 2013-09-29 20:06:36.000000000 -0400 ++++ git/main.cpp 2013-09-29 20:11:52.762449142 -0400 +@@ -36,7 +36,7 @@ + * + */ + +-#include <QtGui> ++#include <QtWidgets> + #include <QWebView> + #include <QGraphicsWebView> + #include <iostream> diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch new file mode 100644 index 0000000..abbbcc8 --- /dev/null +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch @@ -0,0 +1,12 @@ +diff -uNr git-orig/matrix_browser.pro git/matrix_browser.pro +--- git-orig/matrix_browser.pro 2013-09-29 18:43:16.000000000 -0400 ++++ git/matrix_browser.pro 2013-09-29 19:00:24.182913775 -0400 +@@ -6,7 +6,7 @@ + TARGET = matrix_browser + DEPENDPATH += . + INCLUDEPATH += . +-QT += webkit ++QT += webkitwidgets + # Input + SOURCES += main.cpp + diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb index 0e508a0..329b65a 100644 --- a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb @@ -4,19 +4,23 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://main.cpp;beginline=9;endline=37;md5=884b90f5bf0d711fe32c4f04b5276496" SECTION = "multimedia" +inherit qt-provider + # Make sure that QT font libraries have been installed -RDEPENDS_${PN} += "qt4-embedded-fonts" +RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}" + +DEPENDS += "${QT_DEPENDS_WEBKIT}" -PR = "r2" +PR = "r3" SRCREV = "db2e6b10e5a14358b6120a4a28de2f9d591bc55c" BRANCH ?= "master" SRC_URI = "git://gitorious.org/matrix-gui-v2/matrix_browser.git;protocol=git;branch=${BRANCH}" -S = "${WORKDIR}/git" +SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', 'file://qt5-webkit.patch file://qt5-gui-widgets-move.patch', '', d)}" -inherit qt4e +S = "${WORKDIR}/git" do_install() { install -d ${D}/${bindir} -- 1.8.3.2 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
