Upgrade Qt libs to 5.9.3 / add test case to check if we're in sync with Alpine (#976)

* Upgrade Qt libs to 5.9.3
* Add test case to make sure we are always in sync with Alpine's QT
and update qt5-qtsensors, too.
* Remove qt5-qtquickcontrols2 (it's in Alpine now)

aports/luna/qt5-qtsensors/APKBUILD

@@ -1,5 +1,5 @@
 pkgname=qt5-qtsensors
-pkgver=5.9.1
+pkgver=5.9.3
 pkgrel=0
 arch="all"
 url='http://qt-project.org/'
@@ -29,4 +29,4 @@ package() {
 	install -d "$pkgdir"/usr/share/licenses
 	ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
 }
-sha512sums="a6f0e10aad5f0242dfad470c0aa334dcff817587a3f24c6930de8197281eb72b94f96d74aea5fc5446a262fbfc41cad68ea1b6f21df5fade5da278f8493732a5  qtsensors-opensource-src-5.9.1.tar.xz"
+sha512sums="848184de2c914c0240f3ecffe96ab267fb24693d16a55c1c757d83af9f282bc6f6c5cd762cb42fc389bc02e301c21a6da7b178260f534db35f0abe277f638ea9  qtsensors-opensource-src-5.9.3.tar.xz"

aports/main/qt5-qtquickcontrols2/APKBUILD

@@ -1,30 +0,0 @@
-# Contributor: Bart Ribbers <bribbers@disroot.org>
-# Maintainer: Bart Ribbers <bribbers@disroot.org>
-pkgname=qt5-qtquickcontrols2
-pkgver=5.9.2
-pkgrel=0
-arch="all"
-url='http://qt-project.org/'
-license="GPL-3.0 GPL-2.0 LGPL-3.0"
-pkgdesc='Next generation user interface controls based on Qt Quick'
-depends=""
-depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev"
-makedepends="$depends_dev"
-source="http://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/qtquickcontrols2-opensource-src-$pkgver.tar.xz"
-subpackages="$pkgname-dev $pkgname-doc"
-builddir="$srcdir/qtquickcontrols2-opensource-src-$pkgver"
-options="!check"
-
-build() {
-	qmake-qt5
-	make
-}
-
-package() {
-	cd "$builddir"
-	make INSTALL_ROOT="$pkgdir" install
-
-	install -d "$pkgdir"/usr/share/licenses
-	ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname
-}
-sha512sums="e283320aabbaa153067c909804cb34bbcbf6fcb7246bb214957b6092ceb0f01c4fae2efd9d7a6cb011274deafff4aaf0a45dbda06a3fdce1154622e48740048c  qtquickcontrols2-opensource-src-5.9.2.tar.xz"

aports/main/qt5-qtvirtualkeyboard/APKBUILD

@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtvirtualkeyboard
-pkgver=5.9.2
+pkgver=5.9.3
 pkgrel=0
 arch="all"
 url='http://qt-project.org/'
@@ -32,5 +32,5 @@ package() {
 	install -d "$pkgdir"/usr/share/licenses
 	ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname
 }
-sha512sums="f8c39b789e877e60389ee9aab4a5c17e6018093f72fc57f526ce2584183135206306d4d5a7c7551a6de45969aa6f55444bb39f4ea3324cdf10611533f0bc2b22  qtvirtualkeyboard-opensource-src-5.9.2.tar.xz
+sha512sums="feac25b2f88e182e58431a92e27436149072e2dd2eb09abbb69b732a6c3e484c4259759a99f730856993c6d50260bf5ef234f29f6f7e2a4fddbe77d15838b5c8  qtvirtualkeyboard-opensource-src-5.9.3.tar.xz
 e801336b9aaf0facdcf7347fa8cf7223362312c92ea5725c5260d777045cc9da9a6de514dc4c17904aab77ae799bdd154c4615b8f2a39d92ce55ca10ad218efb  0001-include-sys-time.h-for-timeval.patch"

aports/main/qt5-qtwayland/APKBUILD

@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtwayland
-pkgver=5.9.2
+pkgver=5.9.3
 pkgrel=1
 arch="all"
 url='http://qt-project.org/'
@@ -32,5 +32,5 @@ package() {
 	install -d "$pkgdir"/usr/share/licenses
 	ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname
 }
-sha512sums="28b6f77be5289cb9eba0e3e6b220d2c99d2ab4dbae8e02caecd7651b5ae33c09f117545664b01649ca52b27025cc15853806ece8dc10713c3d90832416c7def6  qtwayland-opensource-src-5.9.2.tar.xz
+sha512sums="1deb41d3a2e081fa434167211b975019840c56cbf04c8fc18325d405818c2ecee6d65c9376f498ddacc1587455d310b815d56124d6a7734b2857399abfb3b659  qtwayland-opensource-src-5.9.3.tar.xz
 2e081b0bd66d4f3865a96a53df45fcd04f61a2a951be89ed46405b35a334b4900be1cd834b583c6dca4bfb75ed816aaab8a2d536962922505c30e48fdc3b394d  0003-QtKeyExtensionGlobal-fix-export.patch"

test/test_upstream_compatibility.py

@@ -0,0 +1,64 @@
+"""
+Copyright 2017 Oliver Smith
+
+This file is part of pmbootstrap.
+
+pmbootstrap is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+pmbootstrap is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with pmbootstrap.  If not, see <http://www.gnu.org/licenses/>.
+"""
+import os
+import sys
+import glob
+import pytest
+
+# Import from parent directory
+pmb_src = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
+sys.path.append(pmb_src)
+import pmb.parse.apkindex
+import pmb.parse.apkbuild
+import pmb.helpers.logging
+
+
+@pytest.fixture
+def args(request):
+    import pmb.parse
+    sys.argv = ["pmbootstrap.py", "chroot"]
+    args = pmb.parse.arguments()
+    args.log = args.work + "/log_testsuite.txt"
+    pmb.helpers.logging.init(args)
+    request.addfinalizer(args.logfd.close)
+    return args
+
+
+def test_qt_versions(args):
+    """
+    Verify, that all postmarketOS qt5- package versions match with Alpine's
+    qt5-qtbase version.
+    """
+    # Upstream version
+    pmb.helpers.repo.update(args)
+    index_data = pmb.parse.apkindex.read_any_index(args, "qt5-qtbase", "x86_64")
+    pkgver_upstream = index_data["version"].split("-r")[0]
+
+    # Check our packages
+    failed = []
+    for path in glob.glob(args.aports + "/*/qt5-*/APKBUILD"):
+        apkbuild = pmb.parse.apkbuild(args, path)
+        pkgname = apkbuild["pkgname"]
+        pkgver = apkbuild["pkgver"]
+        if pkgver == pkgver_upstream:
+            continue
+        failed.append(pkgname + ": " + pkgver + " != " +
+                      pkgver_upstream)
+
+    assert [] == failed