[arch-commits] Commit in quassel/trunk (PKGBUILD quassel.install)

[Jan Steffens]

    Date: Thursday, July 28, 2016 @ 21:06:02
  Author: heftig
Revision: 184598

0.12.4-2

Modified:
  quassel/trunk/PKGBUILD
  quassel/trunk/quassel.install

-----------------+
 PKGBUILD        |   94 +++++++++++++++++++++++++-----------------------------
 quassel.install |   18 ----------
 2 files changed, 46 insertions(+), 66 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-28 21:02:43 UTC (rev 184597)
+++ PKGBUILD	2016-07-28 21:06:02 UTC (rev 184598)
@@ -3,15 +3,16 @@
 # Contributor: Vesa Kaihlavirta <vegai at iki.fi>
 
 pkgbase=quassel
-pkgname=('quassel-client' 'quassel-core' 'quassel-monolithic')
+pkgname=('quassel-core' 'quassel-client' 'quassel-client-small' 'quassel-monolithic')
 pkgver=0.12.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Next-generation distributed IRC client"
 arch=('i686' 'x86_64')
 url="http://quassel-irc.org/"
 license=('GPL')
-makedepends=('cmake' 'extra-cmake-modules' 'qt5-base' 'qt5-tools'
-             'qca-qt5' 'qt5-script' 'knotifyconfig' 'python')
+makedepends=('qt5-base' 'qt5-tools' 'qt5-webkit' 'qca-qt5' 'qt5-script'
+             'knotifyconfig' 'cmake' 'extra-cmake-modules' 'python'
+             'hicolor-icon-theme')
 source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2
         $pkgbase.service
         $pkgbase.conf)
@@ -21,61 +22,46 @@
 
 prepare() {
   cd "${srcdir}"
-  mkdir build{,-client,-mono}
+  mkdir build-{core,client,client-small,mono}
   cd quassel-${pkgver}
 }
 
-build() {
-  cd "${srcdir}"
-
-  # Core
-  cd "${srcdir}"/build
+_build() (
+  cd build-$1
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr/ \
-    -DWITH_KDE=OFF \
+    -DCMAKE_BUILD_TYPE="Release" \
+    -DHAVE_SSL=ON \
     -DUSE_QT5=ON \
-    -DHAVE_SSL=TRUE \
-    -DWANT_CORE=ON \
-    -DWANT_MONO=OFF \
-    -DWANT_QTCLIENT=OFF \
-    -DWITH_DBUS=OFF \
-    -DWITH_OXYGEN=OFF \
-    -DWITH_PHONON=OFF \
-    -DWITH_WEBKIT=OFF \
-    -DCMAKE_BUILD_TYPE="Release" \
+    "${@:2}" \
     ../quassel-${pkgver}/ \
     -Wno-dev
   make
+)
 
-  # Client
-  cd "${srcdir}"/build-client
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr/ \
-    -DUSE_QT5=ON \
-    -DWITH_KDE=ON \
-    -DHAVE_SSL=TRUE \
+build() {
+  _build core \
+    -DWANT_QTCLIENT=OFF \
+    -DWANT_MONO=OFF \
+    -DWITH_OXYGEN=OFF \
+    -DWITH_WEBKIT=OFF
+
+  _build client \
     -DWANT_CORE=OFF \
-    -DWANT_QTCLIENT=ON \
     -DWANT_MONO=OFF \
-    -DCMAKE_BUILD_TYPE="Release" \
-    ../quassel-${pkgver}/ \
-    -Wno-dev
-  make
+    -DWITH_KDE=ON
 
-  # Monolithic
-  cd "${srcdir}"/build-mono
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr/ \
-    -DUSE_QT5=ON \
-    -DWITH_KDE=ON \
-    -DHAVE_SSL=TRUE \
+  _build client-small \
     -DWANT_CORE=OFF \
+    -DWANT_MONO=OFF \
+    -DWITH_WEBKIT=OFF \
+    -DCMAKE_DISABLE_FIND_PACKAGE_dbusmenu-qt5=ON \
+    -DCMAKE_DISABLE_FIND_PACKAGE_Phonon4Qt5=ON
+
+  _build mono \
+    -DWANT_CORE=OFF \
     -DWANT_QTCLIENT=OFF \
-    -DWANT_MONO=ON \
-    -DCMAKE_BUILD_TYPE="Release" \
-    ../quassel-${pkgver}/ \
-    -Wno-dev
-  make
+    -DWITH_KDE=ON
 }
 
 package_quassel-core() {
@@ -84,7 +70,7 @@
 optdepends=('postgresql: PostgreSQL database support')
 backup=(etc/conf.d/quassel)
 install=$pkgbase.install
-  cd "${srcdir}"/build
+  cd "${srcdir}"/build-core
 
   make DESTDIR="${pkgdir}" install
 
@@ -99,18 +85,28 @@
 
 package_quassel-client() {
 pkgdesc="Next-generation distributed IRC client - client only"
-depends=('qt5-base' 'qt5-webkit' 'knotifyconfig')
-conflicts=('quassel-monolithic')
+depends=('qt5-base' 'qt5-webkit' 'knotifyconfig' 'hicolor-icon-theme')
+conflicts=('quassel-monolithic' 'quassel-client-small')
   cd "${srcdir}"/build-client
 
   make DESTDIR="${pkgdir}" install
 }
 
+package_quassel-client-small() {
+pkgdesc="Next-generation distributed IRC client - client only, reduced deps"
+depends=('qt5-base' 'hicolor-icon-theme')
+conflicts=('quassel-monolithic' 'quassel-client')
+replaces=('quassel-remote')
+  cd "${srcdir}"/build-client-small
+
+  make DESTDIR="${pkgdir}" install
+}
+
 package_quassel-monolithic() {
 pkgdesc="Next-generation distributed IRC client - monolithic"
-depends=('qt5-base' 'qca-qt5' 'qt5-webkit' 'qt5-script' 'knotifyconfig')
+depends=('qt5-base' 'qca-qt5' 'qt5-webkit' 'qt5-script' 'knotifyconfig' 'hicolor-icon-theme')
 optdepends=('postgresql: PostgreSQL database support')
-conflicts=('quassel-client')
+conflicts=('quassel-client' 'quassel-client-small')
   cd "${srcdir}"/build-mono
 
   make DESTDIR="${pkgdir}" install

Modified: quassel.install
===================================================================
--- quassel.install	2016-07-28 21:02:43 UTC (rev 184597)
+++ quassel.install	2016-07-28 21:06:02 UTC (rev 184598)
@@ -1,20 +1,4 @@
 post_install() {
-  useradd -r -s /bin/false -d /var/lib/quassel quassel
+  getent passwd quassel >/dev/null || useradd -r -s /bin/false -d /var/lib/quassel quassel
   mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel
 }
-
-post_upgrade() {
-  [ `vercmp $2 0.5.2-1` -le 0 ] && (
-    cat <<EOF
-
-==> - quasselcore now runs as the quassel user
-==> - quasselcore now listens to port 127.0.0.1 by default
-==> - both of above are configurable: /etc/conf.d/quassel
-EOF
-    post_install
-  ) || true
-}
-
-post_remove() {
-  userdel quassel
-}