upgpkg: qt5-virtualkeyboard-git 5.12.1.r20.g8a9f0cd-1

2 files changed, 40 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 40f944e57000..9fb7b5802849 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
-# Generated by mksrcinfo v8
-# Sun May 15 09:29:08 UTC 2016
 pkgbase = qt5-virtualkeyboard-git
-	pkgdesc = Virtual keyboard for Qt
-	pkgver = 5.8.0.r359.9bb0f7c
+	pkgdesc = Qt5 virtual keyboard module
+	pkgver = 5.12.1.r20.g8a9f0cd
 	pkgrel = 1
-	url = https://code.qt.io/cgit/qt/qtvirtualkeyboard.git
+	url = https://www.qt.io/
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = git
 	depends = qt5-declarative
+	depends = qt5-svg
+	depends = hunspell
 	provides = qt5-virtualkeyboard
 	conflicts = qt5-virtualkeyboard
-	source = qt5-virtualkeyboard::git+https://code.qt.io/qt/qtvirtualkeyboard.git#branch=dev
-	md5sums = SKIP
+	source = git+https://code.qt.io/qt/qtvirtualkeyboard.git#branch=dev
+	sha256sums = SKIP
 
 pkgname = qt5-virtualkeyboard-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 03b25b0a405a..3450ac35099e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,49 @@
-# Maintainer: Jonathan Liu <net147@gmail.com>
-_pkgname=qt5-virtualkeyboard
-pkgname=$_pkgname-git
-pkgver=5.8.0.r359.9bb0f7c
+# Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
+# Previous maintainer: Jonathan Liu <net147@gmail.com>
+
+pkgname=qt5-virtualkeyboard-git
+pkgver=5.12.1.r20.g8a9f0cd
 pkgrel=1
-pkgdesc="Virtual keyboard for Qt"
+pkgdesc="Qt5 virtual keyboard module"
 arch=('i686' 'x86_64')
-url="https://code.qt.io/cgit/qt/qtvirtualkeyboard.git"
+url="https://www.qt.io/"
 license=('GPL3')
-depends=('qt5-declarative')
+depends=('qt5-declarative' 'qt5-svg' 'hunspell')
 makedepends=('git')
-provides=("$_pkgname")
-conflicts=("$_pkgname")
-source=("$_pkgname::git+https://code.qt.io/qt/qtvirtualkeyboard.git#branch=dev")
-md5sums=('SKIP')
+provides=('qt5-virtualkeyboard')
+conflicts=('qt5-virtualkeyboard')
+source=("git+https://code.qt.io/qt/qtvirtualkeyboard.git#branch=dev")
+sha256sums=('SKIP')
 
-pkgver() {
-  cd "$_pkgname"
-  module_version="$(sed -n 's/^MODULE_VERSION\s*=\s*\(.*\)/\1/p' .qmake.conf)"
-  printf "$module_version.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
 
 prepare() {
-  find . -name '*.cpp' -exec sed -i 's/for (\(.*\) : qAsConst(\([^)]*\)))/foreach (\1, \2)/' {} +
-  mkdir -p build
+  cd "$srcdir"
+
+  mkdir -p "_build"
+}
+
+pkgver() {
+  cd "qtvirtualkeyboard"
+
+  _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 build
-  qmake "../$_pkgname"
+  cd "_build"
+
+  qmake ../qtvirtualkeyboard
   make
 }
 
 package() {
-  cd build
+  cd "_build"
+
   make INSTALL_ROOT="$pkgdir" install
-}
 
-# vim:set ts=2 sw=2 et:
+  # 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' {} \;
+}