Fix for Qt5 | Changed GIT branch to tag | Added prepare() | commented function to copy private headers - no longer needed i hope

1 files changed, 16 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 8162af8c5993..62f554c68622 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,41 +10,44 @@
 _pkgname=qt5-wayland
 pkgname=$_pkgname-git
 pkgver=a # If you want to update periodically - use changeling script (AUR) from aur with cron
-pkgrel=2
+pkgrel=3
 pkgdesc="A cross-platform application and UI framework (QtWayland)"
 arch=("i686" "x86_64")
-url="http://code.qt.io/cgit/qt/qtwayland.git/" # TODO: change this adderess to gitorious?
+url="http://code.qt.io/cgit/qt/qtwayland.git/"
 license=("GPL3" "LGPL")
-depends=("qt5-declarative" "libxcomposite")
+depends=("qt5-declarative" "libxcomposite" "wayland")
 makedepends=("git")
 provides=("$_pkgname")
 conflicts=("$_pkgname")
+sha256sums=("SKIP")
 
 # 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
-  source=("$_pkgname::git://code.qt.io/qt/qtwayland.git#branch=${_qt5_userversion}")
+  # If you are using repo's qt5, change to the latest minor version
+  source=("$_pkgname::git://code.qt.io/qt/qtwayland.git#tag=v${_qt5_userversion}")
 else
-  # If you are using anything else eg. qt5-base-git
-  source=("$_pkgname::git://code.qt.io/qt/qtwayland.git#branch=dev")
+  # If you are using anything else eg. qt5-base-git, clone the master repo
+  source=("$_pkgname::git://code.qt.io/qt/qtwayland.git")
 fi
-sha256sums=("SKIP")
-
 
 pkgver() {
   cd "$srcdir/$_pkgname"
   echo "${_qt5_userversion}.$(git rev-parse --short HEAD)"
 }
 
-build() {
+prepare() {
   cd "$srcdir/$_pkgname"
   # Replace Qt version to user version (Qt)
   sed -i "3s/.*/MODULE_VERSION = ${_qt5_userversion}/" ./.qmake.conf
   if [ -d ./build ]; then
     rm -rf --one-file-system ./build
   fi
+}
+
+build() {
+  cd "$srcdir/$_pkgname"
   mkdir build
   cd build
   export QT_SELECT=5
@@ -56,7 +59,7 @@ package() {
   cd "${srcdir}/${_pkgname}"
   cd build
   make INSTALL_ROOT="${pkgdir}" install
-
-  # Install generated private headers
-  cp ./include/QtCompositor/${_qt5_userversion}/QtCompositor/private/{qwayland-server-*,*protocol*}.h ${pkgdir}/usr/include/qt/QtCompositor/${_qt5_userversion}/QtCompositor/private/
+  
+  # Install generated private headers (that's its not longer needed)
+  # cp ./include/QtCompositor/${_qt5_userversion}/QtCompositor/private/{qwayland-server-*,*protocol*}.h ${pkgdir}/usr/include/qt/QtCompositor/${_qt5_userversion}/QtCompositor/private/
 }