commit: 72dd0af4a6223bf0e22c436d3279bff52902c383 Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> AuthorDate: Sat Dec 13 09:13:13 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Dec 18 08:35:58 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72dd0af4
net-irc/kvirc: drop 5.2.6-r2 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Part-of: https://github.com/gentoo/gentoo/pull/45013 Signed-off-by: Sam James <sam <AT> gentoo.org> net-irc/kvirc/Manifest | 1 - net-irc/kvirc/files/kvirc-5.2.6-qt-6.9.patch | 186 --------------------------- net-irc/kvirc/kvirc-5.2.6-r2.ebuild | 156 ---------------------- 3 files changed, 343 deletions(-) diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest index 1ba2ff41c2bb..08a40edd0f8f 100644 --- a/net-irc/kvirc/Manifest +++ b/net-irc/kvirc/Manifest @@ -1,2 +1 @@ -DIST kvirc-5.2.6.tar.gz 6336310 BLAKE2B ef86dd65cfb3ffe4de528fcbb0c3a1ce845f7108279d67590699e86a515fd62cfdadce360224020f77e4285c6cfe93897c69ac2d6d23da44be49753e41908e7c SHA512 54c845287d69be0e777a812b47212e061ae74b85c129fe97091ada554a320f4ae6ef65643a2a8238c8f938d1e1d7b02236d76e0950a41e6376288ac1b9070de5 DIST kvirc-5.2.8.tar.gz 6443327 BLAKE2B c6b25020b01cf64a345965ad5cc20de3f627630d2fefd208d55abac8f53799968948374ba112e8fa9ee9f83988472af0835b4e3ba2e3d3a67d5d4fb95f0c49d9 SHA512 388fd7d34c2896da600a583c9cf49010d58d4c997e340fbf43b5d7805bb50bf6c9c5a68e893dd4ec3ff83df058e01fc7b7a89069083b86a28de6eab3dbe9e119 diff --git a/net-irc/kvirc/files/kvirc-5.2.6-qt-6.9.patch b/net-irc/kvirc/files/kvirc-5.2.6-qt-6.9.patch deleted file mode 100644 index cc0a1a861ec3..000000000000 --- a/net-irc/kvirc/files/kvirc-5.2.6-qt-6.9.patch +++ /dev/null @@ -1,186 +0,0 @@ -https://github.com/kvirc/KVIrc/commit/5882316f4ccd20a768ae296e1d7efcdfed45d0a3 - -From 5882316f4ccd20a768ae296e1d7efcdfed45d0a3 Mon Sep 17 00:00:00 2001 -From: ctrlaltca <[email protected]> -Date: Mon, 16 Jun 2025 22:22:29 +0200 -Subject: [PATCH] KviControlCodes: fix compilation with Qt >= 6.9 (#2705) - -* KviControlCodes: Qt >= 6.9's QChar removed implicit casts from ctors, add explicit cast to accommodate - -* Update github action jobs ---- - src/kvirc/kvs/KviKvsCoreFunctions_af.cpp | 2 +- - src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp | 4 ++-- - src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp | 4 ++-- - src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp | 2 +- - src/kvirc/kvs/KviKvsReport.cpp | 2 +- - src/kvirc/kvs/object/KviKvsObject.cpp | 2 +- - src/kvirc/ui/KviInputEditor.cpp | 2 +- - src/kvirc/ui/KviIrcView.cpp | 2 +- - src/kvirc/ui/KviTextIconWindow.cpp | 2 +- - src/modules/regchan/libkviregchan.cpp | 2 +- - src/modules/spaste/SlowPasteController.cpp | 2 +- - 15 files changed, 18 insertions(+), 16 deletions(-) - -diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp -index 07f84e9005..710b0ff062 100644 ---- a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp -+++ b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp -@@ -349,7 +349,7 @@ namespace KviKvsCoreFunctions - - KVSCF(b) - { -- KVSCF_pRetBuffer->setString(QString(QChar(KviControlCodes::Bold))); -+ KVSCF_pRetBuffer->setString(QString(QChar((char)KviControlCodes::Bold))); - return true; - } - -diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp -index f2259bbef9..989d8e9fb5 100644 ---- a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp -+++ b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp -@@ -362,7 +362,7 @@ namespace KviKvsCoreFunctions - - KVSCF(i) - { -- KVSCF_pRetBuffer->setString(QString(QChar(KviControlCodes::Italic))); -+ KVSCF_pRetBuffer->setString(QString(QChar((char)KviControlCodes::Italic))); - return true; - } - -@@ -869,7 +869,7 @@ namespace KviKvsCoreFunctions - KVSCF_PARAMETER("background", KVS_PT_UINT, KVS_PF_OPTIONAL, iBack) - KVSCF_PARAMETERS_END - -- QString szRet = QChar(KviControlCodes::Color); -+ QString szRet = QChar((char)KviControlCodes::Color); - if(KVSCF_pParams->count() > 0) - { - KviQString::appendFormatted(szRet, "%u", iFore); -diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp -index 1cf80c156b..0758fbcddf 100644 ---- a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp -+++ b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp -@@ -378,7 +378,7 @@ namespace KviKvsCoreFunctions - - KVSCF(o) - { -- KVSCF_pRetBuffer->setString(QString(QChar(KviControlCodes::Reset))); -+ KVSCF_pRetBuffer->setString(QString(QChar((char)KviControlCodes::Reset))); - return true; - } - -@@ -504,7 +504,7 @@ namespace KviKvsCoreFunctions - - KVSCF(r) - { -- KVSCF_pRetBuffer->setString(QString(QChar(KviControlCodes::Reverse))); -+ KVSCF_pRetBuffer->setString(QString(QChar((char)KviControlCodes::Reverse))); - return true; - } - -diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp -index fb3b8fcea8..bb999c36d4 100644 ---- a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp -+++ b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp -@@ -772,7 +772,7 @@ namespace KviKvsCoreFunctions - - KVSCF(u) - { -- KVSCF_pRetBuffer->setString(QString(QChar(KviControlCodes::Underline))); -+ KVSCF_pRetBuffer->setString(QString(QChar((char)KviControlCodes::Underline))); - return true; - } - -diff --git a/src/kvirc/kvs/KviKvsReport.cpp b/src/kvirc/kvs/KviKvsReport.cpp -index 2161e232b8..7d9e87d903 100644 ---- a/src/kvirc/kvs/KviKvsReport.cpp -+++ b/src/kvirc/kvs/KviKvsReport.cpp -@@ -135,7 +135,7 @@ void KviKvsReport::findLineColAndListing(const QChar * pBegin, const QChar * pPo - pBegin++; - - { -- QString * pListingStr = new QString(QString("%1%2 ").arg(QChar(KviControlCodes::Bold)).arg(iLine)); -+ QString * pListingStr = new QString(QString("%1%2 ").arg(QChar((char)KviControlCodes::Bold)).arg(iLine)); - *pListingStr += QString(pLineBegin, pBegin - pLineBegin); - pListingStr->replace("\n", ""); - pListing->append(pListingStr); -diff --git a/src/kvirc/kvs/object/KviKvsObject.cpp b/src/kvirc/kvs/object/KviKvsObject.cpp -index 7d488980c3..7c48cced4e 100644 ---- a/src/kvirc/kvs/object/KviKvsObject.cpp -+++ b/src/kvirc/kvs/object/KviKvsObject.cpp -@@ -1120,7 +1120,7 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c) - szOut = QString("%1, %2").arg(szName, szType); - else - { -- szOut = QString(__tr2qs_ctx("Property: %1%2%3, type %4", "kvs")).arg(QChar(KviControlCodes::Bold)).arg(szName).arg(QChar(KviControlCodes::Bold)).arg(szType); -+ szOut = QString(__tr2qs_ctx("Property: %1%2%3, type %4", "kvs")).arg(QChar((char)KviControlCodes::Bold)).arg(szName).arg(QChar((char)KviControlCodes::Bold)).arg(szType); - szOut.prepend(" "); - } - -diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp -index 3bd6925b0f..46134cd83e 100644 ---- a/src/kvirc/ui/KviInputEditor.cpp -+++ b/src/kvirc/ui/KviInputEditor.cpp -@@ -1500,7 +1500,7 @@ void KviInputEditor::insertText(const QString & szTxt) - if(iIdx != -1) - { - szBlock = szText.left(iIdx); -- //else szBlock = QChar(KviControlCodes::Reset); -+ //else szBlock = QChar((char)KviControlCodes::Reset); - szText.remove(0, iIdx + 1); - } - else -diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp -index 8ca9eec9a5..b49a8b8f56 100644 ---- a/src/kvirc/ui/KviIrcView.cpp -+++ b/src/kvirc/ui/KviIrcView.cpp -@@ -3015,7 +3015,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos, int yPos, QRect - szLink.append(QChar(l->pBlocks[iEndOfLInk].pChunk->type)); - break; - case KviControlCodes::Color: -- szLink.append(QChar(KviControlCodes::Color)); -+ szLink.append(QChar((char)KviControlCodes::Color)); - if(l->pBlocks[iEndOfLInk].pChunk->colors.fore != KviControlCodes::NoChange) - { - szLink.append(QString("%1").arg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.fore))); -diff --git a/src/kvirc/ui/KviTextIconWindow.cpp b/src/kvirc/ui/KviTextIconWindow.cpp -index 3ce4845a3a..6c88eaa112 100644 ---- a/src/kvirc/ui/KviTextIconWindow.cpp -+++ b/src/kvirc/ui/KviTextIconWindow.cpp -@@ -182,7 +182,7 @@ void KviTextIconWindow::autoSelectBestMatchBasedOnOwnerText() - return; - - QString szText = pOwner->textBeforeCursor(); -- int idx = szText.lastIndexOf(QChar(KviControlCodes::Icon)); -+ int idx = szText.lastIndexOf(QChar((char)KviControlCodes::Icon)); - if(idx < 0) - return; - -diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp -index cefc0b9dac..1bd27b48c8 100644 ---- a/src/modules/regchan/libkviregchan.cpp -+++ b/src/modules/regchan/libkviregchan.cpp -@@ -223,7 +223,7 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c) - c->window()->outputNoFmt( - KVI_OUT_SYSTEMMESSAGE, - __tr2qs_ctx("Channel: %1%2@%3", "register") -- .arg(QChar(KviControlCodes::Bold)) -+ .arg(QChar((char)KviControlCodes::Bold)) - .arg(ch->name()) - .arg(ch->netMask())); - -diff --git a/src/modules/spaste/SlowPasteController.cpp b/src/modules/spaste/SlowPasteController.cpp -index f60e84396d..60c66dae25 100644 ---- a/src/modules/spaste/SlowPasteController.cpp -+++ b/src/modules/spaste/SlowPasteController.cpp -@@ -111,7 +111,7 @@ void SlowPasteController::pasteFile() - { - line = data; - if(line.isEmpty()) -- line = QChar(KviControlCodes::Reset); -+ line = QChar((char)KviControlCodes::Reset); - - line.replace('\t', QString(KVI_OPTION_UINT(KviOption_uintSpacesToExpandTabulationInput), ' ')); //expand tabs to spaces - - diff --git a/net-irc/kvirc/kvirc-5.2.6-r2.ebuild b/net-irc/kvirc/kvirc-5.2.6-r2.ebuild deleted file mode 100644 index 3b2d45b3e0c7..000000000000 --- a/net-irc/kvirc/kvirc-5.2.6-r2.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 2009-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{11..13} ) -inherit cmake flag-o-matic python-single-r1 xdg - -DESCRIPTION="Advanced IRC Client" -HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc"; - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kvirc/KVIrc"; -else - SRC_URI="https://github.com/kvirc/KVIrc/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/KVIrc-${PV}" - KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86" -fi - -LICENSE="GPL-2+" -SLOT="0" -IUSE="audiofile +dbus debug doc gsm kde +nls oss +perl profile +python spell +ssl theora webengine" -REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )" - -BDEPEND=" - dev-lang/perl:0 - virtual/pkgconfig - doc? ( app-text/doxygen ) - kde? ( kde-frameworks/extra-cmake-modules:0 ) - nls? ( sys-devel/gettext )" -DEPEND=" - dev-qt/qtbase:6[concurrent,gui,network,sql,widgets,xml] - dev-qt/qtmultimedia:6 - dev-qt/qt5compat:6 - virtual/zlib:= - x11-libs/libX11 - audiofile? ( media-libs/audiofile ) - dbus? ( dev-qt/qtbase:6[dbus] ) - kde? ( - kde-frameworks/kconfig:6 - kde-frameworks/kcoreaddons:6 - kde-frameworks/kio:6 - kde-frameworks/ki18n:6 - kde-frameworks/knotifications:6 - kde-frameworks/kparts:6 - kde-frameworks/kservice:6 - kde-frameworks/kstatusnotifieritem:6 - kde-frameworks/kwindowsystem:6[X] - kde-frameworks/kxmlgui:6 - ) - perl? ( dev-lang/perl:0= ) - python? ( ${PYTHON_DEPS} ) - spell? ( app-text/enchant:2 ) - ssl? ( dev-libs/openssl:0= ) - theora? ( - media-libs/libogg - media-libs/libtheora:= - media-libs/libvorbis - ) - webengine? ( dev-qt/qtwebengine:6[widgets] )" -RDEPEND="${DEPEND} - gsm? ( media-sound/gsm )" - -DOCS=() - -PATCHES=( - "${FILESDIR}"/${PN}-5.2.6-qt-6.9.patch -) - -pkg_setup() { - if use python; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - cmake_src_prepare - - if [[ ${PV} == *9999* ]]; then - KVIRC_GIT_REVISION="$(git show -s --format=%H)" - KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)" - einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}" - sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" \ - -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed" - fi -} - -src_configure() { - append-flags -fno-strict-aliasing - - local libdir="$(get_libdir)" - local mycmakeargs=( - -DLIB_SUFFIX=${libdir#lib} - -DWANT_ENV_FLAGS=ON - -DWANT_VERBOSE=ON - - -DWANT_CRYPT=ON - -DWANT_DCC_VOICE=ON - -DWANT_IPC=ON - -DWANT_IPV6=ON - -DWANT_TRANSPARENCY=ON - - -DWANT_AUDIOFILE=$(usex audiofile) - -DWANT_DEBUG=$(usex debug) - -DWANT_DOXYGEN=$(usex doc) - -DWANT_GETTEXT=$(usex nls) - -DWANT_GSM=$(usex gsm) - -DWANT_KDE=$(usex kde) - -DWANT_MEMORY_PROFILE=$(usex profile) - -DWANT_OGG_THEORA=$(usex theora) - -DWANT_OPENSSL=$(usex ssl) - -DWANT_OSS=$(usex oss) - -DWANT_PERL=$(usex perl) - -DWANT_PYTHON=$(usex python) - -DWANT_QTDBUS=$(usex dbus) - -DWANT_QTWEBENGINE=$(usex webengine) - -DWANT_SPELLCHECKER=$(usex spell) - -DQT_VERSION_MAJOR=6 - - -DWANT_DCC_VIDEO=OFF - -DWANT_PHONON=OFF - -DWANT_QTSVG=OFF # COMPILE_SVG_SUPPORT not used in source code. - ) - if use python; then - mycmakeargs+=( - -DPython3_INCLUDE_DIR="$(python_get_includedir)" - -DPython3_LIBRARY="$(python_get_library_path)" - ) - fi - if [[ ${PV} == *9999* ]]; then - mycmakeargs+=( - -DMANUAL_REVISION=${KVIRC_GIT_REVISION} - -DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/} - ) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc; then - cmake_src_compile devdocs - fi -} - -src_install() { - cmake_src_install - - if use doc; then - docinto html - dodoc -r "${BUILD_DIR}/doc/api/html/"* - fi -}
