Looks like v3 still cannot be applied... And I think I know why - there are Windows newlines in the patch (because the original sources had them!) and when those send over the email, those get lost and the patch can no longer be applied... Gotta do some manual tinkering with it.
-- Denys On Wed, Mar 11, 2015 at 10:11:50AM -0500, Franklin S. Cooper Jr wrote: > From: "Franklin S. Cooper Jr" <[email protected]> > > * This is to work around an issue seen when using Qt 5 EGLFS > * Also pull in the changes from the Qt 5 patches into the git repository > itself > > Signed-off-by: Franklin S. Cooper Jr <[email protected]> > --- > v3 changes: > Fix issues related to the patch. Tested by switching to https locally. > * Fix checksum > * Remove base_conditional statement since it isn't needed. > * Updated commit id > > v2 changes: > Added the reason why the various patches are being deleted. > > ...uild-with-Qt5-use-qmake-available-in-PATH.patch | 31 > -------------------- > ...een.pro-add-widgets-module-to-the-project.patch | 26 ---------------- > ...place-QtGui-header-with-QtWidgets-for-Qt5.patch | 26 ---------------- > .../recipes-core/matrix/refresh-screen_2.0.bb | 14 ++------- > 4 files changed, 3 insertions(+), 94 deletions(-) > delete mode 100644 > meta-arago-extras/recipes-core/matrix/refresh-screen/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch > delete mode 100644 > meta-arago-extras/recipes-core/matrix/refresh-screen/0001-refresh-screen.pro-add-widgets-module-to-the-project.patch > delete mode 100644 > meta-arago-extras/recipes-core/matrix/refresh-screen/0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.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 > deleted file mode 100644 > index 726b9ea..0000000 > --- > a/meta-arago-extras/recipes-core/matrix/refresh-screen/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -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/0001-refresh-screen.pro-add-widgets-module-to-the-project.patch > > b/meta-arago-extras/recipes-core/matrix/refresh-screen/0001-refresh-screen.pro-add-widgets-module-to-the-project.patch > deleted file mode 100644 > index b9a1f80..0000000 > --- > a/meta-arago-extras/recipes-core/matrix/refresh-screen/0001-refresh-screen.pro-add-widgets-module-to-the-project.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From 3969a5b06cfa28e531080cfdb12ea69ada870f36 Mon Sep 17 00:00:00 2001 > -From: Denys Dmytriyenko <[email protected]> > -Date: Mon, 12 May 2014 21:07:32 -0400 > -Subject: [PATCH] refresh-screen.pro: add widgets module to the project for > Qt5 > - > -Signed-off-by: Denys Dmytriyenko <[email protected]> > ---- > - refresh_screen.pro | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/refresh_screen.pro b/refresh_screen.pro > -index afe5c25..a79abd0 100644 > ---- a/refresh_screen.pro > -+++ b/refresh_screen.pro > -@@ -4,7 +4,7 @@ > - # > - #------------------------------------------------- > - > --QT += core gui > -+QT += core gui widgets > - > - TARGET = refresh_screen > - TEMPLATE = app > --- > -1.9.2 > - > diff --git > a/meta-arago-extras/recipes-core/matrix/refresh-screen/0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch > > b/meta-arago-extras/recipes-core/matrix/refresh-screen/0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch > deleted file mode 100644 > index 66c002d..0000000 > --- > a/meta-arago-extras/recipes-core/matrix/refresh-screen/0002-Replace-QtGui-header-with-QtWidgets-for-Qt5.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From 60a8e6c8ea763ed88442f16509cae99d8e43918e Mon Sep 17 00:00:00 2001 > -From: Denys Dmytriyenko <[email protected]> > -Date: Mon, 12 May 2014 21:01:57 -0400 > -Subject: [PATCH] Replace QtGui header with QtWidgets for Qt5 > - > -Signed-off-by: Denys Dmytriyenko <[email protected]> > ---- > - main.cpp | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/main.cpp b/main.cpp > -index c5744d8..5a61904 100644 > ---- a/main.cpp > -+++ b/main.cpp > -@@ -36,7 +36,7 @@ > - * > - */ > - > --#include <QtGui/QApplication> > -+#include <QtWidgets/QApplication> > - #include "mainwindow.h" > - > - int main(int argc, char *argv[]) > --- > -1.9.2 > - > 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 6c2c72e..8c36433 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 > @@ -1,7 +1,7 @@ > DESCRIPTION = "Simple Application to force a screen refresh" > HOMEPAGE = "https://gitorious.org/matrix-gui-v2/refresh-screen"; > LICENSE = "BSD" > -LIC_FILES_CHKSUM = > "file://main.cpp;beginline=9;endline=37;md5=884b90f5bf0d711fe32c4f04b5276496" > +LIC_FILES_CHKSUM = > "file://main.cpp;beginline=9;endline=37;md5=75a9adc782a6df0d3a5419743e9a9f18" > SECTION = "multimedia" > > inherit qt-provider > @@ -9,21 +9,13 @@ inherit qt-provider > # Make sure that QT font libraries have been installed > RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}" > > -PR = "r7" > +PR = "r8" > > -SRCREV = "ad3835b250c8b2b55ae65ffa19c2b85e412826b0" > +SRCREV = "4c8817e28ceed2dd886761e3ec1971b11436ba33" > BRANCH ?= "master" > > SRC_URI = > "git://gitorious.org/matrix-gui-v2/refresh-screen.git;protocol=git;branch=${BRANCH}" > > -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)}" > - > S = "${WORKDIR}/git" > > do_install() { > -- > 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
