[arch-commits] Commit in quassel/repos (18 files)
Balló György
bgyorgy at archlinux.org
Tue Feb 21 05:06:05 UTC 2017
Date: Tuesday, February 21, 2017 @ 05:06:04
Author: bgyorgy
Revision: 213243
archrelease: copy trunk to community-i686, community-x86_64
Added:
quassel/repos/community-i686/0001-Fix-handling-systray-notifications.patch
(from rev 213242, quassel/trunk/0001-Fix-handling-systray-notifications.patch)
quassel/repos/community-i686/PKGBUILD
(from rev 213242, quassel/trunk/PKGBUILD)
quassel/repos/community-i686/quassel.conf
(from rev 213242, quassel/trunk/quassel.conf)
quassel/repos/community-i686/quassel.install
(from rev 213242, quassel/trunk/quassel.install)
quassel/repos/community-i686/quassel.service
(from rev 213242, quassel/trunk/quassel.service)
quassel/repos/community-x86_64/0001-Fix-handling-systray-notifications.patch
(from rev 213242, quassel/trunk/0001-Fix-handling-systray-notifications.patch)
quassel/repos/community-x86_64/PKGBUILD
(from rev 213242, quassel/trunk/PKGBUILD)
quassel/repos/community-x86_64/quassel.conf
(from rev 213242, quassel/trunk/quassel.conf)
quassel/repos/community-x86_64/quassel.install
(from rev 213242, quassel/trunk/quassel.install)
quassel/repos/community-x86_64/quassel.service
(from rev 213242, quassel/trunk/quassel.service)
Deleted:
quassel/repos/community-i686/PKGBUILD
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/quassel.conf
quassel/repos/community-x86_64/quassel.install
quassel/repos/community-x86_64/quassel.service
----------------------------------------------------------------+
/PKGBUILD | 238 ++++++++++
/quassel.conf | 4
/quassel.install | 8
/quassel.service | 28 +
community-i686/0001-Fix-handling-systray-notifications.patch | 56 ++
community-i686/PKGBUILD | 113 ----
community-i686/quassel.conf | 2
community-i686/quassel.install | 4
community-i686/quassel.service | 14
community-x86_64/0001-Fix-handling-systray-notifications.patch | 56 ++
community-x86_64/PKGBUILD | 113 ----
community-x86_64/quassel.conf | 2
community-x86_64/quassel.install | 4
community-x86_64/quassel.service | 14
14 files changed, 390 insertions(+), 266 deletions(-)
Copied: quassel/repos/community-i686/0001-Fix-handling-systray-notifications.patch (from rev 213242, quassel/trunk/0001-Fix-handling-systray-notifications.patch)
===================================================================
--- community-i686/0001-Fix-handling-systray-notifications.patch (rev 0)
+++ community-i686/0001-Fix-handling-systray-notifications.patch 2017-02-21 05:06:04 UTC (rev 213243)
@@ -0,0 +1,56 @@
+From 38112a9e19283aa6768df9af14503ccbe09fe5b0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= <ballogyor at gmail.com>
+Date: Thu, 16 Feb 2017 08:41:08 +0100
+Subject: [PATCH] Fix handling systray notifications
+
+Only toggle/activate the main window if the notification message comes from quassel.
+
+This fixes the problem that Quassel's main window is opened when the user clicks on any notification bubbles from other applications.
+---
+ src/qtui/systraynotificationbackend.cpp | 22 +++++++++++++---------
+ 1 file changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp
+index b0b7be62..d96000e1 100644
+--- a/src/qtui/systraynotificationbackend.cpp
++++ b/src/qtui/systraynotificationbackend.cpp
+@@ -92,15 +92,16 @@ void SystrayNotificationBackend::close(uint notificationId)
+ void SystrayNotificationBackend::notificationActivated(uint notificationId)
+ {
+ if (!_blockActivation) {
+- if (_notifications.count()) {
+- if (QtUi::mainWindow()->systemTray()->mode() == SystemTray::Legacy)
+- _blockActivation = true; // prevent double activation because both tray icon and bubble might send a signal
+- if (!notificationId)
+- notificationId = _notifications.count() ? _notifications.last().notificationId : 0;
+- emit activated(notificationId);
++ QList<Notification>::iterator i = _notifications.begin();
++ while (i != _notifications.end()) {
++ if (i->notificationId == notificationId) {
++ if (QtUi::mainWindow()->systemTray()->mode() == SystemTray::Legacy)
++ _blockActivation = true; // prevent double activation because both tray icon and bubble might send a signal
++ emit activated(notificationId);
++ break;
++ }
++ ++i;
+ }
+- else
+- GraphicalUi::toggleMainWidget();
+ }
+ }
+
+@@ -108,7 +109,10 @@ void SystrayNotificationBackend::notificationActivated(uint notificationId)
+ void SystrayNotificationBackend::notificationActivated(SystemTray::ActivationReason reason)
+ {
+ if (reason == SystemTray::Trigger) {
+- notificationActivated(0);
++ if (_notifications.count())
++ notificationActivated(_notifications.last().notificationId);
++ else
++ GraphicalUi::toggleMainWidget();
+ }
+ }
+
+--
+2.11.1
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-02-21 05:05:56 UTC (rev 213242)
+++ community-i686/PKGBUILD 2017-02-21 05:06:04 UTC (rev 213243)
@@ -1,113 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Vesa Kaihlavirta <vegai at iki.fi>
-
-pkgbase=quassel
-pkgname=('quassel-core' 'quassel-client' 'quassel-client-small' 'quassel-monolithic')
-pkgver=0.12.4
-pkgrel=2
-pkgdesc="Next-generation distributed IRC client"
-arch=('i686' 'x86_64')
-url="http://quassel-irc.org/"
-license=('GPL')
-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)
-sha256sums=('93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d'
- '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
- 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
-
-prepare() {
- cd "${srcdir}"
- mkdir build-{core,client,client-small,mono}
- cd quassel-${pkgver}
-}
-
-_build() (
- cd build-$1
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr/ \
- -DCMAKE_BUILD_TYPE="Release" \
- -DHAVE_SSL=ON \
- -DUSE_QT5=ON \
- "${@:2}" \
- ../quassel-${pkgver}/ \
- -Wno-dev
- make
-)
-
-build() {
- _build core \
- -DWANT_QTCLIENT=OFF \
- -DWANT_MONO=OFF \
- -DWITH_OXYGEN=OFF \
- -DWITH_WEBKIT=OFF
-
- _build client \
- -DWANT_CORE=OFF \
- -DWANT_MONO=OFF \
- -DWITH_KDE=ON
-
- _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 \
- -DWITH_KDE=ON
-}
-
-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=$pkgbase.install
- cd "${srcdir}"/build-core
-
- 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' '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' 'hicolor-icon-theme')
-optdepends=('postgresql: PostgreSQL database support')
-conflicts=('quassel-client' 'quassel-client-small')
- cd "${srcdir}"/build-mono
-
- make DESTDIR="${pkgdir}" install
-}
Copied: quassel/repos/community-i686/PKGBUILD (from rev 213242, quassel/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-02-21 05:06:04 UTC (rev 213243)
@@ -0,0 +1,119 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Vesa Kaihlavirta <vegai at iki.fi>
+
+pkgbase=quassel
+pkgname=('quassel-core' 'quassel-client' 'quassel-client-small' 'quassel-monolithic')
+pkgver=0.12.4
+pkgrel=3
+pkgdesc="Next-generation distributed IRC client"
+arch=('i686' 'x86_64')
+url="http://quassel-irc.org/"
+license=('GPL')
+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
+ 0001-Fix-handling-systray-notifications.patch
+ $pkgbase.service
+ $pkgbase.conf)
+sha256sums=('93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d'
+ '5a465f33c5f233983a12139a1a121665c4ddab9e205997daa453dcffd255156a'
+ '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
+ 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
+
+prepare() {
+ cd "${srcdir}"
+ mkdir build-{core,client,client-small,mono}
+ cd quassel-${pkgver}
+
+ # Fix handling systray notifications
+ # https://github.com/quassel/quassel/pull/272
+ patch -Np1 -i ../0001-Fix-handling-systray-notifications.patch
+}
+
+_build() (
+ cd build-$1
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr/ \
+ -DCMAKE_BUILD_TYPE="Release" \
+ -DHAVE_SSL=ON \
+ -DUSE_QT5=ON \
+ "${@:2}" \
+ ../quassel-${pkgver}/ \
+ -Wno-dev
+ make
+)
+
+build() {
+ _build core \
+ -DWANT_QTCLIENT=OFF \
+ -DWANT_MONO=OFF \
+ -DWITH_OXYGEN=OFF \
+ -DWITH_WEBKIT=OFF
+
+ _build client \
+ -DWANT_CORE=OFF \
+ -DWANT_MONO=OFF \
+ -DWITH_KDE=ON
+
+ _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 \
+ -DWITH_KDE=ON
+}
+
+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=$pkgbase.install
+ cd "${srcdir}"/build-core
+
+ 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' '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' 'hicolor-icon-theme')
+optdepends=('postgresql: PostgreSQL database support')
+conflicts=('quassel-client' 'quassel-client-small')
+ cd "${srcdir}"/build-mono
+
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-i686/quassel.conf
===================================================================
--- community-i686/quassel.conf 2017-02-21 05:05:56 UTC (rev 213242)
+++ community-i686/quassel.conf 2017-02-21 05:06:04 UTC (rev 213243)
@@ -1,2 +0,0 @@
-QUASSEL_USER=quassel
-LISTEN=127.0.0.1
Copied: quassel/repos/community-i686/quassel.conf (from rev 213242, quassel/trunk/quassel.conf)
===================================================================
--- community-i686/quassel.conf (rev 0)
+++ community-i686/quassel.conf 2017-02-21 05:06:04 UTC (rev 213243)
@@ -0,0 +1,2 @@
+QUASSEL_USER=quassel
+LISTEN=127.0.0.1
Deleted: community-i686/quassel.install
===================================================================
--- community-i686/quassel.install 2017-02-21 05:05:56 UTC (rev 213242)
+++ community-i686/quassel.install 2017-02-21 05:06:04 UTC (rev 213243)
@@ -1,4 +0,0 @@
-post_install() {
- 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
-}
Copied: quassel/repos/community-i686/quassel.install (from rev 213242, quassel/trunk/quassel.install)
===================================================================
--- community-i686/quassel.install (rev 0)
+++ community-i686/quassel.install 2017-02-21 05:06:04 UTC (rev 213243)
@@ -0,0 +1,4 @@
+post_install() {
+ 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
+}
Deleted: community-i686/quassel.service
===================================================================
--- community-i686/quassel.service 2017-02-21 05:05:56 UTC (rev 213242)
+++ community-i686/quassel.service 2017-02-21 05:06:04 UTC (rev 213243)
@@ -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 213242, quassel/trunk/quassel.service)
===================================================================
--- community-i686/quassel.service (rev 0)
+++ community-i686/quassel.service 2017-02-21 05:06:04 UTC (rev 213243)
@@ -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
Copied: quassel/repos/community-x86_64/0001-Fix-handling-systray-notifications.patch (from rev 213242, quassel/trunk/0001-Fix-handling-systray-notifications.patch)
===================================================================
--- community-x86_64/0001-Fix-handling-systray-notifications.patch (rev 0)
+++ community-x86_64/0001-Fix-handling-systray-notifications.patch 2017-02-21 05:06:04 UTC (rev 213243)
@@ -0,0 +1,56 @@
+From 38112a9e19283aa6768df9af14503ccbe09fe5b0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= <ballogyor at gmail.com>
+Date: Thu, 16 Feb 2017 08:41:08 +0100
+Subject: [PATCH] Fix handling systray notifications
+
+Only toggle/activate the main window if the notification message comes from quassel.
+
+This fixes the problem that Quassel's main window is opened when the user clicks on any notification bubbles from other applications.
+---
+ src/qtui/systraynotificationbackend.cpp | 22 +++++++++++++---------
+ 1 file changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp
+index b0b7be62..d96000e1 100644
+--- a/src/qtui/systraynotificationbackend.cpp
++++ b/src/qtui/systraynotificationbackend.cpp
+@@ -92,15 +92,16 @@ void SystrayNotificationBackend::close(uint notificationId)
+ void SystrayNotificationBackend::notificationActivated(uint notificationId)
+ {
+ if (!_blockActivation) {
+- if (_notifications.count()) {
+- if (QtUi::mainWindow()->systemTray()->mode() == SystemTray::Legacy)
+- _blockActivation = true; // prevent double activation because both tray icon and bubble might send a signal
+- if (!notificationId)
+- notificationId = _notifications.count() ? _notifications.last().notificationId : 0;
+- emit activated(notificationId);
++ QList<Notification>::iterator i = _notifications.begin();
++ while (i != _notifications.end()) {
++ if (i->notificationId == notificationId) {
++ if (QtUi::mainWindow()->systemTray()->mode() == SystemTray::Legacy)
++ _blockActivation = true; // prevent double activation because both tray icon and bubble might send a signal
++ emit activated(notificationId);
++ break;
++ }
++ ++i;
+ }
+- else
+- GraphicalUi::toggleMainWidget();
+ }
+ }
+
+@@ -108,7 +109,10 @@ void SystrayNotificationBackend::notificationActivated(uint notificationId)
+ void SystrayNotificationBackend::notificationActivated(SystemTray::ActivationReason reason)
+ {
+ if (reason == SystemTray::Trigger) {
+- notificationActivated(0);
++ if (_notifications.count())
++ notificationActivated(_notifications.last().notificationId);
++ else
++ GraphicalUi::toggleMainWidget();
+ }
+ }
+
+--
+2.11.1
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-02-21 05:05:56 UTC (rev 213242)
+++ community-x86_64/PKGBUILD 2017-02-21 05:06:04 UTC (rev 213243)
@@ -1,113 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Vesa Kaihlavirta <vegai at iki.fi>
-
-pkgbase=quassel
-pkgname=('quassel-core' 'quassel-client' 'quassel-client-small' 'quassel-monolithic')
-pkgver=0.12.4
-pkgrel=2
-pkgdesc="Next-generation distributed IRC client"
-arch=('i686' 'x86_64')
-url="http://quassel-irc.org/"
-license=('GPL')
-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)
-sha256sums=('93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d'
- '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
- 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
-
-prepare() {
- cd "${srcdir}"
- mkdir build-{core,client,client-small,mono}
- cd quassel-${pkgver}
-}
-
-_build() (
- cd build-$1
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr/ \
- -DCMAKE_BUILD_TYPE="Release" \
- -DHAVE_SSL=ON \
- -DUSE_QT5=ON \
- "${@:2}" \
- ../quassel-${pkgver}/ \
- -Wno-dev
- make
-)
-
-build() {
- _build core \
- -DWANT_QTCLIENT=OFF \
- -DWANT_MONO=OFF \
- -DWITH_OXYGEN=OFF \
- -DWITH_WEBKIT=OFF
-
- _build client \
- -DWANT_CORE=OFF \
- -DWANT_MONO=OFF \
- -DWITH_KDE=ON
-
- _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 \
- -DWITH_KDE=ON
-}
-
-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=$pkgbase.install
- cd "${srcdir}"/build-core
-
- 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' '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' 'hicolor-icon-theme')
-optdepends=('postgresql: PostgreSQL database support')
-conflicts=('quassel-client' 'quassel-client-small')
- cd "${srcdir}"/build-mono
-
- make DESTDIR="${pkgdir}" install
-}
Copied: quassel/repos/community-x86_64/PKGBUILD (from rev 213242, quassel/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-02-21 05:06:04 UTC (rev 213243)
@@ -0,0 +1,119 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Vesa Kaihlavirta <vegai at iki.fi>
+
+pkgbase=quassel
+pkgname=('quassel-core' 'quassel-client' 'quassel-client-small' 'quassel-monolithic')
+pkgver=0.12.4
+pkgrel=3
+pkgdesc="Next-generation distributed IRC client"
+arch=('i686' 'x86_64')
+url="http://quassel-irc.org/"
+license=('GPL')
+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
+ 0001-Fix-handling-systray-notifications.patch
+ $pkgbase.service
+ $pkgbase.conf)
+sha256sums=('93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d'
+ '5a465f33c5f233983a12139a1a121665c4ddab9e205997daa453dcffd255156a'
+ '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
+ 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
+
+prepare() {
+ cd "${srcdir}"
+ mkdir build-{core,client,client-small,mono}
+ cd quassel-${pkgver}
+
+ # Fix handling systray notifications
+ # https://github.com/quassel/quassel/pull/272
+ patch -Np1 -i ../0001-Fix-handling-systray-notifications.patch
+}
+
+_build() (
+ cd build-$1
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr/ \
+ -DCMAKE_BUILD_TYPE="Release" \
+ -DHAVE_SSL=ON \
+ -DUSE_QT5=ON \
+ "${@:2}" \
+ ../quassel-${pkgver}/ \
+ -Wno-dev
+ make
+)
+
+build() {
+ _build core \
+ -DWANT_QTCLIENT=OFF \
+ -DWANT_MONO=OFF \
+ -DWITH_OXYGEN=OFF \
+ -DWITH_WEBKIT=OFF
+
+ _build client \
+ -DWANT_CORE=OFF \
+ -DWANT_MONO=OFF \
+ -DWITH_KDE=ON
+
+ _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 \
+ -DWITH_KDE=ON
+}
+
+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=$pkgbase.install
+ cd "${srcdir}"/build-core
+
+ 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' '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' 'hicolor-icon-theme')
+optdepends=('postgresql: PostgreSQL database support')
+conflicts=('quassel-client' 'quassel-client-small')
+ cd "${srcdir}"/build-mono
+
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-x86_64/quassel.conf
===================================================================
--- community-x86_64/quassel.conf 2017-02-21 05:05:56 UTC (rev 213242)
+++ community-x86_64/quassel.conf 2017-02-21 05:06:04 UTC (rev 213243)
@@ -1,2 +0,0 @@
-QUASSEL_USER=quassel
-LISTEN=127.0.0.1
Copied: quassel/repos/community-x86_64/quassel.conf (from rev 213242, quassel/trunk/quassel.conf)
===================================================================
--- community-x86_64/quassel.conf (rev 0)
+++ community-x86_64/quassel.conf 2017-02-21 05:06:04 UTC (rev 213243)
@@ -0,0 +1,2 @@
+QUASSEL_USER=quassel
+LISTEN=127.0.0.1
Deleted: community-x86_64/quassel.install
===================================================================
--- community-x86_64/quassel.install 2017-02-21 05:05:56 UTC (rev 213242)
+++ community-x86_64/quassel.install 2017-02-21 05:06:04 UTC (rev 213243)
@@ -1,4 +0,0 @@
-post_install() {
- 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
-}
Copied: quassel/repos/community-x86_64/quassel.install (from rev 213242, quassel/trunk/quassel.install)
===================================================================
--- community-x86_64/quassel.install (rev 0)
+++ community-x86_64/quassel.install 2017-02-21 05:06:04 UTC (rev 213243)
@@ -0,0 +1,4 @@
+post_install() {
+ 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
+}
Deleted: community-x86_64/quassel.service
===================================================================
--- community-x86_64/quassel.service 2017-02-21 05:05:56 UTC (rev 213242)
+++ community-x86_64/quassel.service 2017-02-21 05:06:04 UTC (rev 213243)
@@ -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 213242, quassel/trunk/quassel.service)
===================================================================
--- community-x86_64/quassel.service (rev 0)
+++ community-x86_64/quassel.service 2017-02-21 05:06:04 UTC (rev 213243)
@@ -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