* [PATCH] matrix-gui-browser: Update SRCREV to fix compilation warnings.
@ 2015-04-10 18:20 Jacob Stiffler
2015-04-10 18:34 ` Denys Dmytriyenko
0 siblings, 1 reply; 3+ messages in thread
From: Jacob Stiffler @ 2015-04-10 18:20 UTC (permalink / raw)
To: meta-arago
* Changes also includes removal of DOS line endings in sources.
* 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] matrix-gui-browser: Update SRCREV to fix compilation warnings.
2015-04-10 18:20 [PATCH] matrix-gui-browser: Update SRCREV to fix compilation warnings Jacob Stiffler
@ 2015-04-10 18:34 ` Denys Dmytriyenko
2015-04-10 18:37 ` Stiffler, Jacob
0 siblings, 1 reply; 3+ messages in thread
From: Denys Dmytriyenko @ 2015-04-10 18:34 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-arago
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] matrix-gui-browser: Update SRCREV to fix compilation warnings.
2015-04-10 18:34 ` Denys Dmytriyenko
@ 2015-04-10 18:37 ` Stiffler, Jacob
0 siblings, 0 replies; 3+ messages in thread
From: Stiffler, Jacob @ 2015-04-10 18:37 UTC (permalink / raw)
To: Dmytriyenko, Denys; +Cc: meta-arago
I did not try to simply "dos2unix", but I manually recreated the patch.
-----Original Message-----
From: Dmytriyenko, Denys
Sent: Friday, April 10, 2015 2:34 PM
To: Stiffler, Jacob
Cc: meta-arago@arago-project.org
Subject: Re: [meta-arago] [PATCH] matrix-gui-browser: Update SRCREV to fix compilation warnings.
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-04-10 18:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-10 18:20 [PATCH] matrix-gui-browser: Update SRCREV to fix compilation warnings Jacob Stiffler
2015-04-10 18:34 ` Denys Dmytriyenko
2015-04-10 18:37 ` Stiffler, Jacob
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.