[arch-commits] Commit in quassel/repos/community-x86_64 (11 files)
Jan Steffens
heftig at archlinux.org
Thu Apr 26 16:18:42 UTC 2018
Date: Thursday, April 26, 2018 @ 16:18:42
Author: heftig
Revision: 318163
archrelease: copy trunk to community-x86_64
Added:
quassel/repos/community-x86_64/PKGBUILD
(from rev 318162, quassel/trunk/PKGBUILD)
quassel/repos/community-x86_64/quassel.conf
(from rev 318162, quassel/trunk/quassel.conf)
quassel/repos/community-x86_64/quassel.service
(from rev 318162, quassel/trunk/quassel.service)
quassel/repos/community-x86_64/quassel.sysusers
(from rev 318162, quassel/trunk/quassel.sysusers)
quassel/repos/community-x86_64/quassel.tmpfiles
(from rev 318162, quassel/trunk/quassel.tmpfiles)
Deleted:
quassel/repos/community-x86_64/0001-Fix-handling-systray-notifications.patch
quassel/repos/community-x86_64/PKGBUILD
quassel/repos/community-x86_64/quassel.conf
quassel/repos/community-x86_64/quassel.service
quassel/repos/community-x86_64/quassel.sysusers
quassel/repos/community-x86_64/quassel.tmpfiles
-----------------------------------------------+
0001-Fix-handling-systray-notifications.patch | 56 -----
PKGBUILD | 244 +++++++++++-------------
quassel.conf | 4
quassel.service | 28 +-
quassel.sysusers | 2
quassel.tmpfiles | 2
6 files changed, 136 insertions(+), 200 deletions(-)
Deleted: 0001-Fix-handling-systray-notifications.patch
===================================================================
--- 0001-Fix-handling-systray-notifications.patch 2018-04-26 16:16:21 UTC (rev 318162)
+++ 0001-Fix-handling-systray-notifications.patch 2018-04-26 16:18:42 UTC (rev 318163)
@@ -1,56 +0,0 @@
-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: PKGBUILD
===================================================================
--- PKGBUILD 2018-04-26 16:16:21 UTC (rev 318162)
+++ PKGBUILD 2018-04-26 16:18:42 UTC (rev 318163)
@@ -1,126 +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=4
-pkgdesc="Next-generation distributed IRC client"
-arch=('x86_64')
-url="https://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=(https://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2
- 0001-Fix-handling-systray-notifications.patch
- $pkgbase.service
- $pkgbase.sysusers
- $pkgbase.tmpfiles
- $pkgbase.conf)
-sha256sums=('93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d'
- '5a465f33c5f233983a12139a1a121665c4ddab9e205997daa453dcffd255156a'
- '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
- '3c72441a99e2668c6a8a751fa07beeb44f937576c8a1b5f615e4a55f841d93d9'
- '2afd4340c7713f6533e5d175a86b28fd118ecd907776c2b10925d1a4fb31cdca'
- '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)
- cd "${srcdir}"/build-core
-
- make DESTDIR="${pkgdir}" install
-
- # Remove unneeded pixmap icons
- rm -r "${pkgdir}"/usr/share
-
- install -Dm644 "${srcdir}"/$pkgbase.sysusers \
- "${pkgdir}"/usr/lib/sysusers.d/$pkgbase.conf
- install -Dm644 "${srcdir}"/$pkgbase.tmpfiles \
- "${pkgdir}"/usr/lib/tmpfiles.d/$pkgbase.conf
- 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 318162, quassel/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-04-26 16:18:42 UTC (rev 318163)
@@ -0,0 +1,118 @@
+# $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.5
+pkgrel=1
+pkgdesc="Next-generation distributed IRC client"
+arch=('x86_64')
+url="https://quassel-irc.org/"
+license=('GPL')
+makedepends=('qt5-base' 'qt5-tools' 'qt5-webengine' 'qca-qt5' 'qt5-script'
+ 'knotifyconfig' 'cmake' 'extra-cmake-modules' 'python'
+ 'hicolor-icon-theme' 'ninja')
+source=(https://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2
+ $pkgbase.service
+ $pkgbase.sysusers
+ $pkgbase.tmpfiles
+ $pkgbase.conf)
+sha256sums=('1894574dfd79654152a5b7427e7df592b055ae908230504f98a4cb48961e74e2'
+ '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
+ '3c72441a99e2668c6a8a751fa07beeb44f937576c8a1b5f615e4a55f841d93d9'
+ '2afd4340c7713f6533e5d175a86b28fd118ecd907776c2b10925d1a4fb31cdca'
+ 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
+
+prepare() {
+ cd quassel-${pkgver}
+}
+
+_build() (
+ mkdir -p build-$1
+ cd build-$1
+ cmake -G Ninja ../quassel-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr/ \
+ -DCMAKE_BUILD_TYPE="Release" \
+ -DHAVE_SSL=ON \
+ -DUSE_QT5=ON \
+ "${@:2}" \
+ -Wno-dev
+ cmake --build .
+)
+
+_install() {
+ DESTDIR="${pkgdir}" cmake --build build-$1 --target install
+}
+
+build() {
+ _build core \
+ -DWANT_QTCLIENT=OFF \
+ -DWANT_MONO=OFF \
+ -DWITH_OXYGEN=OFF \
+ -DWITH_WEBENGINE=OFF
+
+ _build client \
+ -DWANT_CORE=OFF \
+ -DWANT_MONO=OFF \
+ -DWITH_KDE=ON
+
+ _build client-small \
+ -DWANT_CORE=OFF \
+ -DWANT_MONO=OFF \
+ -DWITH_WEBENGINE=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 core
+
+ # Remove unneeded pixmap icons
+ rm -r "${pkgdir}"/usr/share
+
+ install -Dm644 $pkgbase.sysusers \
+ "${pkgdir}"/usr/lib/sysusers.d/$pkgbase.conf
+ install -Dm644 $pkgbase.tmpfiles \
+ "${pkgdir}"/usr/lib/tmpfiles.d/$pkgbase.conf
+ install -Dm644 $pkgbase.service \
+ "${pkgdir}"/usr/lib/systemd/system/$pkgbase.service
+ install -Dm644 $pkgbase.conf \
+ "${pkgdir}"/etc/conf.d/$pkgbase
+}
+
+package_quassel-client() {
+pkgdesc="Next-generation distributed IRC client - client only"
+depends=('qt5-base' 'qt5-webengine' 'knotifyconfig' 'hicolor-icon-theme')
+conflicts=('quassel-monolithic' 'quassel-client-small')
+
+ _install client
+}
+
+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')
+
+ _install client-small
+}
+
+package_quassel-monolithic() {
+pkgdesc="Next-generation distributed IRC client - monolithic"
+depends=('qt5-base' 'qca-qt5' 'qt5-webengine' 'qt5-script' 'knotifyconfig' 'hicolor-icon-theme')
+optdepends=('postgresql: PostgreSQL database support')
+conflicts=('quassel-client' 'quassel-client-small')
+
+ _install mono
+}
Deleted: quassel.conf
===================================================================
--- quassel.conf 2018-04-26 16:16:21 UTC (rev 318162)
+++ quassel.conf 2018-04-26 16:18:42 UTC (rev 318163)
@@ -1,2 +0,0 @@
-QUASSEL_USER=quassel
-LISTEN=127.0.0.1
Copied: quassel/repos/community-x86_64/quassel.conf (from rev 318162, quassel/trunk/quassel.conf)
===================================================================
--- quassel.conf (rev 0)
+++ quassel.conf 2018-04-26 16:18:42 UTC (rev 318163)
@@ -0,0 +1,2 @@
+QUASSEL_USER=quassel
+LISTEN=127.0.0.1
Deleted: quassel.service
===================================================================
--- quassel.service 2018-04-26 16:16:21 UTC (rev 318162)
+++ quassel.service 2018-04-26 16:18:42 UTC (rev 318163)
@@ -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 318162, quassel/trunk/quassel.service)
===================================================================
--- quassel.service (rev 0)
+++ quassel.service 2018-04-26 16:18:42 UTC (rev 318163)
@@ -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: quassel.sysusers
===================================================================
--- quassel.sysusers 2018-04-26 16:16:21 UTC (rev 318162)
+++ quassel.sysusers 2018-04-26 16:18:42 UTC (rev 318163)
@@ -1 +0,0 @@
-u quassel - - /var/lib/quassel
Copied: quassel/repos/community-x86_64/quassel.sysusers (from rev 318162, quassel/trunk/quassel.sysusers)
===================================================================
--- quassel.sysusers (rev 0)
+++ quassel.sysusers 2018-04-26 16:18:42 UTC (rev 318163)
@@ -0,0 +1 @@
+u quassel - - /var/lib/quassel
Deleted: quassel.tmpfiles
===================================================================
--- quassel.tmpfiles 2018-04-26 16:16:21 UTC (rev 318162)
+++ quassel.tmpfiles 2018-04-26 16:18:42 UTC (rev 318163)
@@ -1 +0,0 @@
-d /var/lib/quassel - quassel quassel - -
Copied: quassel/repos/community-x86_64/quassel.tmpfiles (from rev 318162, quassel/trunk/quassel.tmpfiles)
===================================================================
--- quassel.tmpfiles (rev 0)
+++ quassel.tmpfiles 2018-04-26 16:18:42 UTC (rev 318163)
@@ -0,0 +1 @@
+d /var/lib/quassel - quassel quassel - -
More information about the arch-commits
mailing list