* [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/
@ 2016-09-14 17:18 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2016-09-14 17:18 UTC (permalink / raw
To: gentoo-commits
commit: 396858ac62530deef0a1fcd44c322d8f6065df6f
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 17:18:12 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 17:18:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=396858ac
net-irc/quassel: remove old
Package-Manager: portage-2.3.0
net-irc/quassel/Manifest | 2 -
.../files/quassel-0.12.2-CVE-2015-8547.patch | 22 ---
net-irc/quassel/files/quassel-0.12.2-qt55.patch | 53 ------
net-irc/quassel/quassel-0.12.2-r3.ebuild | 211 ---------------------
net-irc/quassel/quassel-0.12.3-r1.ebuild | 210 --------------------
5 files changed, 498 deletions(-)
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index b80eb2a..9b785e5 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,3 +1 @@
-DIST quassel-0.12.2.tar.bz2 3681838 SHA256 6bd6f79ecb88fb857bea7e89c767a3bd0f413ff01bae9298dd2e563478947897 SHA512 0c907982af0ba11af6ba5d075850149dc4d4df0c759a736dfaccdc01778958bd9b0137515c2d78a72a1b5aef6600cea47505de6ee905d83a51cf4e67d132911d WHIRLPOOL 947c47ab6a5db73fdda7d5e5fc3f618030e9c2cfd78f4f423b32332e6514b5c3b8d24423a6be8ee8bf81e2e4a973aa29578e776dba5e8f7ad947acbcb7aef497
-DIST quassel-0.12.3.tar.bz2 3687078 SHA256 4d3ee91b85cce3d8df62faf55ad35bebd6fc45085ed6248b8a41d2858de3d434 SHA512 0cb5486c4a992cb4e5e84ec2cc15f11ac6e324fa7b3a4a0ddc1edd090adabcb30f8856b1f2f348bec34fdfa33bcfa0e8e14fb45898d11d954f501bb3ee4c8aa4 WHIRLPOOL 482c2afee0e24dee2f3e80cacb47c7f7642851c4f417723a73258579824331a265c56b5777bc79c47bd3af6a6747d33a00bb539894f64081165d75cb19b351cc
DIST quassel-0.12.4.tar.bz2 3742639 SHA256 93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d SHA512 66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92 WHIRLPOOL 13a6078aa8f0a3d039e9c240c870a13744b3eb3324f45508f62a37aa8da13c0b00f94f53fe2602762503459a1110e3796673c104397b37297390cc406f2eaa66
diff --git a/net-irc/quassel/files/quassel-0.12.2-CVE-2015-8547.patch b/net-irc/quassel/files/quassel-0.12.2-CVE-2015-8547.patch
deleted file mode 100644
index cf838c7..00000000
--- a/net-irc/quassel/files/quassel-0.12.2-CVE-2015-8547.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 476aaa050f26d6a31494631d172724409e4c569b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Konstantin=20Bl=C3=A4si?= <kblaesi@gmail.com>
-Date: Wed, 21 Oct 2015 03:26:02 +0200
-Subject: [PATCH] Fixes a crash of the core when executing "/op *" in a query.
-
----
- src/core/coreuserinputhandler.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/coreuserinputhandler.cpp b/src/core/coreuserinputhandler.cpp
-index 7887a92..73aac48 100644
---- a/src/core/coreuserinputhandler.cpp
-+++ b/src/core/coreuserinputhandler.cpp
-@@ -228,7 +228,7 @@ void CoreUserInputHandler::doMode(const BufferInfo &bufferInfo, const QChar& add
- if (!isNumber || maxModes == 0) maxModes = 1;
-
- QStringList nickList;
-- if (nicks == "*") { // All users in channel
-+ if (nicks == "*" && bufferInfo.type() == BufferInfo::ChannelBuffer) { // All users in channel
- const QList<IrcUser*> users = network()->ircChannel(bufferInfo.bufferName())->ircUsers();
- foreach(IrcUser *user, users) {
- if ((addOrRemove == '+' && !network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains(mode))
diff --git a/net-irc/quassel/files/quassel-0.12.2-qt55.patch b/net-irc/quassel/files/quassel-0.12.2-qt55.patch
deleted file mode 100644
index 3bf8989..00000000
--- a/net-irc/quassel/files/quassel-0.12.2-qt55.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0df317e85ab3d1d80135995d3b5d7f5341fef6e4 Mon Sep 17 00:00:00 2001
-From: Armin K <krejzi@email.com>
-Date: Sat, 2 May 2015 23:04:53 +0200
-Subject: [PATCH] Fix build with Qt-5.5
-
-http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c
----
- src/client/treemodel.cpp | 5 ++---
- src/common/peer.h | 1 +
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
-index f599803..fd47bc0 100644
---- a/src/client/treemodel.cpp
-+++ b/src/client/treemodel.cpp
-@@ -556,10 +556,9 @@ void TreeModel::endAppendChilds()
- ChildStatus cs = _childStatus;
- #ifndef QT_NO_DEBUG
- QModelIndex parent = indexByItem(parentItem);
--#endif
- Q_ASSERT(cs.parent == parent);
- Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1);
--
-+#endif
- _aboutToRemoveOrInsert = false;
- for (int i = cs.start; i <= cs.end; i++) {
- connectItem(parentItem->child(i));
-@@ -605,9 +604,9 @@ void TreeModel::endRemoveChilds()
- #ifndef QT_NO_DEBUG
- ChildStatus cs = _childStatus;
- QModelIndex parent = indexByItem(parentItem);
--#endif
- Q_ASSERT(cs.parent == parent);
- Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1);
-+#endif
- _aboutToRemoveOrInsert = false;
-
- endRemoveRows();
-diff --git a/src/common/peer.h b/src/common/peer.h
-index 02eb3c0..79204b4 100644
---- a/src/common/peer.h
-+++ b/src/common/peer.h
-@@ -22,6 +22,7 @@
- #define PEER_H
-
- #include <QAbstractSocket>
-+#include <QDataStream>
- #include <QPointer>
-
- #include "authhandler.h"
---
-2.4.0
-
diff --git a/net-irc/quassel/quassel-0.12.2-r3.ebuild b/net-irc/quassel/quassel-0.12.2-r3.ebuild
deleted file mode 100644
index 9258f65..00000000
--- a/net-irc/quassel/quassel-0.12.2-r3.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils eutils pax-utils systemd user versionator
-
-EGIT_REPO_URI="git://git.quassel-irc.org/quassel"
-[[ "${PV}" == "9999" ]] && inherit git-r3
-
-DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
-HOMEPAGE="http://quassel-irc.org/"
-[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~sparc-solaris"
-SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server +ssl syslog webkit X"
-
-SERVER_RDEPEND="
- qt5? (
- dev-qt/qtscript:5
- crypt? ( app-crypt/qca:2[openssl,qt5] )
- postgres? ( dev-qt/qtsql:5[postgres] )
- !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
- )
- !qt5? (
- dev-qt/qtscript:4
- crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
- postgres? ( dev-qt/qtsql:4[postgres] )
- !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
- )
- syslog? ( virtual/logger )
-"
-
-GUI_RDEPEND="
- qt5? (
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dbus? (
- >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5]
- 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
- kde-frameworks/sonnet:5
- )
- phonon? ( media-libs/phonon[qt5] )
- webkit? ( dev-qt/qtwebkit:5 )
- )
- !qt5? (
- dev-qt/qtgui:4
- ayatana? ( dev-libs/libindicate-qt )
- dbus? (
- >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4(+)]
- dev-qt/qtdbus:4
- kde? (
- kde-base/kdelibs:4
- kde-frameworks/oxygen-icons:*
- ayatana? ( kde-misc/plasma-widget-message-indicator )
- )
- )
- phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )
- webkit? ( dev-qt/qtwebkit:4 )
- )
-"
-
-RDEPEND="
- sys-libs/zlib
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5[ssl?]
- )
- !qt5? ( dev-qt/qtcore:4[ssl?] )
- monolithic? (
- ${SERVER_RDEPEND}
- ${GUI_RDEPEND}
- )
- !monolithic? (
- server? ( ${SERVER_RDEPEND} )
- X? ( ${GUI_RDEPEND} )
- )
-"
-DEPEND="${RDEPEND}
- qt5? (
- dev-qt/linguist-tools:5
- kde-frameworks/extra-cmake-modules
- )
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-PATCHES=(
- "${FILESDIR}/${P}-qt55.patch"
- "${FILESDIR}/${P}-CVE-2015-8547.patch"
-)
-
-REQUIRED_USE="
- || ( X server monolithic )
- ayatana? ( || ( X monolithic ) )
- crypt? ( || ( server monolithic ) )
- dbus? ( || ( X monolithic ) )
- kde? ( || ( X monolithic ) phonon )
- phonon? ( || ( X monolithic ) )
- postgres? ( || ( server monolithic ) )
- qt5? ( !ayatana )
- syslog? ( || ( server monolithic ) )
- webkit? ( || ( X monolithic ) )
-"
-
-pkg_setup() {
- if use server; then
- QUASSEL_DIR=/var/lib/${PN}
- QUASSEL_USER=${PN}
- # create quassel:quassel user
- enewgroup "${QUASSEL_USER}"
- enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package ayatana IndicateQt)
- $(cmake-utils_use_find_package crypt QCA2)
- $(cmake-utils_use_find_package crypt QCA2-QT5)
- $(cmake-utils_use_find_package dbus dbusmenu-qt)
- $(cmake-utils_use_find_package dbus dbusmenu-qt5)
- $(cmake-utils_use_with kde)
- $(cmake-utils_use_with !kde OXYGEN)
- $(cmake-utils_use_want monolithic MONO)
- $(cmake-utils_use_find_package phonon)
- $(cmake-utils_use_find_package phonon Phonon4Qt5)
- $(cmake-utils_use_use qt5)
- $(cmake-utils_use_want server CORE)
- $(cmake-utils_use_with webkit)
- $(cmake-utils_use_want X QTCLIENT)
- -DEMBED_DATA=OFF
- -DCMAKE_SKIP_RPATH=ON
- )
-
- # Something broke upstream detection since Qt 5.5
- if use ssl ; then
- mycmakeargs+=("-DHAVE_SSL=TRUE")
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use server ; then
- # needs PAX marking wrt bug#346255
- pax-mark m "${ED}/usr/bin/quasselcore"
-
- # prepare folders in /var/
- keepdir "${QUASSEL_DIR}"
- fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
-
- # init scripts & systemd unit
- newinitd "${FILESDIR}"/quasselcore.init quasselcore
- newconfd "${FILESDIR}"/quasselcore.conf quasselcore
- systemd_dounit "${FILESDIR}"/quasselcore.service
-
- # logrotate
- insinto /etc/logrotate.d
- newins "${FILESDIR}/quassel.logrotate" quassel
- fi
-}
-
-pkg_postinst() {
- if use monolithic && use ssl ; then
- elog "Information on how to enable SSL support for client/core connections"
- elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc."
- 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
- 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."
- fi
-}
-
-pkg_config() {
- if use server && use ssl; then
- # generate the pem file only when it does not already exist
- 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"
- # permissions for the key
- chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
- chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
- 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-0.12.3-r1.ebuild b/net-irc/quassel/quassel-0.12.3-r1.ebuild
deleted file mode 100644
index 8d88d5e..00000000
--- a/net-irc/quassel/quassel-0.12.3-r1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit cmake-utils eutils pax-utils systemd user versionator
-
-EGIT_REPO_URI="git://git.quassel-irc.org/quassel"
-[[ "${PV}" == "9999" ]] && inherit git-r3
-
-DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
-HOMEPAGE="http://quassel-irc.org/"
-[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
-SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server
-snorenotify +ssl syslog webkit X"
-
-SERVER_RDEPEND="
- qt5? (
- dev-qt/qtscript:5
- crypt? ( app-crypt/qca:2[openssl,qt5] )
- postgres? ( dev-qt/qtsql:5[postgres] )
- !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
- )
- !qt5? (
- dev-qt/qtscript:4
- crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
- postgres? ( dev-qt/qtsql:4[postgres] )
- !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
- )
- syslog? ( virtual/logger )
-"
-
-GUI_RDEPEND="
- qt5? (
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dbus? (
- >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5]
- 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
- kde-frameworks/sonnet:5
- )
- phonon? ( media-libs/phonon[qt5] )
- snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
- webkit? ( dev-qt/qtwebkit:5 )
- )
- !qt5? (
- dev-qt/qtgui:4
- ayatana? ( dev-libs/libindicate-qt )
- dbus? (
- >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4(+)]
- dev-qt/qtdbus:4
- kde? (
- kde-base/kdelibs:4
- kde-frameworks/oxygen-icons:*
- ayatana? ( kde-misc/plasma-widget-message-indicator )
- )
- )
- phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )
- webkit? ( dev-qt/qtwebkit:4 )
- )
-"
-
-RDEPEND="
- sys-libs/zlib
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5[ssl?]
- )
- !qt5? ( dev-qt/qtcore:4[ssl?] )
- monolithic? (
- ${SERVER_RDEPEND}
- ${GUI_RDEPEND}
- )
- !monolithic? (
- server? ( ${SERVER_RDEPEND} )
- X? ( ${GUI_RDEPEND} )
- )
-"
-DEPEND="${RDEPEND}
- qt5? (
- dev-qt/linguist-tools:5
- kde-frameworks/extra-cmake-modules
- )
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-REQUIRED_USE="
- || ( X server monolithic )
- ayatana? ( || ( X monolithic ) )
- crypt? ( || ( server monolithic ) )
- dbus? ( || ( X monolithic ) )
- kde? ( || ( X monolithic ) phonon )
- phonon? ( || ( X monolithic ) )
- postgres? ( || ( server monolithic ) )
- qt5? ( !ayatana )
- snorenotify? ( qt5 || ( X monolithic ) )
- syslog? ( || ( server monolithic ) )
- webkit? ( || ( X monolithic ) )
-"
-
-pkg_setup() {
- if use server; then
- QUASSEL_DIR=/var/lib/${PN}
- QUASSEL_USER=${PN}
- # create quassel:quassel user
- enewgroup "${QUASSEL_USER}"
- enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package ayatana IndicateQt)
- $(cmake-utils_use_find_package crypt QCA2)
- $(cmake-utils_use_find_package crypt QCA2-QT5)
- $(cmake-utils_use_find_package dbus dbusmenu-qt)
- $(cmake-utils_use_find_package dbus dbusmenu-qt5)
- -DWITH_KDE=$(usex kde)
- -DWITH_OXYGEN=$(usex !kde)
- -DWANT_MONO=$(usex monolithic)
- $(cmake-utils_use_find_package phonon Phonon)
- $(cmake-utils_use_find_package phonon Phonon4Qt5)
- -DUSE_QT5=$(usex qt5)
- -DWANT_CORE=$(usex server)
- $(cmake-utils_use_find_package snorenotify LibsnoreQt5)
- -DWITH_WEBKIT=$(usex webkit)
- -DWANT_QTCLIENT=$(usex X)
- -DEMBED_DATA=OFF
- -DCMAKE_SKIP_RPATH=ON
- )
-
- # Something broke upstream detection since Qt 5.5
- if use ssl ; then
- mycmakeargs+=("-DHAVE_SSL=TRUE")
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use server ; then
- # needs PAX marking wrt bug#346255
- pax-mark m "${ED}/usr/bin/quasselcore"
-
- # prepare folders in /var/
- keepdir "${QUASSEL_DIR}"
- fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
-
- # init scripts & systemd unit
- newinitd "${FILESDIR}"/quasselcore.init quasselcore
- newconfd "${FILESDIR}"/quasselcore.conf quasselcore
- systemd_dounit "${FILESDIR}"/quasselcore.service
-
- # logrotate
- insinto /etc/logrotate.d
- newins "${FILESDIR}/quassel.logrotate" quassel
- fi
-}
-
-pkg_postinst() {
- if use monolithic && use ssl ; then
- elog "Information on how to enable SSL support for client/core connections"
- elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc."
- 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
- 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."
- fi
-}
-
-pkg_config() {
- if use server && use ssl; then
- # generate the pem file only when it does not already exist
- 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"
- # permissions for the key
- chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
- chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
- else
- einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
- einfo "Remove it if you want to create new one."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/
@ 2020-01-04 11:52 Johannes Huber
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2020-01-04 11:52 UTC (permalink / raw
To: gentoo-commits
commit: 39e5421bb559eff29a045d04df45835ea6f17dcd
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 4 11:47:14 2020 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 4 11:52:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39e5421b
net-irc/quassel: Remove 0.12.5-r2
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
net-irc/quassel/Manifest | 1 -
net-irc/quassel/files/quassel-0.12.5-qt511.patch | 67 ---------
net-irc/quassel/metadata.xml | 4 -
net-irc/quassel/quassel-0.12.5-r2.ebuild | 184 -----------------------
4 files changed, 256 deletions(-)
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index db2b789a392..1ef7551ac44 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,2 +1 @@
-DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f SHA512 3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd SHA512 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
diff --git a/net-irc/quassel/files/quassel-0.12.5-qt511.patch b/net-irc/quassel/files/quassel-0.12.5-qt511.patch
deleted file mode 100644
index c46eee8e29b..00000000000
--- a/net-irc/quassel/files/quassel-0.12.5-qt511.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 0cc8e1431feb739d0727f0131c87a7ecbe336a81
-Author: Manuel Nickschas <sputnick@quassel-irc.org>
-Date: Thu May 3 23:19:34 2018 +0200
-
- cmake: Fix build with Qt 5.11
-
- Qt 5.11 removes the qt5_use_modules function, so add a copy. If
- present, the Qt-provided function will be used instead.
-
- Closes GH-355.
-
-diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake
-index 652c0042..d77ba1cf 100644
---- a/cmake/QuasselMacros.cmake
-+++ b/cmake/QuasselMacros.cmake
-@@ -5,6 +5,9 @@
- # The qt4_use_modules function was taken from CMake's Qt4Macros.cmake:
- # (C) 2005-2009 Kitware, Inc.
- #
-+# The qt5_use_modules function was taken from Qt 5.10.1 (and modified):
-+# (C) 2005-2011 Kitware, Inc.
-+#
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-@@ -43,6 +46,41 @@ function(qt4_use_modules _target _link_type)
- endforeach()
- endfunction()
-
-+# Qt 5.11 removed the qt5_use_modules function, so we need to provide it until we can switch to a modern CMake version.
-+# If present, the Qt-provided version will be used automatically instead.
-+function(qt5_use_modules _target _link_type)
-+ if (NOT TARGET ${_target})
-+ message(FATAL_ERROR "The first argument to qt5_use_modules must be an existing target.")
-+ endif()
-+ if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" )
-+ set(_qt5_modules ${ARGN})
-+ set(_qt5_link_type ${_link_type})
-+ else()
-+ set(_qt5_modules ${_link_type} ${ARGN})
-+ endif()
-+
-+ if ("${_qt5_modules}" STREQUAL "")
-+ message(FATAL_ERROR "qt5_use_modules requires at least one Qt module to use.")
-+ endif()
-+ foreach(_module ${_qt5_modules})
-+ if (NOT Qt5${_module}_FOUND)
-+ find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH)
-+ if (NOT Qt5${_module}_FOUND)
-+ message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
-+ endif()
-+ endif()
-+ target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES})
-+ set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS})
-+ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS})
-+ if (Qt5_POSITION_INDEPENDENT_CODE
-+ AND (CMAKE_VERSION VERSION_LESS 2.8.12
-+ AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
-+ OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)))
-+ set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE})
-+ endif()
-+ endforeach()
-+endfunction()
-+
- # Some wrappers for simplifying dual-Qt support
-
- function(qt_use_modules)
diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index a343c531e40..57498aeffbe 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -30,10 +30,6 @@
<flag name="oxygen">
Support the Oxygen icon set that was the default for KDE4.
</flag>
- <flag name="phonon">
- Build client with phonon backend support. This enables sound
- playback in client.
- </flag>
<flag name="server">
Build the server binary. If this USE flag is disabled, the
'core' server binary for quassel is not built, and cannot be
diff --git a/net-irc/quassel/quassel-0.12.5-r2.ebuild b/net-irc/quassel/quassel-0.12.5-r2.ebuild
deleted file mode 100644
index 5db277fc20a..00000000000
--- a/net-irc/quassel/quassel-0.12.5-r2.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils pax-utils systemd user versionator
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="https://quassel-irc.org/pub/${P}.tar.bz2"
- KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
-else
- EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${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="crypt dbus debug kde monolithic phonon postgres +server
-snorenotify +ssl syslog urlpreview X"
-
-SERVER_RDEPEND="
- dev-qt/qtscript:5
- crypt? ( app-crypt/qca:2[qt5(+),ssl] )
- postgres? ( dev-qt/qtsql:5[postgres] )
- !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
- syslog? ( virtual/logger )
-"
-
-GUI_RDEPEND="
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dbus? (
- >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
- 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
- kde-frameworks/sonnet:5
- )
- phonon? ( media-libs/phonon[qt5(+)] )
- snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
- urlpreview? ( dev-qt/qtwebengine:5[widgets] )
-"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5[ssl?]
- sys-libs/zlib
- monolithic? (
- ${SERVER_RDEPEND}
- ${GUI_RDEPEND}
- )
- !monolithic? (
- server? ( ${SERVER_RDEPEND} )
- X? ( ${GUI_RDEPEND} )
- )
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- kde-frameworks/extra-cmake-modules
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-REQUIRED_USE="
- || ( X server monolithic )
- crypt? ( || ( server monolithic ) )
- dbus? ( || ( X monolithic ) )
- kde? ( || ( X monolithic ) dbus phonon )
- phonon? ( || ( X monolithic ) )
- postgres? ( || ( server monolithic ) )
- snorenotify? ( || ( X monolithic ) )
- syslog? ( || ( server monolithic ) )
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt511.patch" )
-
-pkg_setup() {
- if use server; then
- QUASSEL_DIR=/var/lib/${PN}
- QUASSEL_USER=${PN}
- # create quassel:quassel user
- enewgroup "${QUASSEL_USER}"
- enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_QT5=ON
- -DEMBED_DATA=OFF
- -DCMAKE_SKIP_RPATH=ON
- -DWITH_WEBKIT=OFF
- $(cmake-utils_use_find_package crypt QCA2-QT5)
- $(cmake-utils_use_find_package dbus dbusmenu-qt5)
- $(cmake-utils_use_find_package dbus Qt5DBus)
- -DWITH_KDE=$(usex kde)
- -DWITH_OXYGEN=$(usex !kde)
- -DWANT_MONO=$(usex monolithic)
- $(cmake-utils_use_find_package phonon Phonon4Qt5)
- -DWANT_CORE=$(usex server)
- $(cmake-utils_use_find_package snorenotify LibsnoreQt5)
- -DWITH_WEBENGINE=$(usex urlpreview)
- -DWANT_QTCLIENT=$(usex X)
- )
-
- # Something broke upstream detection since Qt 5.5
- if use ssl ; then
- mycmakeargs+=( "-DHAVE_SSL=TRUE" )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use server ; then
- # needs PAX marking wrt bug#346255
- pax-mark m "${ED}/usr/bin/quasselcore"
-
- # prepare folders in /var/
- keepdir "${QUASSEL_DIR}"
- fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
-
- # 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
-}
-
-pkg_postinst() {
- if use monolithic && use ssl ; 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."
- 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
- 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."
- fi
-
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
-
-pkg_config() {
- if use server && use ssl; then
- # generate the pem file only when it does not already exist
- 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"
- # permissions for the key
- chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
- chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
- else
- einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
- einfo "Remove it if you want to create new one."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/
@ 2020-01-07 22:28 Johannes Huber
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2020-01-07 22:28 UTC (permalink / raw
To: gentoo-commits
commit: 17e237e072a6205547e2c43e99cc2bbc5914ff00
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 7 22:27:34 2020 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jan 7 22:27:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e237e0
net-irc/quassel: Fix build w/ Qt 5.14
Adds upstream patch by Manuel Nickschas <sputnick <AT> quassel-irc.org>.
Closes: https://bugs.gentoo.org/703904
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
net-irc/quassel/files/quassel-0.13.1-qt5.14.patch | 118 +++++++++++++
net-irc/quassel/quassel-0.13.1-r1.ebuild | 192 ++++++++++++++++++++++
2 files changed, 310 insertions(+)
diff --git a/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch b/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch
new file mode 100644
index 00000000000..f0305ea53ce
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch
@@ -0,0 +1,118 @@
+commit c90702bdbc43fc542d7df6d5ec4b321912ca0035
+Author: Manuel Nickschas <sputnick@quassel-irc.org>
+Date: Tue Jan 7 18:34:54 2020 +0100
+
+ common: Disable enum type stream operators for Qt >= 5.14
+
+ Starting from version 5.14, Qt provides stream operators for enum
+ types, which collide with the ones we ship in types.h. Disable
+ Quassel's stream operators when compiling against Qt 5.14 or later.
+
+ Add a unit test that ensures that enum serialization honors the width
+ of the underlying type.
+
+diff --git a/src/common/types.h b/src/common/types.h
+index 467d9fb2..c4b9f364 100644
+--- a/src/common/types.h
++++ b/src/common/types.h
+@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress)
+ typedef QList<MsgId> MsgIdList;
+ typedef QList<BufferId> BufferIdList;
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+ /**
+ * Catch-all stream serialization operator for enum types.
+ *
+@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) {
+ value = static_cast<T>(v);
+ return in;
+ }
++#endif
+
+ // Exceptions
+
+diff --git a/src/common/typestest.cpp b/src/common/typestest.cpp
+new file mode 100644
+index 00000000..04031c29
+--- /dev/null
++++ b/src/common/typestest.cpp
+@@ -0,0 +1,79 @@
++/***************************************************************************
++ * Copyright (C) 2005-2020 by the Quassel Project *
++ * devel@quassel-irc.org *
++ * *
++ * This program is free software; you can redistribute it and/or modify *
++ * it under the terms of the GNU General Public License as published by *
++ * the Free Software Foundation; either version 2 of the License, or *
++ * (at your option) version 3. *
++ * *
++ * This program is distributed in the hope that it will be useful, *
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
++ * GNU General Public License for more details. *
++ * *
++ * You should have received a copy of the GNU General Public License *
++ * along with this program; if not, write to the *
++ * Free Software Foundation, Inc., *
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
++ ***************************************************************************/
++
++#include <cstdint>
++
++#include <QByteArray>
++#include <QDataStream>
++#include <QObject>
++
++#include "testglobal.h"
++#include "types.h"
++
++using namespace ::testing;
++
++class EnumHolder
++{
++ Q_GADGET
++
++public:
++ enum class Enum16 : uint16_t {};
++ enum class Enum32 : uint32_t {};
++
++ enum class EnumQt16 : uint16_t {};
++ Q_ENUM(EnumQt16)
++ enum class EnumQt32 : uint32_t {};
++ Q_ENUM(EnumQt32)
++};
++
++// Verify that enums are (de)serialized as their underlying type
++TEST(TypesTest, enumSerialization)
++{
++ QByteArray data;
++ QDataStream out(&data, QIODevice::WriteOnly);
++
++ // Serialize
++ out << EnumHolder::Enum16(0xabcd);
++ ASSERT_THAT(data.size(), Eq(2));
++ out << EnumHolder::Enum32(0x123456);
++ ASSERT_THAT(data.size(), Eq(6));
++ out << EnumHolder::EnumQt16(0x4321);
++ ASSERT_THAT(data.size(), Eq(8));
++ out << EnumHolder::Enum32(0xfedcba);
++ ASSERT_THAT(data.size(), Eq(12));
++ ASSERT_THAT(out.status(), Eq(QDataStream::Status::Ok));
++
++ // Deserialize
++ QDataStream in(data);
++ EnumHolder::Enum16 enum16;
++ EnumHolder::Enum32 enum32;
++ EnumHolder::EnumQt16 enumQt16;
++ EnumHolder::EnumQt32 enumQt32;
++ in >> enum16 >> enum32 >> enumQt16 >> enumQt32;
++ ASSERT_THAT(in.status(), Eq(QDataStream::Status::Ok));
++ EXPECT_TRUE(in.atEnd());
++
++ EXPECT_THAT((int)enum16, Eq(0xabcd));
++ EXPECT_THAT((int)enum32, Eq(0x123456));
++ EXPECT_THAT((int)enumQt16, Eq(0x4321));
++ EXPECT_THAT((int)enumQt32, Eq(0xfedcba));
++}
++
++#include "typestest.moc"
diff --git a/net-irc/quassel/quassel-0.13.1-r1.ebuild b/net-irc/quassel/quassel-0.13.1-r1.ebuild
new file mode 100644
index 00000000000..67c973cdf7d
--- /dev/null
+++ b/net-irc/quassel/quassel-0.13.1-r1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils pax-utils systemd user
+
+if [[ ${PV} != *9999* ]]; then
+ MY_P=${PN}-${PV/_/-}
+ SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
+ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
+ 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 debug kde ldap monolithic oxygen postgres +server
+snorenotify +ssl syslog urlpreview X"
+
+SERVER_DEPEND="
+ 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
+ dev-qt/qtmultimedia:5
+ dev-qt/qtwidgets:5
+ !bundled-icons? (
+ kde-frameworks/breeze-icons:5
+ oxygen? ( kde-frameworks/oxygen-icons:5 )
+ )
+ 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
+ kde-frameworks/sonnet:5
+ )
+ snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+ urlpreview? ( dev-qt/qtwebengine:5[widgets] )
+"
+
+DEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtnetwork:5[ssl?]
+ sys-libs/zlib
+ monolithic? (
+ ${SERVER_DEPEND}
+ ${GUI_DEPEND}
+ )
+ !monolithic? (
+ server? ( ${SERVER_DEPEND} )
+ X? ( ${GUI_DEPEND} )
+ )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ kde-frameworks/extra-cmake-modules
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+REQUIRED_USE="
+ || ( X server monolithic )
+ crypt? ( || ( server monolithic ) )
+ kde? ( || ( X monolithic ) dbus )
+ ldap? ( || ( server monolithic ) )
+ postgres? ( || ( server monolithic ) )
+ snorenotify? ( || ( X monolithic ) )
+ syslog? ( || ( server monolithic ) )
+"
+
+PATCHES=( "${FILESDIR}/${P}-qt5.14.patch" )
+
+pkg_setup() {
+ if use server; then
+ QUASSEL_DIR=/var/lib/${PN}
+ QUASSEL_USER=${PN}
+ # create quassel:quassel user
+ enewgroup "${QUASSEL_USER}"
+ enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_QT4=OFF
+ -DUSE_QT5=ON
+ -DUSE_CCACHE=OFF
+ -DCMAKE_SKIP_RPATH=ON
+ -DEMBED_DATA=OFF
+ -DWITH_WEBKIT=OFF
+ -DWITH_BUNDLED_ICONS=$(usex bundled-icons)
+ $(cmake_use_find_package dbus dbusmenu-qt5)
+ $(cmake_use_find_package dbus Qt5DBus)
+ -DWITH_KDE=$(usex kde)
+ -DWITH_LDAP=$(usex ldap)
+ -DWANT_MONO=$(usex monolithic)
+ -DWITH_OXYGEN_ICONS=$(usex oxygen)
+ -DWANT_CORE=$(usex server)
+ $(cmake_use_find_package snorenotify LibsnoreQt5)
+ -DWITH_WEBENGINE=$(usex urlpreview)
+ -DWANT_QTCLIENT=$(usex X)
+ )
+
+ if use server || use monolithic; then
+ mycmakeargs+=( $(cmake_use_find_package crypt QCA2-QT5) )
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use server ; then
+ # needs PAX marking wrt bug#346255
+ pax-mark m "${ED}/usr/bin/quasselcore"
+
+ # prepare folders in /var/
+ keepdir "${QUASSEL_DIR}"
+ fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
+
+ # 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
+}
+
+pkg_postinst() {
+ if use monolithic && use ssl ; 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."
+ 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
+ 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."
+ fi
+
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
+
+pkg_config() {
+ if use server && use ssl; then
+ # generate the pem file only when it does not already exist
+ 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"
+ # permissions for the key
+ chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
+ chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
+ else
+ einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
+ einfo "Remove it if you want to create new one."
+ fi
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/
@ 2022-01-14 18:32 Mike Gilbert
0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2022-01-14 18:32 UTC (permalink / raw
To: gentoo-commits
commit: 4da043aa794888f08ab2ebfda77a95182f96ed38
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 14 18:31:01 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 18:31:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da043aa
net-irc/quassel: fix CXXFLAGS de-duplication
Closes: https://bugs.gentoo.org/830738
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../quassel/files/quassel-0.14.0-cxxflags.patch | 32 ++++++++++++++++++++++
net-irc/quassel/quassel-0.14.0.ebuild | 4 +++
2 files changed, 36 insertions(+)
diff --git a/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch b/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch
new file mode 100644
index 000000000000..119261f789af
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch
@@ -0,0 +1,32 @@
+From b1eff3d32b2a18c52a8f30632746956a17089204 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 8 Jan 2022 13:26:05 -0500
+Subject: [PATCH] cmake: avoid de-duplication of user's CXXFLAGS
+
+Use the "SHELL:" prefix behavior introduced in cmake 3.12 to avoid the
+option de-duplication behavior of add_compile_options().
+
+Bug: https://bugs.gentoo.org/830738
+---
+ cmake/QuasselMacros.cmake | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake
+index 3f9f09269..9ba0003a8 100644
+--- a/cmake/QuasselMacros.cmake
++++ b/cmake/QuasselMacros.cmake
+@@ -410,8 +410,12 @@ endfunction()
+ function(process_cmake_cxx_flags)
+ string(TOUPPER ${CMAKE_BUILD_TYPE} upper_build_type)
+ set(cxx_flags "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${upper_build_type}}")
+- separate_arguments(sep_cxx_flags UNIX_COMMAND ${cxx_flags})
+- add_compile_options(${sep_cxx_flags})
++ if(CMAKE_VERSION VERSION_LESS 3.12)
++ separate_arguments(sep_cxx_flags UNIX_COMMAND ${cxx_flags})
++ add_compile_options(${sep_cxx_flags})
++ else()
++ add_compile_options("SHELL:${cxx_flags}")
++ endif()
+ set(CMAKE_CXX_FLAGS "" PARENT_SCOPE)
+ set(CMAKE_CXX_FLAGS_${upper_build_type} "" PARENT_SCOPE)
+ endfunction()
diff --git a/net-irc/quassel/quassel-0.14.0.ebuild b/net-irc/quassel/quassel-0.14.0.ebuild
index 4508c79fbeb9..ad984f995d66 100644
--- a/net-irc/quassel/quassel-0.14.0.ebuild
+++ b/net-irc/quassel/quassel-0.14.0.ebuild
@@ -87,6 +87,10 @@ REQUIRED_USE="|| ( X server monolithic )
spell? ( || ( X monolithic ) )
syslog? ( || ( server monolithic ) )"
+PATCHES=(
+ "${FILESDIR}/quassel-0.14.0-cxxflags.patch"
+)
+
src_configure() {
local mycmakeargs=(
-DBUILD_TESTING=$(usex test)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/
@ 2023-10-15 10:13 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-10-15 10:13 UTC (permalink / raw
To: gentoo-commits
commit: 00f5a632d0a295b604c2a05f2c66ece8aad3bc37
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 19:36:03 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 10:12:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f5a632
net-irc/quassel: fix application name for .desktop shell integration
See also: https://github.com/quassel/quassel/pull/615
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...assel-0.14.0-fix-desktop-application-name.patch | 56 ++++++
net-irc/quassel/quassel-0.14.0-r2.ebuild | 207 +++++++++++++++++++++
2 files changed, 263 insertions(+)
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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-10-15 10:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-14 17:18 [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2020-01-04 11:52 Johannes Huber
2020-01-07 22:28 Johannes Huber
2022-01-14 18:32 Mike Gilbert
2023-10-15 10:13 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox