pkgbuild: fix package

2 files changed, 15 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 21ab7401d289..e742eef31ada 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = qt5-quick1
 	pkgdesc = Qt Declarative is provided for Qt 4 compatibility
-	pkgver = 5.8.0.fa02271a
+	pkgver = 5.7
 	pkgrel = 1
 	url = http://qt-project.org/
 	arch = i686
@@ -10,7 +10,7 @@ pkgbase = qt5-quick1
 	makedepends = git
 	depends = qt5-webkit
 	depends = qt5-script
-	source = git+https://github.com/qt/qtquick1
+	source = git+https://github.com/qt/qtquick1.git#tag=5.7
 	sha1sums = SKIP
 
 pkgname = qt5-quick1
diff --git a/PKGBUILD b/PKGBUILD
index 6ddc69f87fbb..f0932c0c95c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,14 @@
-# Maintainer: FFY00 <filipe.lains@gmail.com>
-
+# Maintainer: Filipe Laíns (FFY00) <filipe.lains@gmail.com>
 pkgname=qt5-quick1
-pkgver=5.8.0.fa02271a
+pkgver=5.7
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 pkgdesc='Qt Declarative is provided for Qt 4 compatibility'
 license=('LGPL2.1' 'GPL3')
-#options=("debug")
 depends=('qt5-webkit' 'qt5-script')
 makedepends=('git')
-source=("git+https://github.com/qt/qtquick1")
+source=("git+https://github.com/qt/qtquick1.git#tag=$pkgver")
 sha1sums=('SKIP')
 
 _prlfix() {
@@ -19,25 +17,19 @@ _prlfix() {
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
 }
 
-pkgver() {
-  cd "${srcdir}/qtquick1"
-  printf "%s.%s" "$(cat .qmake.conf | grep 'MODULE_VERSION = ' | sed 's/MODULE_VERSION = //')" "$(git rev-parse --short HEAD)"
-}
-
 prepare() {
   cd qtquick1
 
   git checkout dev
 
   if [ ! -d include ]; then
-    syncqt.pl-qt5 -version ${pkgver} sync.profile
+    syncqt.pl-qt5 -version $pkgver sync.profile
   fi
 }
 
 build() {
-  cd qtquick1
-  mkdir -p build
-  cd build
+  mkdir -p qtquick1/build
+  cd qtquick1/build
   qmake-qt5 ..
 
   make
@@ -47,17 +39,16 @@ build() {
 
 package() {
   cd qtquick1/build
-  make INSTALL_ROOT="${pkgdir}" install
-  make INSTALL_ROOT="${pkgdir}" install_docs
+  make INSTALL_ROOT=$pkgdir install
+  make INSTALL_ROOT=$pkgdir install_docs
 
   _prlfix
-  
+
   # create some symlinks in /usr/bin, postfixed with -qt5
-  install -d "${pkgdir}"/usr/bin
-  for i in $(ls ${pkgdir}/usr/bin); do
-      ln -s /usr/bin/${i} ${pkgdir}/usr/bin/${i}-qt5
+  install -d $pkgdir/usr/bin
+  for i in $(ls $pkgdir/usr/bin); do
+      ln -s /usr/bin/$i $pkgdir/usr/bin/$i-qt5
   done
 
-  install -D -m644 ../LGPL_EXCEPTION.txt \
-    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+  install -D -m644 ../LGPL_EXCEPTION.txt $pkgdir/usr/share/licenses/$pkgname/LGPL_EXCEPTION.txt
 }