[arch-commits] Commit in quassel/repos/community-x86_64 (11 files)
Jan Steffens
heftig at archlinux.org
Fri Mar 22 23:47:29 UTC 2019
Date: Friday, March 22, 2019 @ 23:47:28
Author: heftig
Revision: 443207
archrelease: copy trunk to community-x86_64
Added:
quassel/repos/community-x86_64/0001-qtui-Set-desktop-file-name.patch
(from rev 443206, quassel/trunk/0001-qtui-Set-desktop-file-name.patch)
quassel/repos/community-x86_64/PKGBUILD
(from rev 443206, quassel/trunk/PKGBUILD)
quassel/repos/community-x86_64/quassel.conf
(from rev 443206, quassel/trunk/quassel.conf)
quassel/repos/community-x86_64/quassel.service
(from rev 443206, quassel/trunk/quassel.service)
quassel/repos/community-x86_64/quassel.sysusers
(from rev 443206, quassel/trunk/quassel.sysusers)
quassel/repos/community-x86_64/quassel.tmpfiles
(from rev 443206, quassel/trunk/quassel.tmpfiles)
Deleted:
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-qtui-Set-desktop-file-name.patch | 50 ++++++
PKGBUILD | 246 ++++++++++++++++----------------
quassel.conf | 4
quassel.service | 28 +--
quassel.sysusers | 2
quassel.tmpfiles | 2
6 files changed, 192 insertions(+), 140 deletions(-)
Copied: quassel/repos/community-x86_64/0001-qtui-Set-desktop-file-name.patch (from rev 443206, quassel/trunk/0001-qtui-Set-desktop-file-name.patch)
===================================================================
--- 0001-qtui-Set-desktop-file-name.patch (rev 0)
+++ 0001-qtui-Set-desktop-file-name.patch 2019-03-22 23:47:28 UTC (rev 443207)
@@ -0,0 +1,50 @@
+From 919ac3d7184faee0ccfa7fe65c6635a7dcf5d234 Mon Sep 17 00:00:00 2001
+Message-Id: <919ac3d7184faee0ccfa7fe65c6635a7dcf5d234.1553291431.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Fri, 22 Mar 2019 22:37:22 +0100
+Subject: [PATCH] qtui: Set desktop file name
+
+The XCB platform plugin defaults the WM class to the executable name,
+which already matches our desktop file name. Unfortunately, the Wayland
+platform plugin prepends the inverted organization domain, resulting in
+an app ID of "org.quassel-irc.quasselclient", thus breaking the
+association.
+
+Set the desktop file name explicitly so the Wayland platform doesn't get
+confused.
+---
+ src/qtui/monoapplication.cpp | 3 +++
+ src/qtui/qtuiapplication.cpp | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
+index 809f1147..3f60523f 100644
+--- a/src/qtui/monoapplication.cpp
++++ b/src/qtui/monoapplication.cpp
+@@ -32,6 +32,9 @@ MonolithicApplication::MonolithicApplication(int &argc, char **argv)
+ : QtUiApplication(argc, argv)
+ {
+ Quassel::setRunMode(Quassel::Monolithic);
++#if QT_VERSION >= 0x050700
++ QGuiApplication::setDesktopFileName(Quassel::buildInfo().applicationName + ".desktop");
++#endif
+ }
+
+
+diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp
+index e5b0b773..989a1961 100644
+--- a/src/qtui/qtuiapplication.cpp
++++ b/src/qtui/qtuiapplication.cpp
+@@ -92,6 +92,9 @@ QtUiApplication::QtUiApplication(int &argc, char **argv)
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
+ QGuiApplication::setFallbackSessionManagementEnabled(false);
+ #endif
++#if QT_VERSION >= 0x050700
++ QGuiApplication::setDesktopFileName(Quassel::buildInfo().clientApplicationName + ".desktop");
++#endif
+ }
+
+
+--
+2.21.0
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-03-22 23:39:30 UTC (rev 443206)
+++ PKGBUILD 2019-03-22 23:47:28 UTC (rev 443207)
@@ -1,122 +0,0 @@
-# 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.13.1
-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'
- 'qt5-multimedia' 'knotifyconfig' 'sonnet' 'libldap' '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=('48efee9778743b1db9f44efb91d1c913104db01190c57f2ff57483c39a97e855'
- '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
- '3c72441a99e2668c6a8a751fa07beeb44f937576c8a1b5f615e4a55f841d93d9'
- '2afd4340c7713f6533e5d175a86b28fd118ecd907776c2b10925d1a4fb31cdca'
- 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
-
-prepare() {
- cd $pkgbase-$pkgver
-}
-
-_build() (
- mkdir -p build-$1
- cd build-$1
- cmake -G Ninja ../$pkgbase-$pkgver \
- -DCMAKE_INSTALL_PREFIX=/usr/ \
- -DCMAKE_BUILD_TYPE=Release \
- -DHAVE_SSL=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_BUNDLED_ICONS=OFF \
- -DWITH_WEBENGINE=OFF
-
- _build monolithic \
- -DWANT_CORE=OFF \
- -DWANT_QTCLIENT=OFF \
- -DWITH_KDE=ON
-
- _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_Qt5Multimedia=ON \
- -DCMAKE_DISABLE_FIND_PACKAGE_Phonon4Qt5=ON
-}
-
-package_quassel-core() {
-pkgdesc="Next-generation distributed IRC client - core only"
-depends=('icu' 'qca-qt5' 'qt5-script' 'libldap')
-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' 'qt5-multimedia' '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' 'qt5-svg' 'sonnet' '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' 'qt5-webengine' 'qt5-multimedia' 'qt5-script' 'qca-qt5'
- 'knotifyconfig' 'libldap' 'hicolor-icon-theme')
-optdepends=('postgresql: PostgreSQL database support')
-conflicts=('quassel-client' 'quassel-client-small')
-
- _install monolithic
-}
Copied: quassel/repos/community-x86_64/PKGBUILD (from rev 443206, quassel/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-03-22 23:47:28 UTC (rev 443207)
@@ -0,0 +1,124 @@
+# 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.13.1
+pkgrel=2
+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'
+ 'qt5-multimedia' 'knotifyconfig' 'sonnet' 'libldap' 'cmake'
+ 'extra-cmake-modules' 'python' 'hicolor-icon-theme')
+source=(https://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2
+ 0001-qtui-Set-desktop-file-name.patch
+ $pkgbase.service
+ $pkgbase.sysusers
+ $pkgbase.tmpfiles
+ $pkgbase.conf)
+sha256sums=('48efee9778743b1db9f44efb91d1c913104db01190c57f2ff57483c39a97e855'
+ '695ff3b605ea62ccfdf9ec4b9e6ffa74f3e2c0ac81402d51a74d263c47886c92'
+ '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
+ '3c72441a99e2668c6a8a751fa07beeb44f937576c8a1b5f615e4a55f841d93d9'
+ '2afd4340c7713f6533e5d175a86b28fd118ecd907776c2b10925d1a4fb31cdca'
+ 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
+
+prepare() {
+ cd $pkgbase-$pkgver
+ patch -Np1 -i ../0001-qtui-Set-desktop-file-name.patch
+}
+
+_build() (
+ cmake -H$pkgbase-$pkgver -Bbuild-$1 \
+ -DCMAKE_INSTALL_PREFIX=/usr/ \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-suggest-override" \
+ -DHAVE_SSL=ON \
+ "${@:2}" \
+ -Wno-dev
+ cmake --build build-$1
+)
+
+_install() {
+ DESTDIR="${pkgdir}" cmake --build build-$1 --target install
+}
+
+build() {
+ _build core \
+ -DWANT_QTCLIENT=OFF \
+ -DWANT_MONO=OFF \
+ -DWITH_BUNDLED_ICONS=OFF \
+ -DWITH_WEBENGINE=OFF
+
+ _build monolithic \
+ -DWANT_CORE=OFF \
+ -DWANT_QTCLIENT=OFF \
+ -DWITH_KDE=ON
+
+ _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_Qt5Multimedia=ON \
+ -DCMAKE_DISABLE_FIND_PACKAGE_Phonon4Qt5=ON
+}
+
+package_quassel-core() {
+pkgdesc="Next-generation distributed IRC client - core only"
+depends=('icu' 'qca-qt5' 'qt5-script' 'libldap')
+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' 'qt5-multimedia' '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' 'qt5-svg' 'sonnet' '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' 'qt5-webengine' 'qt5-multimedia' 'qt5-script' 'qca-qt5'
+ 'knotifyconfig' 'libldap' 'hicolor-icon-theme')
+optdepends=('postgresql: PostgreSQL database support')
+conflicts=('quassel-client' 'quassel-client-small')
+
+ _install monolithic
+}
Deleted: quassel.conf
===================================================================
--- quassel.conf 2019-03-22 23:39:30 UTC (rev 443206)
+++ quassel.conf 2019-03-22 23:47:28 UTC (rev 443207)
@@ -1,2 +0,0 @@
-QUASSEL_USER=quassel
-LISTEN=127.0.0.1
Copied: quassel/repos/community-x86_64/quassel.conf (from rev 443206, quassel/trunk/quassel.conf)
===================================================================
--- quassel.conf (rev 0)
+++ quassel.conf 2019-03-22 23:47:28 UTC (rev 443207)
@@ -0,0 +1,2 @@
+QUASSEL_USER=quassel
+LISTEN=127.0.0.1
Deleted: quassel.service
===================================================================
--- quassel.service 2019-03-22 23:39:30 UTC (rev 443206)
+++ quassel.service 2019-03-22 23:47:28 UTC (rev 443207)
@@ -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 443206, quassel/trunk/quassel.service)
===================================================================
--- quassel.service (rev 0)
+++ quassel.service 2019-03-22 23:47:28 UTC (rev 443207)
@@ -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 2019-03-22 23:39:30 UTC (rev 443206)
+++ quassel.sysusers 2019-03-22 23:47:28 UTC (rev 443207)
@@ -1 +0,0 @@
-u quassel - - /var/lib/quassel
Copied: quassel/repos/community-x86_64/quassel.sysusers (from rev 443206, quassel/trunk/quassel.sysusers)
===================================================================
--- quassel.sysusers (rev 0)
+++ quassel.sysusers 2019-03-22 23:47:28 UTC (rev 443207)
@@ -0,0 +1 @@
+u quassel - - /var/lib/quassel
Deleted: quassel.tmpfiles
===================================================================
--- quassel.tmpfiles 2019-03-22 23:39:30 UTC (rev 443206)
+++ quassel.tmpfiles 2019-03-22 23:47:28 UTC (rev 443207)
@@ -1 +0,0 @@
-d /var/lib/quassel - quassel quassel - -
Copied: quassel/repos/community-x86_64/quassel.tmpfiles (from rev 443206, quassel/trunk/quassel.tmpfiles)
===================================================================
--- quassel.tmpfiles (rev 0)
+++ quassel.tmpfiles 2019-03-22 23:47:28 UTC (rev 443207)
@@ -0,0 +1 @@
+d /var/lib/quassel - quassel quassel - -
More information about the arch-commits
mailing list