All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] image-gallery: Update SRCREV to fix compilation warning.
@ 2015-04-10 18:24 Jacob Stiffler
  0 siblings, 0 replies; only message in thread
From: Jacob Stiffler @ 2015-04-10 18:24 UTC (permalink / raw)
  To: meta-arago

* Along with this update, the patch is no longer required.

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 ...uild-with-Qt5-use-qmake-available-in-PATH.patch |   31 --------------------
 .../recipes-qt/qt-apps/image-gallery_git.bb        |   10 ++-----
 2 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-qt/qt-apps/image-gallery/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch

diff --git a/meta-arago-extras/recipes-qt/qt-apps/image-gallery/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch b/meta-arago-extras/recipes-qt/qt-apps/image-gallery/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch
deleted file mode 100644
index 0963797..0000000
--- a/meta-arago-extras/recipes-qt/qt-apps/image-gallery/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6b6a4b55c7ec53384fbbb8a9b0ba95350e7118b7 Mon Sep 17 00:00:00 2001
-From: Jacob Stiffler <j-stiffler@ti.com>
-Date: Wed, 4 Mar 2015 11:59:53 -0500
-Subject: [PATCH] Makefile.build: with Qt5 use qmake available in PATH
-
-Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
----
- Makefile.build |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.build b/Makefile.build
-index fc3f14c..0afe5c0 100644
---- a/Makefile.build
-+++ b/Makefile.build
-@@ -9,11 +9,11 @@ all: release
- .PHONY: qmake
- qmake : image-gallery.pro
- 	@. ${ENV_SETUP}; \
--	qmake2 CONFIG+=release image-gallery.pro
-+	qmake CONFIG+=release image-gallery.pro
- 
- qmake_debug : image-gallery.pro
- 	@. ${ENV_SETUP}; \
--	qmake2 CONFIG+=debug image-gallery.pro
-+	qmake CONFIG+=debug image-gallery.pro
- 
- debug : qmake_debug
- 	@. ${ENV_SETUP}; \
--- 
-1.7.9.5
-
diff --git a/meta-arago-extras/recipes-qt/qt-apps/image-gallery_git.bb b/meta-arago-extras/recipes-qt/qt-apps/image-gallery_git.bb
index f6c615e..ec8f56e 100644
--- a/meta-arago-extras/recipes-qt/qt-apps/image-gallery_git.bb
+++ b/meta-arago-extras/recipes-qt/qt-apps/image-gallery_git.bb
@@ -8,19 +8,13 @@ require recipes-core/matrix/matrix-gui-paths.inc
 
 inherit qt-provider
 
-PR = "r3"
+PR = "r4"
 
 BRANCH = "master"
-SRCREV = "1f89d5e6c160e87e73a9c06933e50c3981bbf41d"
+SRCREV = "47a13167061e6e8bb44842104bd8bfbc230cf476"
 
 SRC_URI = "git://gitorious.org/image-gallery/image-gallery.git;protocol=http;branch=${BRANCH}"
 
-QT5_DIFF = " \
-    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



^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2015-04-10 18:24 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-10 18:24 [PATCH] image-gallery: Update SRCREV to fix compilation warning Jacob Stiffler

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.