[arch-commits] Commit in quassel/repos (26 files)

Jaroslav Lichtblau jlichtblau at archlinux.org
Thu Feb 11 07:32:34 UTC 2016


    Date: Thursday, February 11, 2016 @ 08:32:33
  Author: jlichtblau
Revision: 161138

archrelease: copy trunk to community-i686, community-x86_64

Added:
  quassel/repos/community-i686/PKGBUILD
    (from rev 161137, quassel/trunk/PKGBUILD)
  quassel/repos/community-i686/quassel-client.install
    (from rev 161137, quassel/trunk/quassel-client.install)
  quassel/repos/community-i686/quassel-monolithic.install
    (from rev 161137, quassel/trunk/quassel-monolithic.install)
  quassel/repos/community-i686/quassel.conf
    (from rev 161137, quassel/trunk/quassel.conf)
  quassel/repos/community-i686/quassel.install
    (from rev 161137, quassel/trunk/quassel.install)
  quassel/repos/community-i686/quassel.service
    (from rev 161137, quassel/trunk/quassel.service)
  quassel/repos/community-x86_64/PKGBUILD
    (from rev 161137, quassel/trunk/PKGBUILD)
  quassel/repos/community-x86_64/quassel-client.install
    (from rev 161137, quassel/trunk/quassel-client.install)
  quassel/repos/community-x86_64/quassel-monolithic.install
    (from rev 161137, quassel/trunk/quassel-monolithic.install)
  quassel/repos/community-x86_64/quassel.conf
    (from rev 161137, quassel/trunk/quassel.conf)
  quassel/repos/community-x86_64/quassel.install
    (from rev 161137, quassel/trunk/quassel.install)
  quassel/repos/community-x86_64/quassel.service
    (from rev 161137, quassel/trunk/quassel.service)
Deleted:
  quassel/repos/community-i686/PKGBUILD
  quassel/repos/community-i686/qt55.patch
  quassel/repos/community-i686/quassel-client.install
  quassel/repos/community-i686/quassel-monolithic.install
  quassel/repos/community-i686/quassel.conf
  quassel/repos/community-i686/quassel.install
  quassel/repos/community-i686/quassel.service
  quassel/repos/community-x86_64/PKGBUILD
  quassel/repos/community-x86_64/qt55.patch
  quassel/repos/community-x86_64/quassel-client.install
  quassel/repos/community-x86_64/quassel-monolithic.install
  quassel/repos/community-x86_64/quassel.conf
  quassel/repos/community-x86_64/quassel.install
  quassel/repos/community-x86_64/quassel.service

---------------------------------------------+
 /PKGBUILD                                   |  236 ++++++++++++++++++++++++++
 /quassel-client.install                     |   18 +
 /quassel-monolithic.install                 |   18 +
 /quassel.conf                               |    4 
 /quassel.install                            |   42 ++++
 /quassel.service                            |   28 +++
 community-i686/PKGBUILD                     |  119 -------------
 community-i686/qt55.patch                   |   50 -----
 community-i686/quassel-client.install       |    9 
 community-i686/quassel-monolithic.install   |    9 
 community-i686/quassel.conf                 |    2 
 community-i686/quassel.install              |   21 --
 community-i686/quassel.service              |   14 -
 community-x86_64/PKGBUILD                   |  119 -------------
 community-x86_64/qt55.patch                 |   50 -----
 community-x86_64/quassel-client.install     |    9 
 community-x86_64/quassel-monolithic.install |    9 
 community-x86_64/quassel.conf               |    2 
 community-x86_64/quassel.install            |   21 --
 community-x86_64/quassel.service            |   14 -
 20 files changed, 346 insertions(+), 448 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2016-02-11 07:32:02 UTC (rev 161137)
+++ community-i686/PKGBUILD	2016-02-11 07:32:33 UTC (rev 161138)
@@ -1,119 +0,0 @@
-# $Id$
-# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-
-pkgbase=quassel
-pkgname=('quassel-client' 'quassel-core' 'quassel-monolithic')
-pkgver=0.12.2
-pkgrel=4
-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')
-source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2
-        $pkgbase.service
-        $pkgbase.conf
-        qt55.patch)
-sha256sums=('6bd6f79ecb88fb857bea7e89c767a3bd0f413ff01bae9298dd2e563478947897'
-            '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
-            'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8'
-            '85adfbe4613688d0f282deb5250fb39f7534d9e6ac7450cf035cca7bbcb25cda')
-
-prepare() {
-  cd "${srcdir}"
-  mkdir build{,-client,-mono}
-  cd quassel-${pkgver}
-  patch -Np1 -i ../qt55.patch
-}
-
-build() {
-  cd "${srcdir}"
-
-  # Core
-  cd "${srcdir}"/build
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr/ \
-    -DWITH_KDE=OFF \
-    -DUSE_QT5=ON \
-    -DWITH_OPENSSL=ON \
-    -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" \
-    ../quassel-${pkgver}/ \
-    -Wno-dev
-  make
-
-  # Client
-  cd "${srcdir}"/build-client
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr/ \
-    -DUSE_QT5=ON \
-    -DWITH_KDE=ON \
-    -DWITH_OPENSSL=ON \
-    -DWANT_CORE=OFF \
-    -DWANT_QTCLIENT=ON \
-    -DWANT_MONO=OFF \
-    -DCMAKE_BUILD_TYPE="Release" \
-    ../quassel-${pkgver}/ \
-    -Wno-dev
-  make
-
-  # Monolithic
-  cd "${srcdir}"/build-mono
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr/ \
-    -DUSE_QT5=ON \
-    -DWITH_KDE=ON \
-    -DWITH_OPENSSL=ON \
-    -DWANT_CORE=OFF \
-    -DWANT_QTCLIENT=OFF \
-    -DWANT_MONO=ON \
-    -DCMAKE_BUILD_TYPE="Release" \
-    ../quassel-${pkgver}/ \
-    -Wno-dev
-  make
-}
-
-package_quassel-core() {
-pkgdesc="Next-generation distributed IRC client - core only"
-depends=('icu' 'qca-qt5' 'qt5-script')
-backup=(etc/conf.d/quassel)
-install=quassel.install
-  cd "${srcdir}"/build
-
-  make DESTDIR="${pkgdir}" install
-
-  # Remove unneeded pixmap icons
-  rm -r "${pkgdir}"/usr/share
-
-  install -Dm644 "${srcdir}"/$pkgbase.service \
-    "${pkgdir}"/usr/lib/systemd/system/$pkgbase.service
-  install -Dm644 "${srcdir}"/$pkgbase.conf \
-    "${pkgdir}"/etc/conf.d/$pkgbase
-}
-
-package_quassel-client() {
-pkgdesc="Next-generation distributed IRC client - client only"
-depends=('qt5-base' 'qt5-webkit' 'knotifyconfig')
-conflicts=('quassel-monolithic')
-install=quassel-client.install
-  cd "${srcdir}"/build-client
-
-  make DESTDIR="${pkgdir}" install
-}
-
-package_quassel-monolithic() {
-pkgdesc="Next-generation distributed IRC client - monolithic"
-depends=('qt5-base' 'qca-qt5' 'qt5-webkit' 'qt5-script' 'knotifyconfig')
-conflicts=('quassel-client')
-install=quassel-monolithic.install
-  cd "${srcdir}"/build-mono
-
-  make DESTDIR="${pkgdir}" install
-}

Copied: quassel/repos/community-i686/PKGBUILD (from rev 161137, quassel/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2016-02-11 07:32:33 UTC (rev 161138)
@@ -0,0 +1,118 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Vesa Kaihlavirta <vegai at iki.fi>
+
+pkgbase=quassel
+pkgname=('quassel-client' 'quassel-core' 'quassel-monolithic')
+pkgver=0.12.3
+pkgrel=1
+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')
+source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2
+        $pkgbase.service
+        $pkgbase.conf)
+sha256sums=('4d3ee91b85cce3d8df62faf55ad35bebd6fc45085ed6248b8a41d2858de3d434'
+            '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
+            'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
+
+prepare() {
+  cd "${srcdir}"
+  mkdir build{,-client,-mono}
+  cd quassel-${pkgver}
+}
+
+build() {
+  cd "${srcdir}"
+
+  # Core
+  cd "${srcdir}"/build
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr/ \
+    -DWITH_KDE=OFF \
+    -DUSE_QT5=ON \
+    -DWITH_OPENSSL=ON \
+    -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" \
+    ../quassel-${pkgver}/ \
+    -Wno-dev
+  make
+
+  # Client
+  cd "${srcdir}"/build-client
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr/ \
+    -DUSE_QT5=ON \
+    -DWITH_KDE=ON \
+    -DWITH_OPENSSL=ON \
+    -DWANT_CORE=OFF \
+    -DWANT_QTCLIENT=ON \
+    -DWANT_MONO=OFF \
+    -DCMAKE_BUILD_TYPE="Release" \
+    ../quassel-${pkgver}/ \
+    -Wno-dev
+  make
+
+  # Monolithic
+  cd "${srcdir}"/build-mono
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr/ \
+    -DUSE_QT5=ON \
+    -DWITH_KDE=ON \
+    -DWITH_OPENSSL=ON \
+    -DWANT_CORE=OFF \
+    -DWANT_QTCLIENT=OFF \
+    -DWANT_MONO=ON \
+    -DCMAKE_BUILD_TYPE="Release" \
+    ../quassel-${pkgver}/ \
+    -Wno-dev
+  make
+}
+
+package_quassel-core() {
+pkgdesc="Next-generation distributed IRC client - core only"
+depends=('icu' 'qca-qt5' 'qt5-script')
+optdepends=('postgresql: PostgreSQL database support')
+backup=(etc/conf.d/quassel)
+install=quassel.install
+  cd "${srcdir}"/build
+
+  make DESTDIR="${pkgdir}" install
+
+  # Remove unneeded pixmap icons
+  rm -r "${pkgdir}"/usr/share
+
+  install -Dm644 "${srcdir}"/$pkgbase.service \
+    "${pkgdir}"/usr/lib/systemd/system/$pkgbase.service
+  install -Dm644 "${srcdir}"/$pkgbase.conf \
+    "${pkgdir}"/etc/conf.d/$pkgbase
+}
+
+package_quassel-client() {
+pkgdesc="Next-generation distributed IRC client - client only"
+depends=('qt5-base' 'qt5-webkit' 'knotifyconfig')
+conflicts=('quassel-monolithic')
+install=quassel-client.install
+  cd "${srcdir}"/build-client
+
+  make DESTDIR="${pkgdir}" install
+}
+
+package_quassel-monolithic() {
+pkgdesc="Next-generation distributed IRC client - monolithic"
+depends=('qt5-base' 'qca-qt5' 'qt5-webkit' 'qt5-script' 'knotifyconfig')
+optdepends=('postgresql: PostgreSQL database support')
+conflicts=('quassel-client')
+install=quassel-monolithic.install
+  cd "${srcdir}"/build-mono
+
+  make DESTDIR="${pkgdir}" install
+}

Deleted: community-i686/qt55.patch
===================================================================
--- community-i686/qt55.patch	2016-02-11 07:32:02 UTC (rev 161137)
+++ community-i686/qt55.patch	2016-02-11 07:32:33 UTC (rev 161138)
@@ -1,50 +0,0 @@
-From 078477395aaec1edee90922037ebc8a36b072d90 Mon Sep 17 00:00:00 2001
-From: Armin K <krejzi at email.com>
-Date: Sat, 2 May 2015 23:04:53 +0200
-Subject: [PATCH] Fix build with Qt-5.5
-
-http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c
----
- src/client/treemodel.cpp | 5 ++---
- src/common/peer.h        | 1 +
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
-index f599803..fd47bc0 100644
---- a/src/client/treemodel.cpp
-+++ b/src/client/treemodel.cpp
-@@ -556,10 +556,9 @@ void TreeModel::endAppendChilds()
-     ChildStatus cs = _childStatus;
- #ifndef QT_NO_DEBUG
-     QModelIndex parent = indexByItem(parentItem);
--#endif
-     Q_ASSERT(cs.parent == parent);
-     Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1);
--
-+#endif
-     _aboutToRemoveOrInsert = false;
-     for (int i = cs.start; i <= cs.end; i++) {
-         connectItem(parentItem->child(i));
-@@ -605,9 +604,9 @@ void TreeModel::endRemoveChilds()
- #ifndef QT_NO_DEBUG
-     ChildStatus cs = _childStatus;
-     QModelIndex parent = indexByItem(parentItem);
--#endif
-     Q_ASSERT(cs.parent == parent);
-     Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1);
-+#endif
-     _aboutToRemoveOrInsert = false;
- 
-     endRemoveRows();
-diff --git a/src/common/peer.h b/src/common/peer.h
-index 02eb3c0..79204b4 100644
---- a/src/common/peer.h
-+++ b/src/common/peer.h
-@@ -22,6 +22,7 @@
- #define PEER_H
- 
- #include <QAbstractSocket>
-+#include <QDataStream>
- #include <QPointer>
- 
- #include "authhandler.h"

Deleted: community-i686/quassel-client.install
===================================================================
--- community-i686/quassel-client.install	2016-02-11 07:32:02 UTC (rev 161137)
+++ community-i686/quassel-client.install	2016-02-11 07:32:33 UTC (rev 161138)
@@ -1,9 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-post_upgrade() {
-    post_install
-}
-post_remove() {
-    post_install
-}

Copied: quassel/repos/community-i686/quassel-client.install (from rev 161137, quassel/trunk/quassel-client.install)
===================================================================
--- community-i686/quassel-client.install	                        (rev 0)
+++ community-i686/quassel-client.install	2016-02-11 07:32:33 UTC (rev 161138)
@@ -0,0 +1,9 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+post_upgrade() {
+    post_install
+}
+post_remove() {
+    post_install
+}

Deleted: community-i686/quassel-monolithic.install
===================================================================
--- community-i686/quassel-monolithic.install	2016-02-11 07:32:02 UTC (rev 161137)
+++ community-i686/quassel-monolithic.install	2016-02-11 07:32:33 UTC (rev 161138)
@@ -1,9 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-post_upgrade() {
-    post_install
-}
-post_remove() {
-    post_install
-}

Copied: quassel/repos/community-i686/quassel-monolithic.install (from rev 161137, quassel/trunk/quassel-monolithic.install)
===================================================================
--- community-i686/quassel-monolithic.install	                        (rev 0)
+++ community-i686/quassel-monolithic.install	2016-02-11 07:32:33 UTC (rev 161138)
@@ -0,0 +1,9 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+post_upgrade() {
+    post_install
+}
+post_remove() {
+    post_install
+}

Deleted: community-i686/quassel.conf
===================================================================
--- community-i686/quassel.conf	2016-02-11 07:32:02 UTC (rev 161137)
+++ community-i686/quassel.conf	2016-02-11 07:32:33 UTC (rev 161138)
@@ -1,2 +0,0 @@
-QUASSEL_USER=quassel
-LISTEN=127.0.0.1

Copied: quassel/repos/community-i686/quassel.conf (from rev 161137, quassel/trunk/quassel.conf)
===================================================================
--- community-i686/quassel.conf	                        (rev 0)
+++ community-i686/quassel.conf	2016-02-11 07:32:33 UTC (rev 161138)
@@ -0,0 +1,2 @@
+QUASSEL_USER=quassel
+LISTEN=127.0.0.1

Deleted: community-i686/quassel.install
===================================================================
--- community-i686/quassel.install	2016-02-11 07:32:02 UTC (rev 161137)
+++ community-i686/quassel.install	2016-02-11 07:32:33 UTC (rev 161138)
@@ -1,21 +0,0 @@
-post_install() {
-  useradd -r -s /bin/false -d /var/lib/quassel quassel
-  mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel
-#  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-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
-}

Copied: quassel/repos/community-i686/quassel.install (from rev 161137, quassel/trunk/quassel.install)
===================================================================
--- community-i686/quassel.install	                        (rev 0)
+++ community-i686/quassel.install	2016-02-11 07:32:33 UTC (rev 161138)
@@ -0,0 +1,21 @@
+post_install() {
+  useradd -r -s /bin/false -d /var/lib/quassel quassel
+  mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel
+#  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+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
+}

Deleted: community-i686/quassel.service
===================================================================
--- community-i686/quassel.service	2016-02-11 07:32:02 UTC (rev 161137)
+++ community-i686/quassel.service	2016-02-11 07:32:33 UTC (rev 161138)
@@ -1,14 +0,0 @@
-[Unit]
-Description=Quassel Core
-After=network.target postgresql.service
-Wants=postgresql.service
-
-[Service]
-User=quassel
-Group=quassel
-PIDFile=/var/run/quassel.pid
-EnvironmentFile=/etc/conf.d/quassel
-ExecStart=/usr/bin/quasselcore --configdir=/var/lib/quassel
-
-[Install]
-WantedBy=multi-user.target

Copied: quassel/repos/community-i686/quassel.service (from rev 161137, quassel/trunk/quassel.service)
===================================================================
--- community-i686/quassel.service	                        (rev 0)
+++ community-i686/quassel.service	2016-02-11 07:32:33 UTC (rev 161138)
@@ -0,0 +1,14 @@
+[Unit]
+Description=Quassel Core
+After=network.target postgresql.service
+Wants=postgresql.service
+
+[Service]
+User=quassel
+Group=quassel
+PIDFile=/var/run/quassel.pid
+EnvironmentFile=/etc/conf.d/quassel
+ExecStart=/usr/bin/quasselcore --configdir=/var/lib/quassel
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2016-02-11 07:32:02 UTC (rev 161137)
+++ community-x86_64/PKGBUILD	2016-02-11 07:32:33 UTC (rev 161138)
@@ -1,119 +0,0 @@
-# $Id$
-# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-
-pkgbase=quassel
-pkgname=('quassel-client' 'quassel-core' 'quassel-monolithic')
-pkgver=0.12.2
-pkgrel=4
-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')
-source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2
-        $pkgbase.service
-        $pkgbase.conf
-        qt55.patch)
-sha256sums=('6bd6f79ecb88fb857bea7e89c767a3bd0f413ff01bae9298dd2e563478947897'
-            '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
-            'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8'
-            '85adfbe4613688d0f282deb5250fb39f7534d9e6ac7450cf035cca7bbcb25cda')
-
-prepare() {
-  cd "${srcdir}"
-  mkdir build{,-client,-mono}
-  cd quassel-${pkgver}
-  patch -Np1 -i ../qt55.patch
-}
-
-build() {
-  cd "${srcdir}"
-
-  # Core
-  cd "${srcdir}"/build
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr/ \
-    -DWITH_KDE=OFF \
-    -DUSE_QT5=ON \
-    -DWITH_OPENSSL=ON \
-    -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" \
-    ../quassel-${pkgver}/ \
-    -Wno-dev
-  make
-
-  # Client
-  cd "${srcdir}"/build-client
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr/ \
-    -DUSE_QT5=ON \
-    -DWITH_KDE=ON \
-    -DWITH_OPENSSL=ON \
-    -DWANT_CORE=OFF \
-    -DWANT_QTCLIENT=ON \
-    -DWANT_MONO=OFF \
-    -DCMAKE_BUILD_TYPE="Release" \
-    ../quassel-${pkgver}/ \
-    -Wno-dev
-  make
-
-  # Monolithic
-  cd "${srcdir}"/build-mono
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr/ \
-    -DUSE_QT5=ON \
-    -DWITH_KDE=ON \
-    -DWITH_OPENSSL=ON \
-    -DWANT_CORE=OFF \
-    -DWANT_QTCLIENT=OFF \
-    -DWANT_MONO=ON \
-    -DCMAKE_BUILD_TYPE="Release" \
-    ../quassel-${pkgver}/ \
-    -Wno-dev
-  make
-}
-
-package_quassel-core() {
-pkgdesc="Next-generation distributed IRC client - core only"
-depends=('icu' 'qca-qt5' 'qt5-script')
-backup=(etc/conf.d/quassel)
-install=quassel.install
-  cd "${srcdir}"/build
-
-  make DESTDIR="${pkgdir}" install
-
-  # Remove unneeded pixmap icons
-  rm -r "${pkgdir}"/usr/share
-
-  install -Dm644 "${srcdir}"/$pkgbase.service \
-    "${pkgdir}"/usr/lib/systemd/system/$pkgbase.service
-  install -Dm644 "${srcdir}"/$pkgbase.conf \
-    "${pkgdir}"/etc/conf.d/$pkgbase
-}
-
-package_quassel-client() {
-pkgdesc="Next-generation distributed IRC client - client only"
-depends=('qt5-base' 'qt5-webkit' 'knotifyconfig')
-conflicts=('quassel-monolithic')
-install=quassel-client.install
-  cd "${srcdir}"/build-client
-
-  make DESTDIR="${pkgdir}" install
-}
-
-package_quassel-monolithic() {
-pkgdesc="Next-generation distributed IRC client - monolithic"
-depends=('qt5-base' 'qca-qt5' 'qt5-webkit' 'qt5-script' 'knotifyconfig')
-conflicts=('quassel-client')
-install=quassel-monolithic.install
-  cd "${srcdir}"/build-mono
-
-  make DESTDIR="${pkgdir}" install
-}

Copied: quassel/repos/community-x86_64/PKGBUILD (from rev 161137, quassel/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2016-02-11 07:32:33 UTC (rev 161138)
@@ -0,0 +1,118 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Vesa Kaihlavirta <vegai at iki.fi>
+
+pkgbase=quassel
+pkgname=('quassel-client' 'quassel-core' 'quassel-monolithic')
+pkgver=0.12.3
+pkgrel=1
+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')
+source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2
+        $pkgbase.service
+        $pkgbase.conf)
+sha256sums=('4d3ee91b85cce3d8df62faf55ad35bebd6fc45085ed6248b8a41d2858de3d434'
+            '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
+            'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
+
+prepare() {
+  cd "${srcdir}"
+  mkdir build{,-client,-mono}
+  cd quassel-${pkgver}
+}
+
+build() {
+  cd "${srcdir}"
+
+  # Core
+  cd "${srcdir}"/build
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr/ \
+    -DWITH_KDE=OFF \
+    -DUSE_QT5=ON \
+    -DWITH_OPENSSL=ON \
+    -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" \
+    ../quassel-${pkgver}/ \
+    -Wno-dev
+  make
+
+  # Client
+  cd "${srcdir}"/build-client
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr/ \
+    -DUSE_QT5=ON \
+    -DWITH_KDE=ON \
+    -DWITH_OPENSSL=ON \
+    -DWANT_CORE=OFF \
+    -DWANT_QTCLIENT=ON \
+    -DWANT_MONO=OFF \
+    -DCMAKE_BUILD_TYPE="Release" \
+    ../quassel-${pkgver}/ \
+    -Wno-dev
+  make
+
+  # Monolithic
+  cd "${srcdir}"/build-mono
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr/ \
+    -DUSE_QT5=ON \
+    -DWITH_KDE=ON \
+    -DWITH_OPENSSL=ON \
+    -DWANT_CORE=OFF \
+    -DWANT_QTCLIENT=OFF \
+    -DWANT_MONO=ON \
+    -DCMAKE_BUILD_TYPE="Release" \
+    ../quassel-${pkgver}/ \
+    -Wno-dev
+  make
+}
+
+package_quassel-core() {
+pkgdesc="Next-generation distributed IRC client - core only"
+depends=('icu' 'qca-qt5' 'qt5-script')
+optdepends=('postgresql: PostgreSQL database support')
+backup=(etc/conf.d/quassel)
+install=quassel.install
+  cd "${srcdir}"/build
+
+  make DESTDIR="${pkgdir}" install
+
+  # Remove unneeded pixmap icons
+  rm -r "${pkgdir}"/usr/share
+
+  install -Dm644 "${srcdir}"/$pkgbase.service \
+    "${pkgdir}"/usr/lib/systemd/system/$pkgbase.service
+  install -Dm644 "${srcdir}"/$pkgbase.conf \
+    "${pkgdir}"/etc/conf.d/$pkgbase
+}
+
+package_quassel-client() {
+pkgdesc="Next-generation distributed IRC client - client only"
+depends=('qt5-base' 'qt5-webkit' 'knotifyconfig')
+conflicts=('quassel-monolithic')
+install=quassel-client.install
+  cd "${srcdir}"/build-client
+
+  make DESTDIR="${pkgdir}" install
+}
+
+package_quassel-monolithic() {
+pkgdesc="Next-generation distributed IRC client - monolithic"
+depends=('qt5-base' 'qca-qt5' 'qt5-webkit' 'qt5-script' 'knotifyconfig')
+optdepends=('postgresql: PostgreSQL database support')
+conflicts=('quassel-client')
+install=quassel-monolithic.install
+  cd "${srcdir}"/build-mono
+
+  make DESTDIR="${pkgdir}" install
+}

Deleted: community-x86_64/qt55.patch
===================================================================
--- community-x86_64/qt55.patch	2016-02-11 07:32:02 UTC (rev 161137)
+++ community-x86_64/qt55.patch	2016-02-11 07:32:33 UTC (rev 161138)
@@ -1,50 +0,0 @@
-From 078477395aaec1edee90922037ebc8a36b072d90 Mon Sep 17 00:00:00 2001
-From: Armin K <krejzi at email.com>
-Date: Sat, 2 May 2015 23:04:53 +0200
-Subject: [PATCH] Fix build with Qt-5.5
-
-http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c
----
- src/client/treemodel.cpp | 5 ++---
- src/common/peer.h        | 1 +
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
-index f599803..fd47bc0 100644
---- a/src/client/treemodel.cpp
-+++ b/src/client/treemodel.cpp
-@@ -556,10 +556,9 @@ void TreeModel::endAppendChilds()
-     ChildStatus cs = _childStatus;
- #ifndef QT_NO_DEBUG
-     QModelIndex parent = indexByItem(parentItem);
--#endif
-     Q_ASSERT(cs.parent == parent);
-     Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1);
--
-+#endif
-     _aboutToRemoveOrInsert = false;
-     for (int i = cs.start; i <= cs.end; i++) {
-         connectItem(parentItem->child(i));
-@@ -605,9 +604,9 @@ void TreeModel::endRemoveChilds()
- #ifndef QT_NO_DEBUG
-     ChildStatus cs = _childStatus;
-     QModelIndex parent = indexByItem(parentItem);
--#endif
-     Q_ASSERT(cs.parent == parent);
-     Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1);
-+#endif
-     _aboutToRemoveOrInsert = false;
- 
-     endRemoveRows();
-diff --git a/src/common/peer.h b/src/common/peer.h
-index 02eb3c0..79204b4 100644
---- a/src/common/peer.h
-+++ b/src/common/peer.h
-@@ -22,6 +22,7 @@
- #define PEER_H
- 
- #include <QAbstractSocket>
-+#include <QDataStream>
- #include <QPointer>
- 
- #include "authhandler.h"

Deleted: community-x86_64/quassel-client.install
===================================================================
--- community-x86_64/quassel-client.install	2016-02-11 07:32:02 UTC (rev 161137)
+++ community-x86_64/quassel-client.install	2016-02-11 07:32:33 UTC (rev 161138)
@@ -1,9 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-post_upgrade() {
-    post_install
-}
-post_remove() {
-    post_install
-}

Copied: quassel/repos/community-x86_64/quassel-client.install (from rev 161137, quassel/trunk/quassel-client.install)
===================================================================
--- community-x86_64/quassel-client.install	                        (rev 0)
+++ community-x86_64/quassel-client.install	2016-02-11 07:32:33 UTC (rev 161138)
@@ -0,0 +1,9 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+post_upgrade() {
+    post_install
+}
+post_remove() {
+    post_install
+}

Deleted: community-x86_64/quassel-monolithic.install
===================================================================
--- community-x86_64/quassel-monolithic.install	2016-02-11 07:32:02 UTC (rev 161137)
+++ community-x86_64/quassel-monolithic.install	2016-02-11 07:32:33 UTC (rev 161138)
@@ -1,9 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-post_upgrade() {
-    post_install
-}
-post_remove() {
-    post_install
-}

Copied: quassel/repos/community-x86_64/quassel-monolithic.install (from rev 161137, quassel/trunk/quassel-monolithic.install)
===================================================================
--- community-x86_64/quassel-monolithic.install	                        (rev 0)
+++ community-x86_64/quassel-monolithic.install	2016-02-11 07:32:33 UTC (rev 161138)
@@ -0,0 +1,9 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+post_upgrade() {
+    post_install
+}
+post_remove() {
+    post_install
+}

Deleted: community-x86_64/quassel.conf
===================================================================
--- community-x86_64/quassel.conf	2016-02-11 07:32:02 UTC (rev 161137)
+++ community-x86_64/quassel.conf	2016-02-11 07:32:33 UTC (rev 161138)
@@ -1,2 +0,0 @@
-QUASSEL_USER=quassel
-LISTEN=127.0.0.1

Copied: quassel/repos/community-x86_64/quassel.conf (from rev 161137, quassel/trunk/quassel.conf)
===================================================================
--- community-x86_64/quassel.conf	                        (rev 0)
+++ community-x86_64/quassel.conf	2016-02-11 07:32:33 UTC (rev 161138)
@@ -0,0 +1,2 @@
+QUASSEL_USER=quassel
+LISTEN=127.0.0.1

Deleted: community-x86_64/quassel.install
===================================================================
--- community-x86_64/quassel.install	2016-02-11 07:32:02 UTC (rev 161137)
+++ community-x86_64/quassel.install	2016-02-11 07:32:33 UTC (rev 161138)
@@ -1,21 +0,0 @@
-post_install() {
-  useradd -r -s /bin/false -d /var/lib/quassel quassel
-  mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel
-#  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-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
-}

Copied: quassel/repos/community-x86_64/quassel.install (from rev 161137, quassel/trunk/quassel.install)
===================================================================
--- community-x86_64/quassel.install	                        (rev 0)
+++ community-x86_64/quassel.install	2016-02-11 07:32:33 UTC (rev 161138)
@@ -0,0 +1,21 @@
+post_install() {
+  useradd -r -s /bin/false -d /var/lib/quassel quassel
+  mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel
+#  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+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
+}

Deleted: community-x86_64/quassel.service
===================================================================
--- community-x86_64/quassel.service	2016-02-11 07:32:02 UTC (rev 161137)
+++ community-x86_64/quassel.service	2016-02-11 07:32:33 UTC (rev 161138)
@@ -1,14 +0,0 @@
-[Unit]
-Description=Quassel Core
-After=network.target postgresql.service
-Wants=postgresql.service
-
-[Service]
-User=quassel
-Group=quassel
-PIDFile=/var/run/quassel.pid
-EnvironmentFile=/etc/conf.d/quassel
-ExecStart=/usr/bin/quasselcore --configdir=/var/lib/quassel
-
-[Install]
-WantedBy=multi-user.target

Copied: quassel/repos/community-x86_64/quassel.service (from rev 161137, quassel/trunk/quassel.service)
===================================================================
--- community-x86_64/quassel.service	                        (rev 0)
+++ community-x86_64/quassel.service	2016-02-11 07:32:33 UTC (rev 161138)
@@ -0,0 +1,14 @@
+[Unit]
+Description=Quassel Core
+After=network.target postgresql.service
+Wants=postgresql.service
+
+[Service]
+User=quassel
+Group=quassel
+PIDFile=/var/run/quassel.pid
+EnvironmentFile=/etc/conf.d/quassel
+ExecStart=/usr/bin/quasselcore --configdir=/var/lib/quassel
+
+[Install]
+WantedBy=multi-user.target



More information about the arch-commits mailing list