From 6b0ba1d855e513c354b8989b60d85f21d98a087a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 10 Dec 2014 07:53:54 +0100
Subject: [PATCH] resructure qt5-native recipes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* put into a single folder
* have shared qt-native-ext.inc
* remove git-versions
* add qtxmlpatterns-native

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../qt-native-ext.inc}                              |  0
 .../qtscript-native_5.3.2.bb                        |  2 +-
 .../{qtsvg => qt-native-ext}/qtsvg-native_5.3.2.bb  |  2 +-
 .../qt-native-ext/qtxmlpatterns-native_5.3.2.bb     | 11 +++++++++++
 extends-meta-qt5/qtscript/qtscript-native_git.bb    |  7 -------
 extends-meta-qt5/qtsvg/qtsvg-native.inc             | 13 -------------
 extends-meta-qt5/qtsvg/qtsvg-native_git.bb          |  7 -------
 .../qtxmlpatterns/qtxmlpatterns-native.inc          |  3 +++
 8 files changed, 16 insertions(+), 29 deletions(-)
 rename extends-meta-qt5/{qtscript/qtscript-native.inc => qt-native-ext/qt-native-ext.inc} (100%)
 rename extends-meta-qt5/{qtscript => qt-native-ext}/qtscript-native_5.3.2.bb (95%)
 rename extends-meta-qt5/{qtsvg => qt-native-ext}/qtsvg-native_5.3.2.bb (95%)
 create mode 100644 extends-meta-qt5/qt-native-ext/qtxmlpatterns-native_5.3.2.bb
 delete mode 100644 extends-meta-qt5/qtscript/qtscript-native_git.bb
 delete mode 100644 extends-meta-qt5/qtsvg/qtsvg-native.inc
 delete mode 100644 extends-meta-qt5/qtsvg/qtsvg-native_git.bb
 create mode 100644 extends-meta-qt5/qtxmlpatterns/qtxmlpatterns-native.inc

diff --git a/extends-meta-qt5/qtscript/qtscript-native.inc b/extends-meta-qt5/qt-native-ext/qt-native-ext.inc
similarity index 100%
rename from extends-meta-qt5/qtscript/qtscript-native.inc
rename to extends-meta-qt5/qt-native-ext/qt-native-ext.inc
diff --git a/extends-meta-qt5/qtscript/qtscript-native_5.3.2.bb b/extends-meta-qt5/qt-native-ext/qtscript-native_5.3.2.bb
similarity index 95%
rename from extends-meta-qt5/qtscript/qtscript-native_5.3.2.bb
rename to extends-meta-qt5/qt-native-ext/qtscript-native_5.3.2.bb
index d3ce0d89..81066363 100644
--- a/extends-meta-qt5/qtscript/qtscript-native_5.3.2.bb
+++ b/extends-meta-qt5/qt-native-ext/qtscript-native_5.3.2.bb
@@ -1,5 +1,5 @@
 require recipes-qt/qt5/qt5-${PV}.inc
-require ${PN}.inc
+require qt-native-ext.inc
 
 SRC_URI[md5sum] = "d0e70adf7c993f33bad27290dae778d5"
 SRC_URI[sha256sum] = "6e18002c8c993402c7d28b3c0705092e41c18769b6d3ff741e9a3b3ce9d6d7be"
diff --git a/extends-meta-qt5/qtsvg/qtsvg-native_5.3.2.bb b/extends-meta-qt5/qt-native-ext/qtsvg-native_5.3.2.bb
similarity index 95%
rename from extends-meta-qt5/qtsvg/qtsvg-native_5.3.2.bb
rename to extends-meta-qt5/qt-native-ext/qtsvg-native_5.3.2.bb
index 035a4c9d..9b7dbab1 100644
--- a/extends-meta-qt5/qtsvg/qtsvg-native_5.3.2.bb
+++ b/extends-meta-qt5/qt-native-ext/qtsvg-native_5.3.2.bb
@@ -1,5 +1,5 @@
 require recipes-qt/qt5/qt5-${PV}.inc
-require ${PN}.inc
+require qt-native-ext.inc
 
 SRC_URI[md5sum] = "f7972e80970ff26a908c43defb3d10e6"
 SRC_URI[sha256sum] = "1ec5c2f307ee55740cc8c82dc2ca4037dbc0ca398b4e32abbd967535e71ae30f"
diff --git a/extends-meta-qt5/qt-native-ext/qtxmlpatterns-native_5.3.2.bb b/extends-meta-qt5/qt-native-ext/qtxmlpatterns-native_5.3.2.bb
new file mode 100644
index 00000000..2accc7df
--- /dev/null
+++ b/extends-meta-qt5/qt-native-ext/qtxmlpatterns-native_5.3.2.bb
@@ -0,0 +1,11 @@
+require recipes-qt/qt5/qt5-${PV}.inc
+require qt-native-ext.inc
+
+SRC_URI[md5sum] = "857e8040b2bf45c114a7d75ec6ef94ee"
+SRC_URI[sha256sum] = "acab0307039e117475caf2c95e425ead09ab5ee08ce15205fb3c0af7d7ec1abb"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+                    file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+                    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/extends-meta-qt5/qtscript/qtscript-native_git.bb b/extends-meta-qt5/qtscript/qtscript-native_git.bb
deleted file mode 100644
index f01bf0b1..00000000
--- a/extends-meta-qt5/qtscript/qtscript-native_git.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require recipes-qt/qt5/qt5-git.inc
-require ${PN}.inc
-
-SRCREV = "9871b41531d632105f1d11e3a9683b05061177c1"
-
-LICENSE += "| GPL-2.0"
-LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
diff --git a/extends-meta-qt5/qtsvg/qtsvg-native.inc b/extends-meta-qt5/qtsvg/qtsvg-native.inc
deleted file mode 100644
index a2c9e31c..00000000
--- a/extends-meta-qt5/qtsvg/qtsvg-native.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DEPENDS = "qtbase-native"
-
-QT_MODULE = "${BPN}"
-
-require recipes-qt/qt5/qt5-native.inc
-
-do_configure() {
-    ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}
-}
-
-do_install() {
-    oe_runmake install INSTALL_ROOT=${D}
-}
diff --git a/extends-meta-qt5/qtsvg/qtsvg-native_git.bb b/extends-meta-qt5/qtsvg/qtsvg-native_git.bb
deleted file mode 100644
index be6d84e6..00000000
--- a/extends-meta-qt5/qtsvg/qtsvg-native_git.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require recipes-qt/qt5/qt5-git.inc
-require ${PN}.inc
-
-SRCREV = "9f1c31c8a3cfd0f341987e8011abad172592dd3c"
-
-LICENSE += "| GPL-2.0"
-LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
diff --git a/extends-meta-qt5/qtxmlpatterns/qtxmlpatterns-native.inc b/extends-meta-qt5/qtxmlpatterns/qtxmlpatterns-native.inc
new file mode 100644
index 00000000..bbb05a65
--- /dev/null
+++ b/extends-meta-qt5/qtxmlpatterns/qtxmlpatterns-native.inc
@@ -0,0 +1,3 @@
+require qt5.inc
+
+DEPENDS += "qtbase"