From 8eec0155083e62a07265daf15c110b0b33b1a301 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 15 Nov 2012 19:35:58 +0100
Subject: [PATCH] qt5-native: change PV of 5.0.0-beta2 to sort lower then 5.0.0
 when it's released

* also add version specific .inc files and move all version specific
  variables to it
* upgrade 5.0.0-beta1 to 5.0.0-beta2 and add include for latest git

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc       | 15 +++++++++++++++
 recipes-qt/qt5/qt5-4.999+git.inc               | 18 ++++++++++++++++++
 recipes-qt/qt5/qt5-native.inc                  |  7 -------
 recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb |  7 +++++++
 recipes-qt/qt5/qt5-native_4.999+git.bb         |  6 ++++++
 recipes-qt/qt5/qt5-native_5.0.0.bb             |  6 ------
 6 files changed, 46 insertions(+), 13 deletions(-)
 create mode 100644 recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc
 create mode 100644 recipes-qt/qt5/qt5-4.999+git.inc
 create mode 100644 recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb
 create mode 100644 recipes-qt/qt5/qt5-native_4.999+git.bb
 delete mode 100644 recipes-qt/qt5/qt5-native_5.0.0.bb

diff --git a/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc b/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc
new file mode 100644
index 0000000000..36ac896d06
--- /dev/null
+++ b/recipes-qt/qt5/qt5-4.999+5.0.0-beta2.inc
@@ -0,0 +1,15 @@
+# Copyright (C) 2012 O.S. Systems Software LTDA.
+
+QT_VERSION ?= "5.0.0-beta2"
+
+SRC_URI += " \
+  http://releases.qt-project.org/qt5.0/beta2/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \
+"
+
+S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}"
+
+LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \
+                    file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+                    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qt5-4.999+git.inc b/recipes-qt/qt5/qt5-4.999+git.inc
new file mode 100644
index 0000000000..b0fca1de6a
--- /dev/null
+++ b/recipes-qt/qt5/qt5-4.999+git.inc
@@ -0,0 +1,18 @@
+# Copyright (C) 2012 O.S. Systems Software LTDA.
+
+# each module needs to define valid SRCREV
+SRC_URI += " \
+  git://qt.gitorious.org/qt/${QT_MODULE}.git;protocol=git \
+"
+
+S = "${WORKDIR}/git"
+
+PV = "4.999+5.0.0-beta2+gitr${SRCPV}"
+
+DEFAULT_PREFERENCE = "-1"
+
+LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \
+                    file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+                    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc
index 1fe344578a..76e2277dc9 100644
--- a/recipes-qt/qt5/qt5-native.inc
+++ b/recipes-qt/qt5/qt5-native.inc
@@ -4,15 +4,8 @@ SECTION = "libs"
 HOMEPAGE = "http://qt-project.org"
 PROVIDES = "qt5-tools-native"
 
-LICENSE = "LGPLv2.1 | GPLv3"
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=cc5963be04f8b19c3e3c46bc31f0f6e1 \
-                    file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
-
 INC_PR = "r0"
 
-include qt5.inc
-
 inherit native
 
 QT_MODULE = "qtbase"
diff --git a/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb b/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb
new file mode 100644
index 0000000000..5891541417
--- /dev/null
+++ b/recipes-qt/qt5/qt5-native_4.999+5.0.0-beta2.bb
@@ -0,0 +1,7 @@
+require qt5-native.inc
+require qt5-${PV}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "735b6d6c3711f59ee7d5454dc6b8a2f2"
+SRC_URI[sha256sum] = "f62b238220f384d84587d0519fb7fa8961a4d70871d38d6a4bc4e4f013b8606f"
diff --git a/recipes-qt/qt5/qt5-native_4.999+git.bb b/recipes-qt/qt5/qt5-native_4.999+git.bb
new file mode 100644
index 0000000000..b6072fa3a1
--- /dev/null
+++ b/recipes-qt/qt5/qt5-native_4.999+git.bb
@@ -0,0 +1,6 @@
+require qt5-native.inc
+require qt5-4.999+git.inc
+
+PR = "${INC_PR}.0"
+
+SRCREV = "f7d99ad50f11ee7c263d4c2bdbe024355a1ab3e9"
diff --git a/recipes-qt/qt5/qt5-native_5.0.0.bb b/recipes-qt/qt5/qt5-native_5.0.0.bb
deleted file mode 100644
index a3e5e76923..0000000000
--- a/recipes-qt/qt5/qt5-native_5.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require qt5-native.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "2e1e5198a3a139099bfefe75ed29e043"
-SRC_URI[sha256sum] = "d1a6b06fb3d44e83bbd5b7fe5bc1177ff437f992efafe0154cf37b18cfa87109"