On Mon, Dec 15, 2014 at 09:43:41PM +0000, Cooper Jr., Franklin wrote: > I was simply going to do a sed replace instead of creating a new makefile > but either way is fine.
This is just patching the existing Makefile. But sed would have worked as well. > 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 1/2] refresh-screen: 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/refresh-screen_2.0.bb | 3 +- > > 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta- > > arago-extras/recipes-core/matrix/refresh-screen/0001-Makefile.build-with- > > Qt5-use-qmake-available-in-PATH.patch > > > > diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen/0001- > > Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch b/meta-arago- > > extras/recipes-core/matrix/refresh-screen/0001-Makefile.build-with-Qt5- > > use-qmake-available-in-PATH.patch > > new file mode 100644 > > index 0000000..726b9ea > > --- /dev/null > > +++ b/meta-arago-extras/recipes-core/matrix/refresh-screen/0001-Makefile > > +++ .build-with-Qt5-use-qmake-available-in-PATH.patch > > @@ -0,0 +1,31 @@ > > +From 394eacf80efaacc719e69179c7c709016d21b707 Mon Sep 17 00:00:00 > > 2001 > > +From: Denys Dmytriyenko <[email protected]> > > +Date: Mon, 15 Dec 2014 15:46:08 -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 a0ceaad..e6cb010 > > +100644 > > +--- a/Makefile.build > > ++++ b/Makefile.build > > +@@ -8,11 +8,11 @@ all: release > > + .PHONY: qmake > > + qmake : refresh_screen.pro > > + @. ${ENV_SETUP}; \ > > +- qmake2 CONFIG+=release refresh_screen.pro > > ++ qmake CONFIG+=release refresh_screen.pro > > + > > + qmake_debug : refresh_screen.pro > > + @. ${ENV_SETUP}; \ > > +- qmake2 CONFIG+=debug refresh_screen.pro > > ++ qmake CONFIG+=debug refresh_screen.pro > > + > > + debug : qmake_debug > > + @. ${ENV_SETUP}; \ > > +-- > > +1.7.9.5 > > + > > diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb > > b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb > > index 50d95fc..6c2c72e 100644 > > --- a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb > > +++ b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb > > @@ -9,7 +9,7 @@ inherit qt-provider > > # Make sure that QT font libraries have been installed RDEPENDS_${PN} += > > "${QT_RDEPENDS_FONTS}" > > > > -PR = "r6" > > +PR = "r7" > > > > SRCREV = "ad3835b250c8b2b55ae65ffa19c2b85e412826b0" > > BRANCH ?= "master" > > @@ -19,6 +19,7 @@ SRC_URI = "git://gitorious.org/matrix-gui-v2/refresh- > > screen.git;protocol=git;bra > > QT5_DIFF = " \ > > file://0001-refresh-screen.pro-add-widgets-module-to-the-project.patch \ > > file://0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch \ > > +file://0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch \ > > " > > > > SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', "${QT5_DIFF}", '', > > d)}" > > -- > > 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
