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

Andrea Scarpino andrea at archlinux.org
Mon Oct 20 17:15:12 UTC 2014


    Date: Monday, October 20, 2014 @ 19:15:12
  Author: andrea
Revision: 225093

upgpkg: signon 8.57-1

Ship the Qt5 version also

Modified:
  signon/trunk/PKGBUILD

----------+
 PKGBUILD |   44 ++++++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-20 17:15:03 UTC (rev 225092)
+++ PKGBUILD	2014-10-20 17:15:12 UTC (rev 225093)
@@ -3,13 +3,13 @@
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgbase=signon
-pkgname=('signon' 'signon-doc')
+pkgname=('signon-qt4' 'signon-qt5')
 pkgver=8.57
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/accounts-sso/"
 license=('LGPL')
-makedepends=('qt4' 'libproxy' 'doxygen' 'graphviz' 'ttf-font')
+makedepends=('qt4' 'libproxy' 'doxygen' 'graphviz' 'qt5-base' 'ttf-font' 'qt5-tools')
 options=('!emptydirs')
 source=("ftp://ftp.archlinux.org/other/packages/${pkgbase}/$pkgbase-$pkgver.tar.bz2"
         'use_keyring.patch')
@@ -18,36 +18,52 @@
 
 prepare() {
   cd $pkgbase-$pkgver
-
   # Use gnome-keyring secrets storage if signon-keyring-extension is available
   patch -Np1 -i "$srcdir/use_keyring.patch"
+  cd ..
 
+  cp -r $pkgbase-$pkgver $pkgbase-$pkgver-qt4
+
   # qt4 fix
+  cd $pkgbase-$pkgver-qt4
   sed -i 's/qdbusxml2cpp/qdbusxml2cpp-qt4/' src/signond/signond.pro
 }
 
 build() {
   cd $pkgbase-$pkgver
+  qmake PREFIX=/usr LIBDIR=/usr/lib
+  make
+  cd ..
+
+  cd $pkgbase-$pkgver-qt4
   qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
   make
 }
 
-package_signon() {
-  pkgdesc="Framework to provide credential storage and authentication service"
+package_signon-qt4() {
+  pkgdesc="Qt4 Framework to provide credential storage and authentication service"
   depends=('qt4' 'libproxy')
-  backup=('etc/signond.conf')
-  install=$pkgname.install
+  install=$pkgbase.install
+  provides=('signon')
+  replaces=('signon' 'signon-doc')
+  conflicts=('signon' 'signon-doc' 'signon-qt5')
 
-  cd $pkgbase-$pkgver
+  cd $pkgbase-$pkgver-qt4
   make INSTALL_ROOT="$pkgdir" install
 
-  # Split out documentation
-  mv "$pkgdir/usr/share/doc" "$srcdir"
+  # Do not ship docs
+  rm -rf "${pkgdir}"/usr/share/doc
 }
 
-package_signon-doc() {
-  pkgdesc="Developer documention of signon"
+package_signon-qt5() {
+  pkgdesc="Qt5 Framework to provide credential storage and authentication service"
+  depends=('qt5-base' 'libproxy')
+  install=$pkgbase.install
+  conflicts=('signon' 'signon-qt4')
 
-  mkdir -p "$pkgdir/usr/share"
-  mv "$srcdir/doc" "$pkgdir/usr/share"
+  cd $pkgbase-$pkgver
+  make INSTALL_ROOT="$pkgdir" install
+
+  # Do not ship docs
+  rm -rf "${pkgdir}"/usr/share/doc
 }



More information about the arch-commits mailing list