upgpkg: qt5-quickcontrols-git 5.12.1.r17.g352aeb96-1

2 files changed, 49 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c369182c7599..2ac227a5851c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
 pkgbase = qt5-quickcontrols-git
-	pkgdesc = A cross-platform application and UI framework (QtQuick)
-	pkgver = v5.5.0.11.g56dfb59
+	pkgdesc = Qt5 Quick Controls module
+	pkgver = 5.12.1.r17.g352aeb96
 	pkgrel = 1
-	url = https://qt-project.org/
+	url = https://www.qt.io/
 	arch = i686
 	arch = x86_64
-	license = GPL3
+	license = FDL
+	license = GPL
 	license = LGPL
+	license = custom
 	makedepends = git
-	depends = qt5-declarative-git
+	depends = qt5-declarative
 	provides = qt5-quickcontrols
 	conflicts = qt5-quickcontrols
-	source = qt5-quickcontrols::git://code.qt.io/qt/qtquickcontrols.git#branch=5.5
+	source = git+https://code.qt.io/qt/qtquickcontrols.git#branch=dev
 	sha256sums = SKIP
 
 pkgname = qt5-quickcontrols-git
diff --git a/PKGBUILD b/PKGBUILD
index 701d1f05c944..b69f1b52ad4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,55 @@
-# Maintainer: Riley Trautman <asonix.dev@gmail.com>
+# Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
+# Previous maintainer: Riley Trautman <asonix.dev@gmail.com>
 # Contributor: Jerome Leclanche <jerome@leclan.ch>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
 
-_pkgname=qt5-quickcontrols
-pkgname=$_pkgname-git
-pkgver=git
+pkgname=qt5-quickcontrols-git
+pkgver=5.12.1.r17.g352aeb96
 pkgrel=1
-pkgdesc="A cross-platform application and UI framework (QtQuick)"
-arch=("i686" "x86_64")
-url="https://qt-project.org/"
-license=("GPL3" "LGPL")
-depends=("qt5-declarative-git")
-makedepends=("git")
-provides=("$_pkgname")
-conflicts=("$_pkgname")
-source=("$_pkgname::git://code.qt.io/qt/qtquickcontrols.git#branch=dev")
-sha256sums=("SKIP")
+pkgdesc="Qt5 Quick Controls module"
+arch=('i686' 'x86_64')
+url="https://www.qt.io/"
+license=('FDL' 'GPL' 'LGPL' 'custom')
+depends=('qt5-declarative')
+makedepends=('git')
+provides=('qt5-quickcontrols')
+conflicts=('qt5-quickcontrols')
+source=("git+https://code.qt.io/qt/qtquickcontrols.git#branch=dev")
+sha256sums=('SKIP')
+
+
+prepare() {
+  cd "$srcdir"
+
+  mkdir -p "_build"
+}
 
 pkgver() {
-	cd "$srcdir/$_pkgname"
-	git describe --always | sed "s/-/./g"
+  cd "qtquickcontrols"
+
+  _tag=$(git tag -l --sort -v:refname | sed -n '1,1{s/v//p}')
+  _rev=$(git rev-list --count v$_tag..HEAD)
+  _hash=$(git rev-parse --short HEAD)
+  printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash"
 }
 
 build() {
-	cd "$srcdir/$_pkgname"
-	mkdir -p build
-	cd build
-	qmake ..
-	make
+  cd "_build"
+
+  qmake ../qtquickcontrols
+  make
 }
 
 package() {
-	cd "$srcdir/$_pkgname"
-	cd build
-	make INSTALL_ROOT="$pkgdir" install
+  cd "_build"
+
+  make INSTALL_ROOT="$pkgdir" install
+
+  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+  find "$pkgdir/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+  cd "$srcdir/qtquickcontrols"
+  install -Dm644 "LICENSE.GPL3-EXCEPT" "$pkgdir/usr/share/licenses/qt5-quickcontrols/LICENSE.GPL3-EXCEPT"
 }