[arch-commits] Commit in libaccounts-qt/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Friday, October 2, 2015 @ 15:40:42
  Author: arojas
Revision: 248270

Update to 1.14, doesn't support Qt4 anymore

Modified:
  libaccounts-qt/trunk/PKGBUILD

----------+
 PKGBUILD |   64 +++++++++++++++++++------------------------------------------
 1 file changed, 20 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-02 13:15:43 UTC (rev 248269)
+++ PKGBUILD	2015-10-02 13:40:42 UTC (rev 248270)
@@ -2,63 +2,39 @@
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
-pkgbase=libaccounts-qt
-pkgname=('libaccounts-qt4' 'libaccounts-qt5')
-pkgver=1.13
+pkgname=libaccounts-qt
+pkgdesc="Qt5-based client library for accessing the online accounts database"
+pkgver=1.14
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="https://gitlab.com/accounts-sso/libaccounts-qt"
-license=('LGPL')
-makedepends=('qt4' 'libaccounts-glib' 'doxygen' 'qt5-base')
-source=("https://sources.archlinux.org/other/packages/${pkgbase}/accounts-qt-$pkgver.tar.bz2")
-sha1sums=('df4f51ea3dac547e0cbdda04d60f6c501d6280f2')
+license=(LGPL)
+depends=(libaccounts-glib qt5-base)
+makedepends=(doxygen)
+conflicts=(libaccounts-qt5)
+provides=(libaccounts-qt5)
+replaces=(libaccounts-qt5)
+source=("https://gitlab.com/accounts-sso/libaccounts-qt/repository/archive.tar.bz2?ref=VERSION_$pkgver")
+sha1sums=('daa27223ed7bc7d47f761cbaa681b7dad9c99d6f')
 
 prepare() {
-  cd accounts-qt-$pkgver
+  mv $pkgname-VERSION_$pkgver-* $pkgname-$pkgver
+
+  cd $pkgname-$pkgver
   sed -i 's|SUBDIRS  += Accounts tests|SUBDIRS += Accounts|' accounts-qt.pro
   cd ..
-
-  cp -r accounts-qt-${pkgver} accounts-qt-${pkgver}-qt4
-
-  # Qt4 fix
-  cd accounts-qt-${pkgver}-qt4
-  sed -i 's|QHG_LOCATION           = qhelpgenerator|QHG_LOCATION = qhelpgenerator-qt4|' doc/doxy.conf
 }
 
 build() {
-  cd accounts-qt-$pkgver
+  cd $pkgname-$pkgver
   qmake PREFIX=/usr LIBDIR=/usr/lib
   make
-  cd ..
-
-  cd accounts-qt-$pkgver-qt4
-  qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
-  make
 }
 
-package_libaccounts-qt4() {
-  pkgdesc="Qt4-based client library for accessing the online accounts database"
-  depends=('qt4' 'libaccounts-glib')
-  provides=('libaccounts-qt')
-  conflicts=('libaccounts-qt')
-  replaces=('libaccounts-qt')
-
-  cd accounts-qt-$pkgver-qt4
+package() {
+  cd $pkgname-$pkgver
   make INSTALL_ROOT="$pkgdir" install
 
-  # Remove docs to fix conflicts
-  rm -rf "${pkgdir}"/usr/share/doc
-  rmdir "${pkgdir}"/usr/share
+# Remove docs
+  rm -r "$pkgdir"/usr/share
 }
-
-package_libaccounts-qt5() {
-  pkgdesc="Qt5-based client library for accessing the online accounts database"
-  depends=('qt5-base' 'libaccounts-glib')
-
-  cd accounts-qt-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
-
-  # Remove docs to fix conflicts
-  rm -rf "${pkgdir}"/usr/share/doc
-  rmdir "${pkgdir}"/usr/share
-}