From 1526e7ae7b9a569bf3d5c4656874cc67e367b23e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 5 Jun 2015 09:45:29 +0200
Subject: [PATCH] extends-meta-qt5: follow meta-qt5 to 5.4.2 (git)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...ve_5.4.1.bbappend => qtbase-native_git.bbappend} |  0
 .../{qtbase_5.4.1.bbappend => qtbase_git.bbappend}  |  0
 ...{qttools_5.4.1.bbappend => qttools_git.bbappend} |  0
 ...ayland_5.4.1.bbappend => qtwayland_git.bbappend} |  0
 extends-meta-qt5/qtxmlpatterns-native_5.4.1.bb      | 12 ------------
 extends-meta-qt5/qtxmlpatterns-native_git.bb        | 13 +++++++++++++
 6 files changed, 13 insertions(+), 12 deletions(-)
 rename extends-meta-qt5/{qtbase-native_5.4.1.bbappend => qtbase-native_git.bbappend} (100%)
 rename extends-meta-qt5/{qtbase_5.4.1.bbappend => qtbase_git.bbappend} (100%)
 rename extends-meta-qt5/{qttools_5.4.1.bbappend => qttools_git.bbappend} (100%)
 rename extends-meta-qt5/{qtwayland_5.4.1.bbappend => qtwayland_git.bbappend} (100%)
 delete mode 100644 extends-meta-qt5/qtxmlpatterns-native_5.4.1.bb
 create mode 100644 extends-meta-qt5/qtxmlpatterns-native_git.bb

diff --git a/extends-meta-qt5/qtbase-native_5.4.1.bbappend b/extends-meta-qt5/qtbase-native_git.bbappend
similarity index 100%
rename from extends-meta-qt5/qtbase-native_5.4.1.bbappend
rename to extends-meta-qt5/qtbase-native_git.bbappend
diff --git a/extends-meta-qt5/qtbase_5.4.1.bbappend b/extends-meta-qt5/qtbase_git.bbappend
similarity index 100%
rename from extends-meta-qt5/qtbase_5.4.1.bbappend
rename to extends-meta-qt5/qtbase_git.bbappend
diff --git a/extends-meta-qt5/qttools_5.4.1.bbappend b/extends-meta-qt5/qttools_git.bbappend
similarity index 100%
rename from extends-meta-qt5/qttools_5.4.1.bbappend
rename to extends-meta-qt5/qttools_git.bbappend
diff --git a/extends-meta-qt5/qtwayland_5.4.1.bbappend b/extends-meta-qt5/qtwayland_git.bbappend
similarity index 100%
rename from extends-meta-qt5/qtwayland_5.4.1.bbappend
rename to extends-meta-qt5/qtwayland_git.bbappend
diff --git a/extends-meta-qt5/qtxmlpatterns-native_5.4.1.bb b/extends-meta-qt5/qtxmlpatterns-native_5.4.1.bb
deleted file mode 100644
index c7f1f823..00000000
--- a/extends-meta-qt5/qtxmlpatterns-native_5.4.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require recipes-qt/qt5/qt5-${PV}.inc
-require qt-native-ext.inc
-
-# required for ktexteditor-native
-SRC_URI[md5sum] = "ec2970e9e9c38f88be74f18101937c28"
-SRC_URI[sha256sum] = "f5142ff4d3f1154550530eddf310d2ff149c6f0055d3d028ad48cb5491c65318"
-
-# License files in this module still contain 2014 as year
-LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
-                    file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
-                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
-                    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/extends-meta-qt5/qtxmlpatterns-native_git.bb b/extends-meta-qt5/qtxmlpatterns-native_git.bb
new file mode 100644
index 00000000..f54c1a6b
--- /dev/null
+++ b/extends-meta-qt5/qtxmlpatterns-native_git.bb
@@ -0,0 +1,13 @@
+require recipes-qt/qt5/qt5-git.inc
+require qt-native-ext.inc
+
+# There are no LGPLv3-only licensed files in this component.
+LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
+    file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
+    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+"
+
+SRCREV = "c21924d67a8ef39282afdf3ae6fef798dfca7135"