Acked-by: Franklin Cooper Jr. <[email protected]>
> -----Original Message----- > From: [email protected] [mailto:meta-arago- > [email protected]] On Behalf Of Denys Dmytriyenko > Sent: Monday, December 15, 2014 3:23 PM > To: [email protected] > Subject: [meta-arago] [PATCH 2/2] matrix-gui-browser: patch Makefile.build > to work with Qt5 > > From: Denys Dmytriyenko <[email protected]> > > Makefile.build is only used when building from within SDK through a top-level > SDK Makefile. > > Signed-off-by: Denys Dmytriyenko <[email protected]> > --- > ...uild-with-Qt5-use-qmake-available-in-PATH.patch | 31 > ++++++++++++++++++++ > .../recipes-core/matrix/matrix-gui-browser_2.0.bb | 10 +++++-- > 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 meta- > arago-extras/recipes-core/matrix/matrix-gui-browser/0001-Makefile.build- > with-Qt5-use-qmake-available-in-PATH.patch > > diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui- > browser/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch > b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/0001- > Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch > new file mode 100644 > index 0000000..42cfc23 > --- /dev/null > +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/0001- > Make > +++ file.build-with-Qt5-use-qmake-available-in-PATH.patch > @@ -0,0 +1,31 @@ > +From 155da553d7a5d4d84babb94fb0ecac073680c1cd Mon Sep 17 00:00:00 > 2001 > +From: Denys Dmytriyenko <[email protected]> > +Date: Mon, 15 Dec 2014 15:51:59 -0500 > +Subject: [PATCH] Makefile.build: with Qt5 use qmake available in PATH > + > +Signed-off-by: Denys Dmytriyenko <[email protected]> > +--- > + Makefile.build | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/Makefile.build b/Makefile.build index 192c6f6..79b55f5 > +100644 > +--- a/Makefile.build > ++++ b/Makefile.build > +@@ -8,11 +8,11 @@ all: release > + .PHONY: qmake > + qmake : matrix_browser.pro > + @. ${ENV_SETUP}; \ > +- qmake2 CONFIG+=release matrix_browser.pro > ++ qmake CONFIG+=release matrix_browser.pro > + > + qmake_debug : matrix_browser.pro > + @. ${ENV_SETUP}; \ > +- qmake2 CONFIG+=debug matrix_browser.pro > ++ qmake CONFIG+=debug matrix_browser.pro > + > + debug : qmake_debug > + @. ${ENV_SETUP}; \ > +-- > +1.7.9.5 > + > 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 afd5aa3..cc73456 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 > @@ -11,14 +11,20 @@ RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}" > > DEPENDS += "${QT_DEPENDS_WEBKIT}" > > -PR = "r7" > +PR = "r8" > > SRCREV = "7f5dccfb5b1b68a3f9162f6ee072eef0e0ba06fe" > BRANCH ?= "master" > > SRC_URI = "git://gitorious.org/matrix-gui- > v2/matrix_browser.git;protocol=git;branch=${BRANCH}" > > -SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', 'file://qt5- > webkit.patch file://qt5-gui-widgets-move.patch', '', d)}" > +QT5_DIFF = " \ > + file://qt5-webkit.patch \ > + file://qt5-gui-widgets-move.patch \ > + file://0001-Makefile.build-with-Qt5-use-qmake-available-in- > PATH.patch > +\ " > + > +SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', "${QT5_DIFF}", '', > d)}" > > S = "${WORKDIR}/git" > > -- > 1.7.9.5 > > _______________________________________________ > meta-arago mailing list > [email protected] > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
