diff options
Diffstat (limited to 'net-irc/quassel')
| -rw-r--r-- | net-irc/quassel/Manifest | 4 | ||||
| -rw-r--r-- | net-irc/quassel/files/quassel-0.14.0-fix-desktop-application-name.patch | 56 | ||||
| -rw-r--r-- | net-irc/quassel/quassel-0.14.0-r2.ebuild | 207 | ||||
| -rw-r--r-- | net-irc/quassel/quassel-9999.ebuild | 97 |
4 files changed, 321 insertions, 43 deletions
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest index d30e7a8e8776..a0e39ec378da 100644 --- a/net-irc/quassel/Manifest +++ b/net-irc/quassel/Manifest @@ -1,9 +1,11 @@ AUX quassel-0.14.0-cxxflags.patch 1305 BLAKE2B 241a51092d5f6528bb781cf83de0cb5efbfae3beee2118291b87fad39f58a12a1ab6f2bff25b138641192673b18b79ec663eb6aca1803d15ed4b8a939c71023d SHA512 7a6dd1097694de25c51ff2f93b8b57597a234859516ff93154d74ae70c4593cef5e779a4b80943ceb2945c097711f29a7d9b6d6219023a95c9224d8d63b56843 +AUX quassel-0.14.0-fix-desktop-application-name.patch 2561 BLAKE2B 88de02486d603f3e3b6ea660c274fd20a0958db923bc0f9b43a61a853357e08d45c7a25f6de1edc0b30facb87d62393e376512bbdbb1d4054d0ee546da01ca49 SHA512 755cda84547a018bbaa5ab17389b5a181fb81c6513acf7bdf7552d0f702da800161879c037819b8077005781ebf91d38dbd5a143929199135e98e41bd67c197a 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-r1.ebuild 5236 BLAKE2B ef81140c73e64f3242222540865704be84e02d98abc78d69a851634d1e26d1ec3913487ee2de885de71ef18a46d494634e6643d8f1514cf08d6927c2dca81625 SHA512 9b36b882819470c6ba4a39f46a48de81959ef930e2ae1a33f55d895a58054a8a8b2382cf9de9e6a8dfe9f070002ec9c6fd178b79359657913027220a8a4b714c -EBUILD quassel-9999.ebuild 5181 BLAKE2B 972b483398204f711a254ffcc5c68d78a25f8c50b66b96400c37e1debc655ac50b7ef9976d31d9dbde828dfbd2dc613a7a66922636c1d279cbc5007d204d9ca6 SHA512 2f70557bd6007540d318861b4210732de13aff4fc11cc53b5ac7d4854540da33e0813cf84cfe6fc2e8e6c1d391a1afebd2423b62d4f1cdcaddcf59720ccc05ad +EBUILD quassel-0.14.0-r2.ebuild 5066 BLAKE2B c57fa4164b2cc036eb0f9ee47ff2b3b226d045371cd4395b439aa0240ad2e75907f2e9e4b23f95a1a67cb2e8893bb61a43f4b748d1020b0f9edf8f93ec2f0b54 SHA512 5be2d05f2d09f125e03165df9d8e1241ad060feef1d717e56da080ff2f1b4ff85bc1718050304efd7dbbb3e9af710b86d873f73ea250ec36b6d342e8ced23baa +EBUILD quassel-9999.ebuild 4963 BLAKE2B 35100b01dac68f79d067a20d165fbb0ec428a8cb40a7beffc55d9b9cfed5eaec3f24a23f52f71d1078cf8d33110b6a4c9ade305c505d388c6b8c70f5e7d67a1d SHA512 88bf1d5728907edfa60a47e319c2fc5c492bd071aef00dbfedb9a53bc15180e9c02d4c60b3074530b1f6cec1dfd0999b1cd437ebc31e6db5d9b007e175379bf8 MISC metadata.xml 1809 BLAKE2B e558111a5dfa2f4c9604c52db07fff9fa578e7f7d6c238ae53a894201eca4234260bb9f5e98f473ebc919ca4d6288e0b40564040f6d0db87c031ffe5b760cfff SHA512 43a6895c64e1464fce3e1ea654633994f272eb26aeec016cf244ee69e1856a0028f7979a7a424746ec98a11602a5b8017f43b06b55b26f364c7e3b38e5944e25 diff --git a/net-irc/quassel/files/quassel-0.14.0-fix-desktop-application-name.patch b/net-irc/quassel/files/quassel-0.14.0-fix-desktop-application-name.patch new file mode 100644 index 000000000000..ef70a608c406 --- /dev/null +++ b/net-irc/quassel/files/quassel-0.14.0-fix-desktop-application-name.patch @@ -0,0 +1,56 @@ +https://github.com/quassel/quassel/pull/615 + +From 020c163421691fa37330826df92ac0a248721290 Mon Sep 17 00:00:00 2001 +From: Jeremy Visser <jeremy@visser.name> +Date: Tue, 18 Apr 2023 21:47:45 +1000 +Subject: [PATCH] uisupport: fix application name for .desktop shell + integration + +When building for KDE (cmake -DUSE_KDE=1), the KAboutData constructor +as invoked by uisupport causes the resulting application name to be +"org.kde.quassel". + +At least on GNOME, this "org.kde.quassel" doesn't match the +corresponding "quasselclient.desktop" file, which means the app doesn't +get a pretty name/icon in the app launcher. + +The solution is to call KAboutData::setDesktopFileName() with the +desired name. + +This issue doesn't occur when building with USE_KDE=0 for two reasons: +one, because QtUiApplication already calls +QGuiApplication::setDesktopFileName() with the correct value, and two, +if desktopFileName is unset, the binary name "quasselclient" would be used +instead, which still matches "quasselclient.desktop". + +An alternative workaround would be to set this flag in the +quasselclient.desktop file: + + StartupWMClass=org.kde.quassel + +But I would say this is worse because the "org.kde" doesn't make sense, +since this is not a KDE project. +--- + src/uisupport/aboutdata.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/uisupport/aboutdata.cpp b/src/uisupport/aboutdata.cpp +index d489da3d6..380e54a54 100644 +--- a/src/uisupport/aboutdata.cpp ++++ b/src/uisupport/aboutdata.cpp +@@ -114,13 +114,14 @@ AboutData& AboutData::addCredits(std::initializer_list<AboutPerson> credits) + + KAboutData AboutData::kAboutData() const + { +- KAboutData aboutData(Quassel::buildInfo().applicationName, tr("Quassel IRC"), Quassel::buildInfo().plainVersionString); ++ KAboutData aboutData(Quassel::buildInfo().clientApplicationName, tr("Quassel IRC"), Quassel::buildInfo().plainVersionString); + aboutData.addLicense(KAboutLicense::GPL_V2); + aboutData.addLicense(KAboutLicense::GPL_V3); + aboutData.setShortDescription(tr("A modern, distributed IRC client")); + aboutData.setProgramLogo(QVariant::fromValue(QImage(":/pics/quassel-logo.png"))); + aboutData.setBugAddress("https://bugs.quassel-irc.org/projects/quassel-irc/issues/new"); + aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8()); ++ aboutData.setDesktopFileName(Quassel::buildInfo().clientApplicationName); + + for (const auto& person : authors()) { + aboutData.addAuthor(person.prettyName(), person.task(), person.emailAddress()); diff --git a/net-irc/quassel/quassel-0.14.0-r2.ebuild b/net-irc/quassel/quassel-0.14.0-r2.ebuild new file mode 100644 index 000000000000..29dec37cf172 --- /dev/null +++ b/net-irc/quassel/quassel-0.14.0-r2.ebuild @@ -0,0 +1,207 @@ +# Copyright 1999-2023 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 urlpreview" + +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 ) + urlpreview? ( dev-qt/qtwebengine:5[widgets] ) +" +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:5 +" + +DOCS=( AUTHORS ChangeLog README.md ) + +PATCHES=( + "${FILESDIR}/${P}-cxxflags.patch" + "${FILESDIR}/${P}-fix-desktop-application-name.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=$(usex urlpreview) + ) + + # 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 70b0d655e532..c0d3a18543c9 100644 --- a/net-irc/quassel/quassel-9999.ebuild +++ b/net-irc/quassel/quassel-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake xdg-utils pax-utils systemd +inherit cmake optfeature pax-utils systemd xdg-utils if [[ ${PV} != *9999* ]]; then MY_P=${PN}-${PV/_/-} @@ -24,23 +24,39 @@ HOMEPAGE="https://quassel-irc.org/" LICENSE="GPL-3" SLOT="0" -IUSE="bundled-icons crypt +dbus debug gui kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview" +IUSE="bundled-icons crypt +dbus gui kde ldap monolithic oxygen postgres +server spell syslog test urlpreview" + +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 +SERVER_DEPEND=" + acct-group/quassel acct-user/quassel - dev-qt/qtscript:5 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 + !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:5 - oxygen? ( kde-frameworks/oxygen-icons:5 ) + kde-frameworks/breeze-icons:* + oxygen? ( kde-frameworks/oxygen-icons:* ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 @@ -55,10 +71,11 @@ GUI_DEPEND="dev-qt/qtgui:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) - snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) spell? ( kde-frameworks/sonnet:5 ) - urlpreview? ( dev-qt/qtwebengine:5[widgets] )" -DEPEND="dev-libs/boost:= + urlpreview? ( dev-qt/qtwebengine:5[widgets] ) +" +RDEPEND=" + dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] sys-libs/zlib @@ -69,48 +86,45 @@ DEPEND="dev-libs/boost:= !monolithic? ( server? ( ${SERVER_DEPEND} ) gui? ( ${GUI_DEPEND} ) - )" -RDEPEND="${DEPEND}" -BDEPEND="dev-qt/linguist-tools:5 - kde-frameworks/extra-cmake-modules:5" - -DEPEND+=" test? ( dev-cpp/gtest dev-qt/qttest )" + ) +" +DEPEND=" + ${RDEPEND} + test? ( + dev-cpp/gtest + dev-qt/qttest:5 + ) +" +BDEPEND=" + dev-qt/linguist-tools:5 + kde-frameworks/extra-cmake-modules:5 +" DOCS=( AUTHORS ChangeLog README.md ) -REQUIRED_USE="|| ( gui server monolithic ) - crypt? ( || ( server monolithic ) ) - kde? ( dbus spell ) - ldap? ( || ( server monolithic ) ) - postgres? ( || ( server monolithic ) ) - snorenotify? ( || ( gui monolithic ) ) - spell? ( || ( gui monolithic ) ) - syslog? ( || ( server monolithic ) )" - src_configure() { local mycmakeargs=( - -DBUILD_TESTING=$(usex test) -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=$(usex urlpreview) - -DWANT_QTCLIENT=$(usex gui) ) + # bug #830708 if use gui || use monolithic ; then - # We can't always pass these (avoid "unused" warning) - # bug #830708 mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE=LibsnoreQt5=ON $(cmake_use_find_package dbus dbusmenu-qt5) $(cmake_use_find_package dbus Qt5DBus) - $(cmake_use_find_package snorenotify LibsnoreQt5) $(cmake_use_find_package spell KF5Sonnet) ) fi @@ -147,17 +161,16 @@ src_test() { pkg_postinst() { if use monolithic ; then elog "Information on how to enable SSL support for client/core connections" - elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support." + 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}" + einfo "If you want to generate SSL certificate, remember to run:" + einfo " emerge --config =${CATEGORY}/${PF}" fi if use server || use monolithic ; then - einfo "Quassel can use net-misc/oidentd package if installed on your system." - einfo "Consider installing it if you want to run quassel within identd daemon." + optfeature "running Quassel within an ident daemon" "net-misc/oidentd" fi xdg_icon_cache_update @@ -176,11 +189,11 @@ pkg_config() { 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" + -out "${QUASSEL_DIR}/quasselCert.pem" || die # Permissions for the key - chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem" - chmod 400 "${QUASSEL_DIR}/quasselCert.pem" + 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." |