From 9aeefa0bd7e7604816f3ce08002112f9965176c3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 23 Feb 2024 17:40:32 +0000 Subject: gentoo auto-resync : 23:02:2024 - 17:40:32 --- net-irc/Manifest.gz | Bin 8232 -> 8236 bytes net-irc/kvirc/Manifest | 11 +- net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch | 69 ++++++++ .../kvirc-5.2_pre20210630233331-fixqprocess.patch | 29 ---- net-irc/kvirc/kvirc-5.2.0-r1.ebuild | 1 + net-irc/kvirc/kvirc-5.2.0-r2.ebuild | 164 +++++++++++++++++++ net-irc/kvirc/kvirc-5.2_pre20220629000000.ebuild | 179 --------------------- net-irc/kvirc/kvirc-9999.ebuild | 8 +- net-irc/kvirc/metadata.xml | 1 + 9 files changed, 245 insertions(+), 217 deletions(-) create mode 100644 net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch delete mode 100644 net-irc/kvirc/files/kvirc-5.2_pre20210630233331-fixqprocess.patch create mode 100644 net-irc/kvirc/kvirc-5.2.0-r2.ebuild delete mode 100644 net-irc/kvirc/kvirc-5.2_pre20220629000000.ebuild (limited to 'net-irc') diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz index fd8bf0a77f85..4e40a14cc7d5 100644 Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest index cb6d1fa7eff0..b8b8fd137789 100644 --- a/net-irc/kvirc/Manifest +++ b/net-irc/kvirc/Manifest @@ -1,8 +1,7 @@ +AUX kvirc-5.2.0-dccvideo.patch 2435 BLAKE2B 3e037240bc221ad37b4542c91396ccea44f4d785c40821a46e9860f7ffdf245ec558f69accef400e5ce0d3400776fd14852d0e3f21a4b79e561c45eff9c1e3a5 SHA512 7c023828e9b0a26ece18479955aad98047bfa789ddfbf86c7f912a1a43e6fb5d155c6dec9168df4adbe1ea7326a8f543b9a5f2048cd146087a75786d22859190 AUX kvirc-5.2.0-qtver.patch 911 BLAKE2B 23f3af68c8b87643d28cc7e377f6964190c354980d4a3e592c7b0149cf99d99bf3a28b55748d64d0c11533a1b0ee717d2f868b8ade84b39e7b8d0bb9cb9d9dcd SHA512 d5926370fb329ba101f1bd2672076349156f16aa0fc502421777f35c68b293694816219023a12890f91e9ca4827e8aeca6c8cfe2b9ed055eaeab6c9647207a72 -AUX kvirc-5.2_pre20210630233331-fixqprocess.patch 869 BLAKE2B ccdec97ac8cd412c776146a56971f61bff66737a5a5590bb1508f05e64850211b9d0748999d347aaab8ade499d22ae6f9bfd8c4b9bced35de0dc0b2d7669734f SHA512 deb5252936bcb593fe1a11631fe4c03f26c28afaf1e88206a076d2f7754160620178362d0f00023a56f4eafa19d60c4d281cee88c20253ac6629033284719363 DIST kvirc-5.2.0.tar.gz 6365703 BLAKE2B fda63b6579b9d8d75eae5c2b039f474f4a810c79c74d98da0adebc4bec51c19286a9fb4a219dafefdf4132709394e946dd5aa30d1335ce1af4cbffd60764578d SHA512 01a183ae283b774dc096ec4bf81509ad79acf10fb3c82e06f66b7360736d32c1514856849ef562e2fc2b4ef3019e0842d17de8a762c7858dbac34f85de125079 -DIST kvirc-5.2_pre20220629000000.tar.gz 6173590 BLAKE2B b4bfdc307df81a485acb72b33908f82bad0793139543abed03a1b84cae36cba4e11a6b8098cffc9669cb0a7c9072fd6a608589ce03a228b25dfd00b8d7d94b82 SHA512 4369f3703555c8717febfd32c06f6fd8576424cb3a92f9d9e24a5af93acf69ca8707d89a27804457327fd6c30601566d7874c0fc08e12018a3f5440ea988a69e -EBUILD kvirc-5.2.0-r1.ebuild 3817 BLAKE2B 36ed0bbb98d206e1e4370b4d881ab4aed6db6698659f8d5b5336ff2c98ff100a92188ddb6af21a5f695569b3206a2556bd52aebabf81a11ba1251e1ead19bacc SHA512 ba65523e32dddbc0a30fdd390de39dd54d816c8760578f2248d12f2ce08f8711852a44790e4f9881f95997b672b00f9dfb18312264fb01fe63deab49f1404df1 -EBUILD kvirc-5.2_pre20220629000000.ebuild 4387 BLAKE2B fa9b947311a24f05ea67e5361b6ddb9cfc75563653630fb6b042e3179c4e1d00aea2ecd7cdf385ffaf4dc45136a48594f890f3bc110d3cd231d4e165b30a39d1 SHA512 6f843c06033883080a374120b2f93317b5d2096b58031aa095deb8772f741b533ccfa60a9d90ce6ba23b4828ac3e55349ce4fc2484b3925cba4078615f5e2db7 -EBUILD kvirc-9999.ebuild 3767 BLAKE2B 39f9728e01de43f7c67b3268cd33f17b36db8f66b2bfa02edb6dc820b4bbf601d682852ea6435b90977ce1cb1cb9199e2b452ee91dafc208a3607931927a825f SHA512 3869c2363ac8425f1b6c7462dbfb74f73f4d22be97cbb4efa48c1e2ac4e22dac8e0bd67107447fc2cf0e5c7a2b94345d393299ef4ee2837535f3cf9aeda55257 -MISC metadata.xml 632 BLAKE2B 00e76e3f4dae2d7422da074a35e0bf2ed0d919be1a7c86e42779c809f9a31e87e6627d6eac03f8913ab40e094a8e5d284daa42d1140717083c73783342b0bea5 SHA512 a38097a282426fad3339a155ea4e8be00bcae177fb8dc4820c3cd1b1c5ceab5820c47cc7a33573c8b0d391e7ad726f57ee8450dc1b0f33f9dcff8354a9d7e1fe +EBUILD kvirc-5.2.0-r1.ebuild 3840 BLAKE2B 5a55f5df339149b5612e0e5a899e97573b56852a4de3923c826a29eeb9f2be8388924db286116db477869573d18bd454ec881d5ee755d4ed6bed9953b5305b2e SHA512 036a248568ca1a7600afcf1b8b15740b9fc524f2c5237035335bfe32a80aca14a7d58942d14e5c345220be702920e1af257099ed4cf702ef1943ddcc27732cf5 +EBUILD kvirc-5.2.0-r2.ebuild 3957 BLAKE2B 22955fcc7202cfd3191acae1e3a32e9913a25f2b5e276b3a4700c886e0ea5c7254fcb4d667cf41aaa45854661f6eb369b6b0d9e7b0faaef43404ccfaad72a6fb SHA512 d4a5a89c70bbbcdc2046604b8612fbd9fb8481eafcb1a6bc150df316a48bc37f1a4498ab53ca2721f2ea5c144d1f10b3dc2410f413cb42668d96559806dc1210 +EBUILD kvirc-9999.ebuild 3863 BLAKE2B 4e412a5a3fc0b630ca5d1169a5a5cce7e72748d89a4c4ecd238ca2c2467f5f1337769c75015741847cb97262e03e67fbd0823a6630e1edd03c2a803edf6f3318 SHA512 a4614efc093f80d6c9662dc534c240d296218336982678f5a8b75e018f2d94d183186025daeb02089ee6936bde401fdcf4bab88e1752b72298d5f05eb6453523 +MISC metadata.xml 685 BLAKE2B 910e706182d26d6591d8aaea2d99ab0b3de4d937cb2179fc64adeb5247b4f113475f1088f9f4d38ba248a0c63504f5d43d29506d90b248909a2f8525d10b6bbd SHA512 a740aefd857f92cb9a896b8b0e7b77aebe234835a96fe3d358de060eb6306606273e34e9578e134d8f79118119500e55208020fd31a4a6c48829f606cba979cd diff --git a/net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch b/net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch new file mode 100644 index 000000000000..0d2944e30830 --- /dev/null +++ b/net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch @@ -0,0 +1,69 @@ +From da4659a9d9c30b6d89875f328cca88758ef568c6 Mon Sep 17 00:00:00 2001 +From: Aleksei Bavshin +Date: Wed, 17 Jan 2024 20:58:27 -0800 +Subject: [PATCH] Fix build with Qt5 and WANT_DCC_VIDEO +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +``` +src/modules/dcc/DccVideoWindow.cpp: In member function ‘virtual const QString& DccVideoWindow::target()’: +src/modules/dcc/DccVideoWindow.cpp:660:40: error: cannot convert ‘QString’ to ‘QString*’ in assignment +``` +--- + src/modules/dcc/DccVideoWindow.cpp | 14 ++------------ + src/modules/dcc/DccVideoWindow.h | 2 +- + 2 files changed, 3 insertions(+), 13 deletions(-) + +diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp +index 7f4f66ea42..7cf8058fe8 100644 +--- a/src/modules/dcc/DccVideoWindow.cpp ++++ b/src/modules/dcc/DccVideoWindow.cpp +@@ -396,7 +396,6 @@ DccVideoWindow::DccVideoWindow(DccDescriptor * dcc, const char * name) + { + m_pDescriptor = dcc; + m_pSlaveThread = nullptr; +- m_pszTarget = nullptr; + + m_pButtonBox = new KviTalHBox(this); + +@@ -557,12 +556,6 @@ DccVideoWindow::~DccVideoWindow() + } + + KviThreadManager::killPendingEvents(this); +- +- if(m_pszTarget) +- { +- delete m_pszTarget; +- m_pszTarget = nullptr; +- } + } + + void DccVideoWindow::resizeEvent(QResizeEvent *) +@@ -654,11 +647,8 @@ void DccVideoWindow::connectionInProgress() + const QString & DccVideoWindow::target() + { + // This may change on the fly... +- if(!m_pszTarget) +- m_pszTarget = new QString(); +- +- m_pszTarget = QString::asprintf("%s@%s:%s", m_pDescriptor->szNick.toUtf8().data(), m_pDescriptor->szIp.toUtf8().data(), m_pDescriptor->szPort.toUtf8().data()); +- return *m_pszTarget; ++ m_szTarget = QString::asprintf("%s@%s:%s", m_pDescriptor->szNick.toUtf8().data(), m_pDescriptor->szIp.toUtf8().data(), m_pDescriptor->szPort.toUtf8().data()); ++ return m_szTarget; + } + + void DccVideoWindow::getBaseLogFileName(QString & buffer) +diff --git a/src/modules/dcc/DccVideoWindow.h b/src/modules/dcc/DccVideoWindow.h +index 98bb622f5b..d0f957ea3e 100644 +--- a/src/modules/dcc/DccVideoWindow.h ++++ b/src/modules/dcc/DccVideoWindow.h +@@ -129,7 +129,7 @@ class DccVideoWindow : public DccWindow + QGridLayout * m_pLayout; + QTimer m_Timer; + QLabel * m_pVideoLabel[3]; +- QString * m_pszTarget; ++ QString m_szTarget; + DccVideoThread * m_pSlaveThread; + QByteArray m_tmpTextDataOut; + QString m_szLocalNick; diff --git a/net-irc/kvirc/files/kvirc-5.2_pre20210630233331-fixqprocess.patch b/net-irc/kvirc/files/kvirc-5.2_pre20210630233331-fixqprocess.patch deleted file mode 100644 index 2127dcc3f1ce..000000000000 --- a/net-irc/kvirc/files/kvirc-5.2_pre20210630233331-fixqprocess.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit b4405b0c3dbd00c31d20597360249966bfd627c9 -Author: Alexey Sokolov -Date: Sat May 27 12:46:34 2023 +0100 - - Fix includes, QProcess is used not only without KDE - - https://bugs.gentoo.org/906940 - -diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp -index 2abab2c10..842d3fa3f 100644 ---- a/src/modules/system/libkvisystem.cpp -+++ b/src/modules/system/libkvisystem.cpp -@@ -50,12 +50,13 @@ - #endif - - #ifdef COMPILE_KDE_SUPPORT --#include // invokeTerminal() for system.runcmd --#else // tools we need to work around the absence of -+// invokeTerminal() for system.runcmd -+// tools we need to work around the absence of -+#include -+#endif - // invokeTerminal() - #include - #include --#endif - - PluginManager * g_pPluginManager; - diff --git a/net-irc/kvirc/kvirc-5.2.0-r1.ebuild b/net-irc/kvirc/kvirc-5.2.0-r1.ebuild index bbcb5423619c..e9b6d4a308d7 100644 --- a/net-irc/kvirc/kvirc-5.2.0-r1.ebuild +++ b/net-irc/kvirc/kvirc-5.2.0-r1.ebuild @@ -29,6 +29,7 @@ BDEPEND="dev-lang/perl:0 kde? ( kde-frameworks/extra-cmake-modules:0 ) nls? ( sys-devel/gettext )" DEPEND="dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 diff --git a/net-irc/kvirc/kvirc-5.2.0-r2.ebuild b/net-irc/kvirc/kvirc-5.2.0-r2.ebuild new file mode 100644 index 000000000000..bb2c098eb7b8 --- /dev/null +++ b/net-irc/kvirc/kvirc-5.2.0-r2.ebuild @@ -0,0 +1,164 @@ +# Copyright 2009-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +DESCRIPTION="Advanced IRC Client" +HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc" +CMAKE_MAKEFILE_GENERATOR="emake" +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake flag-o-matic python-single-r1 xdg + +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" + KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}/KVIrc-${PV}" +fi + +LICENSE="GPL-2+" +SLOT="0" +IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon 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/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + sys-libs/zlib:0= + x11-libs/libX11 + x11-libs/libXScrnSaver + audiofile? ( media-libs/audiofile ) + dbus? ( dev-qt/qtdbus:5 ) + dcc-video? ( dev-qt/qtmultimedia:5[widgets] ) + kde? ( + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/knotifications:5 + kde-frameworks/kservice:5 + kde-frameworks/kwindowsystem:5 + kde-frameworks/kxmlgui:5 + ) + perl? ( dev-lang/perl:0= ) + phonon? ( media-libs/phonon[qt5(+)] ) + 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:5[widgets] )" +RDEPEND="${DEPEND} + gsm? ( media-sound/gsm )" + +DOCS=() + +PATCHES=( + "${FILESDIR}/kvirc-5.2.0-qtver.patch" + "${FILESDIR}/kvirc-5.2.0-dccvideo.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_DCC_VIDEO=$(usex dcc-video) + -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_PHONON=$(usex phonon) + -DWANT_PYTHON=$(usex python) + -DWANT_QTDBUS=$(usex dbus) + -DWANT_QTWEBENGINE=$(usex webengine) + -DWANT_SPELLCHECKER=$(usex spell) + -DQT_VERSION_MAJOR=5 + + # COMPILE_SVG_SUPPORT not used in source code. + -DWANT_QTSVG=OFF + ) + 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 +} diff --git a/net-irc/kvirc/kvirc-5.2_pre20220629000000.ebuild b/net-irc/kvirc/kvirc-5.2_pre20220629000000.ebuild deleted file mode 100644 index 6ef133b45f09..000000000000 --- a/net-irc/kvirc/kvirc-5.2_pre20220629000000.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 2009-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" -CMAKE_MAKEFILE_GENERATOR="emake" -PYTHON_COMPAT=( python3_{10..11} ) - -inherit cmake flag-o-matic python-single-r1 xdg-utils - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/kvirc/KVIrc" - KVIRC_GIT_REVISION="" - KVIRC_GIT_SOURCES_DATE="" -else - KVIRC_GIT_REVISION="eb3fdd6b1d824f148fd6e582852dcba77fc9a271" - KVIRC_GIT_SOURCES_DATE="${PV#*_pre}" - KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}" -fi - -DESCRIPTION="Advanced IRC Client" -HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 ~riscv x86" -IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora" -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/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - sys-libs/zlib:0= - x11-libs/libX11 - x11-libs/libXScrnSaver - audiofile? ( media-libs/audiofile ) - dbus? ( dev-qt/qtdbus:5 ) - dcc-video? ( dev-qt/qtmultimedia:5[widgets] ) - kde? ( - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/knotifications:5 - kde-frameworks/kservice:5 - kde-frameworks/kwindowsystem:5 - kde-frameworks/kxmlgui:5 - ) - perl? ( dev-lang/perl:0= ) - phonon? ( media-libs/phonon[qt5(+)] ) - python? ( ${PYTHON_DEPS} ) - spell? ( app-text/enchant:2 ) - ssl? ( dev-libs/openssl:0= ) - theora? ( - media-libs/libogg - media-libs/libtheora - media-libs/libvorbis - )" -RDEPEND="${DEPEND} - gsm? ( media-sound/gsm )" - -if [[ "${PV}" != "9999" ]]; then - S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}" -fi - -DOCS=() - -PATCHES=( - "${FILESDIR}/kvirc-5.2_pre20210630233331-fixqprocess.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)" - fi - 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" -} - -src_configure() { - append-flags -fno-strict-aliasing - - local libdir="$(get_libdir)" - local mycmakeargs=( - -DLIB_SUFFIX=${libdir#lib} - -DMANUAL_REVISION=${KVIRC_GIT_REVISION} - -DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/} - -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 ON OFF) - -DWANT_DCC_VIDEO=$(usex dcc-video ON OFF) - -DWANT_DEBUG=$(usex debug ON OFF) - -DWANT_DOXYGEN=$(usex doc ON OFF) - -DWANT_GETTEXT=$(usex nls ON OFF) - -DWANT_GSM=$(usex gsm ON OFF) - -DWANT_KDE=$(usex kde ON OFF) - -DWANT_MEMORY_PROFILE=$(usex profile ON OFF) - -DWANT_OGG_THEORA=$(usex theora ON OFF) - -DWANT_OPENSSL=$(usex ssl ON OFF) - -DWANT_OSS=$(usex oss ON OFF) - -DWANT_PERL=$(usex perl ON OFF) - -DWANT_PHONON=$(usex phonon ON OFF) - -DWANT_PYTHON=$(usex python ON OFF) - -DWANT_QTDBUS=$(usex dbus ON OFF) - -DWANT_QTWEBKIT=OFF - -DWANT_SPELLCHECKER=$(usex spell ON OFF) - - # COMPILE_SVG_SUPPORT not used in source code. - -DWANT_QTSVG=OFF - ) - if use python; then - mycmakeargs+=( - -DPython3_INCLUDE_DIR="$(python_get_includedir)" - -DPython3_LIBRARY="$(python_get_library_path)" - ) - 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 -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild index aff1e010cbc6..32a984d0afbb 100644 --- a/net-irc/kvirc/kvirc-9999.ebuild +++ b/net-irc/kvirc/kvirc-9999.ebuild @@ -20,7 +20,7 @@ fi LICENSE="GPL-2+" SLOT="0" -IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora" +IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webengine" REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )" BDEPEND="dev-lang/perl:0 @@ -29,6 +29,7 @@ BDEPEND="dev-lang/perl:0 kde? ( kde-frameworks/extra-cmake-modules:0 ) nls? ( sys-devel/gettext )" DEPEND="dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 @@ -60,7 +61,8 @@ DEPEND="dev-qt/qtcore:5 media-libs/libogg media-libs/libtheora media-libs/libvorbis - )" + ) + webengine? ( dev-qt/qtwebengine:5[widgets] )" RDEPEND="${DEPEND} gsm? ( media-sound/gsm )" @@ -114,7 +116,7 @@ src_configure() { -DWANT_PHONON=$(usex phonon) -DWANT_PYTHON=$(usex python) -DWANT_QTDBUS=$(usex dbus) - -DWANT_QTWEBKIT=OFF + -DWANT_QTWEBENGINE=$(usex webengine) -DWANT_SPELLCHECKER=$(usex spell) -DQT_VERSION_MAJOR=5 diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml index 38df8ca67e71..a983cfff0bb5 100644 --- a/net-irc/kvirc/metadata.xml +++ b/net-irc/kvirc/metadata.xml @@ -12,6 +12,7 @@ Support video connections over DCC protocol Support Phonon for audio output + Support Qt WebEngine kvirc/KVIrc -- cgit v1.2.3