summaryrefslogtreecommitdiff
path: root/net-irc
diff options
context:
space:
mode:
Diffstat (limited to 'net-irc')
-rw-r--r--net-irc/Manifest.gzbin7903 -> 7901 bytes
-rw-r--r--net-irc/quassel/Manifest4
-rw-r--r--net-irc/quassel/files/quassel-0.14.0-fix-notifyrc.patch101
-rw-r--r--net-irc/quassel/quassel-0.14.0-r4.ebuild209
-rw-r--r--net-irc/quassel/quassel-9999.ebuild7
5 files changed, 316 insertions, 5 deletions
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 17cb0119bf04..8e8b29b0bcd5 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
Binary files differ
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 32e3cfce45f8..ac197bdc8fea 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -2,11 +2,13 @@ AUX quassel-0.14.0-cxxflags.patch 1305 BLAKE2B 241a51092d5f6528bb781cf83de0cb5ef
AUX quassel-0.14.0-fix-desktop-application-name.patch 2561 BLAKE2B 88de02486d603f3e3b6ea660c274fd20a0958db923bc0f9b43a61a853357e08d45c7a25f6de1edc0b30facb87d62393e376512bbdbb1d4054d0ee546da01ca49 SHA512 755cda84547a018bbaa5ab17389b5a181fb81c6513acf7bdf7552d0f702da800161879c037819b8077005781ebf91d38dbd5a143929199135e98e41bd67c197a
AUX quassel-0.14.0-fix-exec-script.patch 1318 BLAKE2B 3372b38837f0812f5542240bafe3914d9e2fa843677c0f41d35b996c04c0a718e63ed7594ae7a1d846db5dbaef3c33539a08e01eb6821eb4ec924e1b9fdebabf SHA512 4039addf500f4085b4fca318e875e1a10f10c0c6b1fe5454eb272b76d3090db3f97406929136c8f5a85f0950ecdc266eef7cd5ca0f86d7963a604ceae55f645b
AUX quassel-0.14.0-fix-mpris-script.patch 2171 BLAKE2B fdf15ee3e36f93c5c8642498c7a2961dfb4ffb1ba3921afbe0a6638c281ccd97c2c40bbd6efbbfac653fe88a376b0962dd72ef90aaf0b753bfe97ad6cbe8acc1 SHA512 be560a22a41c16753790767ddd7e28bb752d1e4f2bb7f5623959614eb99ce562c9de33e6ba1f55b234986946c5ca244f78759bb371a4da79ea1ec39b84176d83
+AUX quassel-0.14.0-fix-notifyrc.patch 4350 BLAKE2B d06bc382e68661c6caf4c0f0174af18b49718db6e359818ce2d855df97467b38114fcd5218102684fc8728faad16bcb1a3aca1dd42cc7111ba12c0403b2a64ba SHA512 6ac3efd4a8a42a0350f827db1fb333f3b5193dcb509c7a86f1dd52fb84539009241848d27a52e6bf3cab71ca681584d1d99ab74172cfc9ddb8b41e6b6ed90ee8
AUX quassel.logrotate 105 BLAKE2B 16a8b32885a77817d39f14deb7d1cf2cb7788c9ecd6d179efc10d72bae688537fd063930b24f570b18f4312d600b1810f1b262c6b36f6b5990f20c1ebb699d72 SHA512 60371b4046c3c20c06d01f9cbf3f8465b40c9a989f392ed3e5a4724deff71960015eeb1707817af256618be8085b2aa5809377fec8cfae59e6b8fc958317e780
AUX quasselcore.conf-r1 333 BLAKE2B 67586dc8a62e94131d11d81502f09387026f98b7452a501c5048904867382ac8bbc133ab3c7fd84751f8b8b5c9a0037dba0d862209515004773241bd546cd6ff SHA512 7d3f320b5d5c9cc27db399a5460ea37f33688d523340d4509ebd2fcf20620b43d4b1a05cdb91fa07931798b18a2bdcee9f4f29c75e867bd4b5a7f170cd02ba90
AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c350ac3356b1e92859786a242da52103acb4692bd32d647983d2b5a758b847db66041791dac5bf531cf448a SHA512 6b050c6bafa2c49ab92f8e7c77be3c6868b58040b4df8b2cc3bbc217c4bf9d69fa63a7efe9e1c9e3b055de170d79af6470fa58828c5291e0b3d6b6eb7044aff3
AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
DIST quassel-0.14.0.tar.bz2 4774297 BLAKE2B c17c64a2ed6c414c94c12b2fa0b8abf40810608e3e4f35df19db597444e09594efc9569c65855c3df5e2c211c2d65a46482f20c3d912c87140c66fa4f022b3b8 SHA512 ea6b9723acab5ce73f760692770c1340c03bf277d2c99a2520345bfb6a7bb6fdc64a01dccfd7026341b46ee727821e1bcc2f487be72dfbc155f1de1ad264763f
EBUILD quassel-0.14.0-r3.ebuild 5148 BLAKE2B f65fabcdedc45b8cafc88c4bcc322b0a4f3c698ecb0d7444620a388b15714911b3003abadde4e2bb77cd3bbbce0e2d70359d63241ee9c5927a2aa85c2b885bd3 SHA512 d0494b196ebd4903110bfa0cb1c629f57828872078c4043d69e678f1458aa720947ee62197801eb47a6ac2d170431333901ac23a35e2c7afdee5f7171366fb57
-EBUILD quassel-9999.ebuild 4963 BLAKE2B 6bcdf1bdbfacbc6986ce221c52623ce9abbf85c94003098be9d4eedbd024e975f8c0d117782e8e286442109026b286418bf60d50100253ab99e552d8102436a5 SHA512 eb41f9e0913ce96fa93ed4e225486c740e3abad1543866ce1783cfee2a96f82399fca4b074101b0eb04ef89624d8c746e20a59f19bd476b160c70b1c37e18375
+EBUILD quassel-0.14.0-r4.ebuild 5130 BLAKE2B 771c62166472c92c1fa3d1b640b2016057e20e3f593f7911d4adaad1361dd09cf232bfc60f3d2ad3b5d40a1de570c1c05a3f7654571e65f5fece6772c4cf9e8e SHA512 11dca74c11aa3263ab56f4a89dbf1e9483226a5fb867593f7cbd4a6513f59210d7ec735e9fe16c0e1e9e9b6d85d0afa46210e3710a37d5ec49d3ca50b0241ccf
+EBUILD quassel-9999.ebuild 4903 BLAKE2B 5b2de54adf588c2ab092092eab822c31715f413b25471987da54f777311eefb53dba71864e9885a076910f21508d1f9acb15dfb50ba24c825083f13e7646b2f9 SHA512 3314c48221c93286a7d93e5bbfaf270b08dd8e06a248b617ee7d73011153e6844df1f301bcd22ded93509a20ca94d27cb65ced883cb196d3cfa64ad74acd8b55
MISC metadata.xml 1726 BLAKE2B 9e1f1068c14889c4dba9823af8d0ce51e4f17ff31d2ecb26d958a2374c214f2bf37d43965eb7c95d2ef41e49fc5ad80ad492526f842a469e4445a2cb1d7c65bf SHA512 cb055903679fcf02002081f0a70e38c5264154fcc08f51824c77364291fd5587f71bfe51bd22b57b8aebf2d3d46165a6f72b35b52da70e0d07aa807e123e4dc9
diff --git a/net-irc/quassel/files/quassel-0.14.0-fix-notifyrc.patch b/net-irc/quassel/files/quassel-0.14.0-fix-notifyrc.patch
new file mode 100644
index 000000000000..e670ef14c22f
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.14.0-fix-notifyrc.patch
@@ -0,0 +1,101 @@
+From f17bfbabb1f2cabfbc312f42e9628fd9905cde2b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= <wolf@oriole.systems>
+Date: Wed, 18 Sep 2024 13:37:36 +0200
+Subject: [PATCH 1/2] uisupport: Use correct application name in KAboutData
+
+In commit 020c1634 (uisupport: fix application name for .desktop shell
+integration, 2023-04-18), a call to setDesktopFileName() was added to
+provide the correct .desktop file name for shell integration. However,
+it also changed the application name from "quassel" to "quasselclient",
+which does not match the application name Quassel sets when not built
+with support for KDE, and breaks integration with KNotifications.
+
+The reason for this is that KNotifications expects the filename of the
+global notification configuration file (quassel.notifyrc) to match the
+application name [1]. With "quasselclient" now set as the application name
+through KAboutData, this is no longer the case, and notifications simply
+do not appear.
+
+Instead, use the previous application name, "quassel". This fixes
+notifications for KDE and does not regress shell integration since we
+still set the correct desktop file name.
+
+[1] https://api.kde.org/frameworks/knotifications/html/index.html
+---
+ src/uisupport/aboutdata.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/uisupport/aboutdata.cpp b/src/uisupport/aboutdata.cpp
+index 380e54a54..afade4d33 100644
+--- a/src/uisupport/aboutdata.cpp
++++ b/src/uisupport/aboutdata.cpp
+@@ -114,7 +114,7 @@ AboutData& AboutData::addCredits(std::initializer_list<AboutPerson> credits)
+
+ KAboutData AboutData::kAboutData() const
+ {
+- KAboutData aboutData(Quassel::buildInfo().clientApplicationName, tr("Quassel IRC"), Quassel::buildInfo().plainVersionString);
++ KAboutData aboutData(Quassel::buildInfo().applicationName, tr("Quassel IRC"), Quassel::buildInfo().plainVersionString);
+ aboutData.addLicense(KAboutLicense::GPL_V2);
+ aboutData.addLicense(KAboutLicense::GPL_V3);
+ aboutData.setShortDescription(tr("A modern, distributed IRC client"));
+
+From 4d6cb4424296e172a95d24f27c1cff54fccde372 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= <wolf@oriole.systems>
+Date: Wed, 18 Sep 2024 14:34:35 +0200
+Subject: [PATCH 2/2] data: Set DesktopEntry correctly in notifyrc
+
+KNotifications requires the DesktopEntry field in notifyrc to match the
+base name of the application's desktop file [1]. Monolithic installs come
+with a "quassel.desktop" file, which matches what is set presently in
+notifyrc. However, client installs come with "quasselclient.desktop",
+and do not match.
+
+To match up these values dynamically, introduce a notifyrc.in template
+containing a placeholder which will be replaced by cmake. Since a system
+can technically have both a monolithic binary and a client installed at
+the same time, and we can't install two separate notifyrc files because
+the application name stays the same throughout, assume the user prefers
+the monolithic install when configured.
+
+[1] https://api.kde.org/frameworks/knotifications/html/index.html
+---
+ data/CMakeLists.txt | 10 +++++++++-
+ data/{quassel.notifyrc => quassel.notifyrc.in} | 2 +-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+ rename data/{quassel.notifyrc => quassel.notifyrc.in} (99%)
+
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index 099d53b09..509e2c554 100644
+--- a/data/CMakeLists.txt
++++ b/data/CMakeLists.txt
+@@ -1,6 +1,14 @@
+ if (BUILD_GUI)
+ if (WITH_KF5)
+- install(FILES quassel.notifyrc DESTINATION ${CMAKE_INSTALL_KNOTIFY5RCDIR})
++ set(DESKTOP_FILE "quasselclient")
++
++ if (WANT_MONO)
++ set(DESKTOP_FILE "quassel")
++ endif()
++
++ configure_file(quassel.notifyrc.in quassel.notifyrc @ONLY)
++
++ install(FILES ${CMAKE_BINARY_DIR}/data/quassel.notifyrc DESTINATION ${CMAKE_INSTALL_KNOTIFY5RCDIR})
+ endif()
+
+ if (UNIX AND NOT APPLE)
+diff --git a/data/quassel.notifyrc b/data/quassel.notifyrc.in
+similarity index 99%
+rename from data/quassel.notifyrc
+rename to data/quassel.notifyrc.in
+index 733b379a7..c20638fbb 100644
+--- a/data/quassel.notifyrc
++++ b/data/quassel.notifyrc.in
+@@ -1,6 +1,6 @@
+ [Global]
+ IconName=quassel
+-DesktopEntry=quassel
++DesktopEntry=@DESKTOP_FILE@
+ Comment=Quassel IRC
+ Comment[ast]=Quassel IRC
+ Comment[ca]=Xat IRC Quassel
diff --git a/net-irc/quassel/quassel-0.14.0-r4.ebuild b/net-irc/quassel/quassel-0.14.0-r4.ebuild
new file mode 100644
index 000000000000..f489415229c9
--- /dev/null
+++ b/net-irc/quassel/quassel-0.14.0-r4.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake optfeature pax-utils systemd xdg-utils
+
+if [[ ${PV} != *9999* ]]; then
+ MY_P=${PN}-${PV/_/-}
+ if [[ ${PV} == *_rc* ]] ; then
+ SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+ else
+ SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+ fi
+ S="${WORKDIR}/${MY_P}"
+else
+ EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" )
+ inherit git-r3
+fi
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
+HOMEPAGE="https://quassel-irc.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bundled-icons crypt +dbus gui kde ldap monolithic oxygen postgres +server spell syslog test"
+
+REQUIRED_USE="
+ || ( gui server monolithic )
+ crypt? ( || ( server monolithic ) )
+ kde? ( dbus spell )
+ ldap? ( || ( server monolithic ) )
+ postgres? ( || ( server monolithic ) )
+ spell? ( || ( gui monolithic ) )
+ syslog? ( || ( server monolithic ) )
+"
+
+RESTRICT="!test? ( test )"
+
+SERVER_DEPEND="
+ acct-group/quassel
+ acct-user/quassel
+ crypt? ( app-crypt/qca:2[ssl] )
+ ldap? ( net-nds/openldap:= )
+ postgres? ( dev-qt/qtsql:5[postgres] )
+ !postgres? (
+ dev-qt/qtsql:5[sqlite]
+ dev-db/sqlite:3[threadsafe(+),-secure-delete]
+ )
+ syslog? ( virtual/logger )
+"
+GUI_DEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtwidgets:5
+ !bundled-icons? (
+ kde-frameworks/breeze-icons:*
+ oxygen? ( kde-frameworks/oxygen-icons:* )
+ )
+ dbus? (
+ >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619
+ dev-qt/qtdbus:5
+ )
+ kde? (
+ kde-frameworks/kconfigwidgets:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/knotifications:5
+ kde-frameworks/knotifyconfig:5
+ kde-frameworks/ktextwidgets:5
+ kde-frameworks/kwidgetsaddons:5
+ kde-frameworks/kxmlgui:5
+ )
+ spell? ( kde-frameworks/sonnet:5 )
+"
+RDEPEND="
+ dev-libs/boost:=
+ dev-qt/qtcore:5
+ dev-qt/qtnetwork:5[ssl]
+ sys-libs/zlib
+ monolithic? (
+ ${SERVER_DEPEND}
+ ${GUI_DEPEND}
+ )
+ !monolithic? (
+ server? ( ${SERVER_DEPEND} )
+ gui? ( ${GUI_DEPEND} )
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-cpp/gtest
+ dev-qt/qttest:5
+ )
+"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ kde-frameworks/extra-cmake-modules:0
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+PATCHES=(
+ "${FILESDIR}/${P}-cxxflags.patch"
+ "${FILESDIR}/${P}-fix-desktop-application-name.patch"
+ "${FILESDIR}/${P}-fix-exec-script.patch"
+ "${FILESDIR}/${P}-fix-mpris-script.patch"
+ "${FILESDIR}/${P}-fix-notifyrc.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_CCACHE=OFF
+ -DCMAKE_SKIP_RPATH=ON
+ -DEMBED_DATA=OFF
+ -DWITH_WEBKIT=OFF
+ -DWITH_BUNDLED_ICONS=$(usex bundled-icons)
+ -DWANT_QTCLIENT=$(usex gui)
+ -DWITH_KDE=$(usex kde)
+ -DWITH_LDAP=$(usex ldap)
+ -DWANT_MONO=$(usex monolithic)
+ -DWITH_OXYGEN_ICONS=$(usex oxygen)
+ -DWANT_CORE=$(usex server)
+ -DBUILD_TESTING=$(usex test)
+ -DWITH_WEBENGINE=OFF # bug 925723
+ )
+
+ # bug #830708
+ if use gui || use monolithic ; then
+ mycmakeargs+=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_LibsnoreQt5=ON
+ $(cmake_use_find_package dbus dbusmenu-qt5)
+ $(cmake_use_find_package dbus Qt5DBus)
+ $(cmake_use_find_package spell KF5Sonnet)
+ )
+ fi
+
+ if use server || use monolithic ; then
+ mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use server ; then
+ # Needs PaX marking, bug #346255
+ pax-mark m "${ED}"/usr/bin/quasselcore
+
+ # Init scripts & systemd unit
+ newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
+ newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
+ systemd_dounit "${FILESDIR}"/quasselcore.service
+
+ # logrotate
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/quassel.logrotate quassel
+ fi
+}
+
+src_test() {
+ LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" cmake_src_test
+}
+
+pkg_postinst() {
+ if use monolithic ; then
+ elog "Information on how to enable SSL support for client/core connections"
+ elog "is available at: https://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support"
+ fi
+
+ if use server ; then
+ einfo "If you want to generate SSL certificate, remember to run:"
+ einfo " emerge --config =${CATEGORY}/${PF}"
+ fi
+
+ if use server || use monolithic ; then
+ optfeature "running Quassel within an ident daemon" "net-misc/oidentd"
+ fi
+
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
+
+pkg_config() {
+ if use server ; then
+ # Generate the pem file only when it does not already exist
+ QUASSEL_DIR="${EROOT}"/var/lib/${PN}
+
+ if [[ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]] ; then
+ einfo "Generating Quassel SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
+ openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
+ -keyout "${QUASSEL_DIR}/quasselCert.pem" \
+ -out "${QUASSEL_DIR}/quasselCert.pem" || die
+
+ # Permissions for the key
+ chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem" || die
+ chmod 400 "${QUASSEL_DIR}/quasselCert.pem" || die
+ else
+ einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
+ einfo "Remove it if you want to create new one."
+ fi
+ fi
+}
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index ceeefc6bbf10..21f66af6ba66 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,7 +24,7 @@ HOMEPAGE="https://quassel-irc.org/"
LICENSE="GPL-3"
SLOT="0"
-IUSE="bundled-icons crypt +dbus gui kde ldap monolithic oxygen postgres +server spell syslog test urlpreview"
+IUSE="bundled-icons crypt +dbus gui kde ldap monolithic oxygen postgres +server spell syslog test"
REQUIRED_USE="
|| ( gui server monolithic )
@@ -72,7 +72,6 @@ GUI_DEPEND="
kde-frameworks/kxmlgui:5
)
spell? ( kde-frameworks/sonnet:5 )
- urlpreview? ( dev-qt/qtwebengine:5[widgets] )
"
RDEPEND="
dev-libs/boost:=
@@ -116,7 +115,7 @@ src_configure() {
-DWITH_OXYGEN_ICONS=$(usex oxygen)
-DWANT_CORE=$(usex server)
-DBUILD_TESTING=$(usex test)
- -DWITH_WEBENGINE=$(usex urlpreview)
+ -DWITH_WEBENGINE=OFF # bug 925723
)
# bug #830708
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-13 19:19:54 +0000