Import from pkgbuild.com service

1 files changed, 9 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d2b47cd7b080..7733bcd363cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,31 +10,32 @@
 _pkgname=qt5-wayland
 pkgname=$_pkgname-git
 pkgver=a # If you want to update periodically - use changeling script from aur with cron
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform application and UI framework (QtWayland)"
 arch=("i686" "x86_64")
-url="https://qt-project.org/" # TODO: change this adderess to gitorious?
+url="https://qt.gitorious.org/qt/qtwayland" # TODO: change this adderess to gitorious?
 license=("GPL3" "LGPL")
 depends=("qt5-declarative" "libxcomposite")
 makedepends=("git")
 provides=("$_pkgname")
 conflicts=("$_pkgname")
+
+# Definition with userside version of Qt5
+_qt5_userversion=`pkg-config --modversion Qt5Core`
+
 if [ -e /var/lib/pacman/local/qt5-base-5* ]; then
 # If you are using repo's qt5, change to the latest minor version
-#TODO: automate version, perhaps _qt5_userversion?
-  source=("$_pkgname::git://gitorious.org/qt/qtwayland.git#branch=5.4.1")
+  source=("$_pkgname::git://gitorious.org/qt/qtwayland.git#branch=${_qt5_userversion}")
 else
   # If you are using anything else eg. qt5-base-git
   source=("$_pkgname::git://gitorious.org/qt/qtwayland.git#branch=dev")
 fi
 sha256sums=("SKIP")
 
-# Definition with userside version of Qt5
-_qt5_userversion=`pkg-config --modversion Qt5Core`
 
 pkgver() {
   cd "$srcdir/$_pkgname"
-  git describe --always | sed "s/-/./g"
+  echo "${_qt5_userversion}.$(git rev-parse --short HEAD)"
 }
 
 build() {
@@ -48,6 +49,7 @@ build() {
   cd build
   export QT_SELECT=5
   qmake CONFIG+=wayland-compositor ..
+  make
 }
 
 package() {