[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/
commit: 00f5a632d0a295b604c2a05f2c66ece8aad3bc37 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 14 19:36:03 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 15 10:12:46 2023 + 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 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 ..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 +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 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 ..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} != ** ]]; 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? ( || (
[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/
commit: 4da043aa794888f08ab2ebfda77a95182f96ed38 Author: Mike Gilbert gentoo org> AuthorDate: Fri Jan 14 18:31:01 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Jan 14 18:31:01 2022 + 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 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 ..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 +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)
[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/
commit: 17e237e072a6205547e2c43e99cc2bbc5914ff00 Author: Johannes Huber gentoo org> AuthorDate: Tue Jan 7 22:27:34 2020 + Commit: Johannes Huber gentoo org> CommitDate: Tue Jan 7 22:27:51 2020 + 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 quassel-irc.org>. Closes: https://bugs.gentoo.org/703904 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Johannes Huber 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 000..f0305ea53ce --- /dev/null +++ b/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch @@ -0,0 +1,118 @@ +commit c90702bdbc43fc542d7df6d5ec4b321912ca0035 +Author: Manuel Nickschas +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 MsgIdList; + typedef QList 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(v); + return in; + } ++#endif + + // Exceptions + +diff --git a/src/common/typestest.cpp b/src/common/typestest.cpp +new file mode 100644 +index ..04031c29 +--- /dev/null b/src/common/typestest.cpp +@@ -0,0 +1,79 @@ ++/*** ++ * Copyright (C) 2005-2020 by the Quassel Project* ++ * de...@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 ++ ++#include ++#include ++#include ++ ++#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)); ++
[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/
commit: 39e5421bb559eff29a045d04df45835ea6f17dcd Author: Johannes Huber gentoo org> AuthorDate: Sat Jan 4 11:47:14 2020 + Commit: Johannes Huber gentoo org> CommitDate: Sat Jan 4 11:52:14 2020 + 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 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..000 --- a/net-irc/quassel/files/quassel-0.12.5-qt511.patch +++ /dev/null @@ -1,67 +0,0 @@ -commit 0cc8e1431feb739d0727f0131c87a7ecbe336a81 -Author: Manuel Nickschas -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 @@ Support the Oxygen icon set that was the defau
[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/
commit: 396858ac62530deef0a1fcd44c322d8f6065df6f Author: Michael Palimaka gentoo org> AuthorDate: Wed Sep 14 17:18:12 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Sep 14 17:18:39 2016 + 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.. --- 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?= -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 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.. --- 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 -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