From: Denys Dmytriyenko <denys@ti.com>
To: Jacob Stiffler <j-stiffler@ti.com>
Cc: meta-arago@arago-project.org
Subject: Re: [PATCH] matrix-gui-browser: Update SRCREV to fix compilation warnings.
Date: Fri, 10 Apr 2015 14:34:15 -0400 [thread overview]
Message-ID: <20150410183415.GB9147@edge> (raw)
In-Reply-To: <1428690056-22471-1-git-send-email-j-stiffler@ti.com>
On Fri, Apr 10, 2015 at 02:20:56PM -0400, Jacob Stiffler wrote:
> * Changes also includes removal of DOS line endings in sources.
Finally! \o/ :)
But, there's a small problem now - DOS newlines do not survive patching
process, so the below patch won't apply... I'll need to do it manually in git.
Is it just dos2unix qt5-gui-widgets-move.patch?
> * Thus update source file patch and license checksum.
>
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> ---
> .../matrix-gui-browser/qt5-gui-widgets-move.patch | 23 ++++++++++----------
> .../recipes-core/matrix/matrix-gui-browser_2.0.bb | 6 ++---
> 2 files changed, 15 insertions(+), 14 deletions(-)
>
> 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
> index e725004..20a98d9 100644
> --- 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
> @@ -1,12 +1,13 @@
> -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
> +diff --git a/main.cpp b/main.cpp
> +index fe27aab..51f9550 100644
> +--- a/main.cpp
> ++++ b/main.cpp
> @@ -36,7 +36,7 @@
> - *
> - */
> -
> --#include <QtGui>
> -+#include <QtWidgets>
> - #include <QWebView>
> - #include <QGraphicsWebView>
> - #include <iostream>
> + *
> + */
> +
> +-#include <QtGui>
> ++#include <QtWidgets>
> + #include <QWebView>
> + #include <QGraphicsWebView>
> + #include <iostream>
> 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 775b7ce..33387ea 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
> @@ -1,7 +1,7 @@
> DESCRIPTION = "Simple Qt web display using webkit"
> HOMEPAGE = "https://gitorious.org/matrix-gui-v2/matrix_browser"
> 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
> @@ -11,9 +11,9 @@ RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}"
>
> DEPENDS += "${QT_DEPENDS_WEBKIT}"
>
> -PR = "r9"
> +PR = "r10"
>
> -SRCREV = "7f5dccfb5b1b68a3f9162f6ee072eef0e0ba06fe"
> +SRCREV = "f68ab545a60ca446635f9db00d64569cef9c9091"
> BRANCH ?= "master"
>
> SRC_URI = "git://gitorious.org/matrix-gui-v2/matrix_browser.git;protocol=http;branch=${BRANCH}"
> --
> 1.7.9.5
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
next prev parent reply other threads:[~2015-04-10 18:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-10 18:20 [PATCH] matrix-gui-browser: Update SRCREV to fix compilation warnings Jacob Stiffler
2015-04-10 18:34 ` Denys Dmytriyenko [this message]
2015-04-10 18:37 ` Stiffler, Jacob
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=20150410183415.GB9147@edge \
--to=denys@ti.com \
--cc=j-stiffler@ti.com \
--cc=meta-arago@arago-project.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.