* [gentoo-commits] repo/gentoo:master commit in: net-irc/kvirc/files/, net-irc/kvirc/
@ 2019-08-16 17:03 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2019-08-16 17:03 UTC (permalink / raw
To: gentoo-commits
commit: 1538263608179c516b9f6f1347538dedaf181a16
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Aug 15 19:19:58 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 17:02:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15382636
net-irc/kvirc: Support Python 3.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../kvirc-5.2_pre20190628041642-python-3.patch | 53 ++++++++++++++++++++++
net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild | 6 ++-
net-irc/kvirc/kvirc-9999.ebuild | 6 ++-
3 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch b/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch
new file mode 100644
index 00000000000..14e9e6f795c
--- /dev/null
+++ b/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch
@@ -0,0 +1,53 @@
+https://github.com/kvirc/KVIrc/pull/2269
+
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -67,9 +67,6 @@
+ set(CMAKE_KVIRC_BUILD_COMPILER ${CMAKE_CXX_COMPILER})
+ set(CMAKE_KVIRC_BUILD_COMPILER_FLAGS ${CMAKE_CXX_FLAGS})
+
+-# Prefer Python 2.7 over 3.x (which is currently incompatible) - GitHub issue #2020
+-set(Python_ADDITIONAL_VERSIONS "2.7")
+-
+ # Suffix for GNU/Linux
+ set(LIB_SUFFIX
+ CACHE STRING "Define suffix of directory name (32/64)"
+@@ -751,10 +748,10 @@
+ # Check for Python support
+ option(WANT_PYTHON "Compile Python support" ON)
+ if(WANT_PYTHON)
+- find_package(PythonLibs 2.7)
++ find_package(PythonLibs)
+ if(PYTHONLIBS_FOUND)
+ set(COMPILE_PYTHON_SUPPORT 1)
+- set(CMAKE_STATUS_PYTHON_SUPPORT "Yes")
++ set(CMAKE_STATUS_PYTHON_SUPPORT "Yes, Python ${PYTHONLIBS_VERSION_STRING}")
+ list(APPEND LIBS ${PYTHON_LIBRARIES})
+ include_directories(${PYTHON_INCLUDE_DIRS})
+ else()
+--- /src/modules/pythoncore/kvircmodule.cpp
++++ /src/modules/pythoncore/kvircmodule.cpp
+@@ -413,7 +413,7 @@
+ else
+ {
+ // Create a CObject containing the API pointer array's address
+- PyObject * pC_API_Object = PyCObject_FromVoidPtr(PyKVIrc_API, nullptr);
++ PyObject * pC_API_Object = PyCapsule_New((void *)PyKVIrc_API, "kvirc._C_API", nullptr);
+ if(pC_API_Object)
+ PyModule_AddObject(pModule, "_C_API", pC_API_Object);
+ }
+--- /src/modules/pythoncore/pythonheaderwrapper.h
++++ /src/modules/pythoncore/pythonheaderwrapper.h
+@@ -1,6 +1,12 @@
+ #ifndef _PYTHONHEADERWRAPPER_H_
+ #define _PYTHONHEADERWRAPPER_H_
+
++// As of Python 3, something inside <Python.h> defines a struct with a member
++// called "slots" which conflicts with the builtin Qt keyword. But since we
++// include stuff from KVIrc itself back into the python module, we can't just
++// use QT_NO_KEYWORDS.
++#undef slots
++
+ // See http://stackoverflow.com/questions/16200997/why-doesnt-include-python-h-work and http://stackoverflow.com/questions/19716859/puzzling-dependency-of-boost-python-1-54-debug-build-to-python27-lib-on-window
+
+ #if defined(_DEBUG) && defined(_MSC_VER)
diff --git a/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild b/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild
index 9b9efe89389..7e84f4e5ca9 100644
--- a/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild
+++ b/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=(python2_7)
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
inherit cmake-utils flag-o-matic python-single-r1 xdg-utils
@@ -79,6 +79,10 @@ if [[ "${PV}" != "9999" ]]; then
S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
fi
+PATCHES=(
+ "${FILESDIR}/${PN}-5.2_pre20190628041642-python-3.patch"
+)
+
DOCS=()
pkg_setup() {
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index 3e4e206a18d..46a0772c275 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=(python2_7)
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
inherit cmake-utils flag-o-matic python-single-r1 xdg-utils
@@ -79,6 +79,10 @@ if [[ "${PV}" != "9999" ]]; then
S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
fi
+PATCHES=(
+ "${FILESDIR}/${PN}-5.2_pre20190628041642-python-3.patch"
+)
+
DOCS=()
pkg_setup() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/kvirc/files/, net-irc/kvirc/
@ 2020-07-29 18:46 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2020-07-29 18:46 UTC (permalink / raw
To: gentoo-commits
commit: d4768364901a92c626bea8b01c3aebc0281e5409
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Jul 27 00:00:00 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 18:46:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4768364
net-irc/kvirc: Delete old versions (<5.2_pre20200605155236).
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-irc/kvirc/Manifest | 2 -
.../kvirc-5.2_pre20190628041642-python-3.patch | 53 -------
net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild | 174 ---------------------
net-irc/kvirc/kvirc-5.2_pre20191202122540.ebuild | 174 ---------------------
4 files changed, 403 deletions(-)
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index b96ce261fc3..7f23849cfe8 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,3 +1 @@
-DIST kvirc-5.2_pre20190628041642.tar.gz 5967194 BLAKE2B b1a2e2775056e2db058f82656ac90e43828d497019e9c6ae0431a1092423425558c6eb91a3a8301616cc4cdc7ef1acbab3729702484d703e00dc8e09f7cf243f SHA512 5f532739d9837f357a36fa1df67db0fbf8d8eddb990e686224e53c5678d26ba18c6c7c60422cef4e08ee587156638b278f534b1be1d49251fdeea19858227a5f
-DIST kvirc-5.2_pre20191202122540.tar.gz 5967654 BLAKE2B 059e57f0b8a789388f351c536dc3b57a7fc119cc78206a6a42266a1296e1edc6410ab9f564959d77aabb98ca55c9d4ec63505b4c1d46ad27a7f0f2ee748eae55 SHA512 2e3b7683070446a80642ef07abbc69912e47af59966cbc95698f5b8b1a1726b85ae78890dcc85d3f546f32b3c5f2a6c64ec4049467c6b336798ad91542d48c42
DIST kvirc-5.2_pre20200605155236.tar.gz 6170072 BLAKE2B 2652bcae16263615ccbf494d8265a1ecf997525dbfa70d4ace0c3f6ae58231ce575dfe444a60e2751bb7741445bf44297fafb260c05bad6d637f8dc89eb254b4 SHA512 84499fe13337f114587ff267d5e85e39ef61d99e88c84cfc9f0341a5db2e17b50d644bf8483de420c3629f073d6e3eeb81e25de357a723f54e39f154cb4b7da1
diff --git a/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch b/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch
deleted file mode 100644
index 14e9e6f795c..00000000000
--- a/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://github.com/kvirc/KVIrc/pull/2269
-
---- /CMakeLists.txt
-+++ /CMakeLists.txt
-@@ -67,9 +67,6 @@
- set(CMAKE_KVIRC_BUILD_COMPILER ${CMAKE_CXX_COMPILER})
- set(CMAKE_KVIRC_BUILD_COMPILER_FLAGS ${CMAKE_CXX_FLAGS})
-
--# Prefer Python 2.7 over 3.x (which is currently incompatible) - GitHub issue #2020
--set(Python_ADDITIONAL_VERSIONS "2.7")
--
- # Suffix for GNU/Linux
- set(LIB_SUFFIX
- CACHE STRING "Define suffix of directory name (32/64)"
-@@ -751,10 +748,10 @@
- # Check for Python support
- option(WANT_PYTHON "Compile Python support" ON)
- if(WANT_PYTHON)
-- find_package(PythonLibs 2.7)
-+ find_package(PythonLibs)
- if(PYTHONLIBS_FOUND)
- set(COMPILE_PYTHON_SUPPORT 1)
-- set(CMAKE_STATUS_PYTHON_SUPPORT "Yes")
-+ set(CMAKE_STATUS_PYTHON_SUPPORT "Yes, Python ${PYTHONLIBS_VERSION_STRING}")
- list(APPEND LIBS ${PYTHON_LIBRARIES})
- include_directories(${PYTHON_INCLUDE_DIRS})
- else()
---- /src/modules/pythoncore/kvircmodule.cpp
-+++ /src/modules/pythoncore/kvircmodule.cpp
-@@ -413,7 +413,7 @@
- else
- {
- // Create a CObject containing the API pointer array's address
-- PyObject * pC_API_Object = PyCObject_FromVoidPtr(PyKVIrc_API, nullptr);
-+ PyObject * pC_API_Object = PyCapsule_New((void *)PyKVIrc_API, "kvirc._C_API", nullptr);
- if(pC_API_Object)
- PyModule_AddObject(pModule, "_C_API", pC_API_Object);
- }
---- /src/modules/pythoncore/pythonheaderwrapper.h
-+++ /src/modules/pythoncore/pythonheaderwrapper.h
-@@ -1,6 +1,12 @@
- #ifndef _PYTHONHEADERWRAPPER_H_
- #define _PYTHONHEADERWRAPPER_H_
-
-+// As of Python 3, something inside <Python.h> defines a struct with a member
-+// called "slots" which conflicts with the builtin Qt keyword. But since we
-+// include stuff from KVIrc itself back into the python module, we can't just
-+// use QT_NO_KEYWORDS.
-+#undef slots
-+
- // See http://stackoverflow.com/questions/16200997/why-doesnt-include-python-h-work and http://stackoverflow.com/questions/19716859/puzzling-dependency-of-boost-python-1-54-debug-build-to-python27-lib-on-window
-
- #if defined(_DEBUG) && defined(_MSC_VER)
diff --git a/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild b/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild
deleted file mode 100644
index 43699ea71e5..00000000000
--- a/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 2009-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=(python{3_6,3_7})
-
-inherit cmake-utils 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="2fe1a3bcac42349967e27b3f7098c25f34efca1d"
- 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 x86"
-IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
-REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="dev-lang/perl:0
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- kde? ( kde-frameworks/extra-cmake-modules:5 )
- 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:0= )
- ssl? ( dev-libs/openssl:0= )
- theora? (
- media-libs/libogg
- media-libs/libtheora
- media-libs/libvorbis
- )
- webkit? ( dev-qt/qtwebkit:5 )"
-RDEPEND="${DEPEND}
- gsm? ( media-sound/gsm )"
-
-if [[ "${PV}" != "9999" ]]; then
- S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
-fi
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.2_pre20190628041642-python-3.patch"
-)
-
-DOCS=()
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- cmake-utils_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=$(usex webkit ON OFF)
- -DWANT_SPELLCHECKER=$(usex spell ON OFF)
-
- # COMPILE_SVG_SUPPORT not used in source code.
- -DWANT_QTSVG=OFF
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use doc; then
- cmake-utils_src_compile devdocs
- fi
-}
-
-src_install() {
- cmake-utils_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-5.2_pre20191202122540.ebuild b/net-irc/kvirc/kvirc-5.2_pre20191202122540.ebuild
deleted file mode 100644
index 5a3b7927418..00000000000
--- a/net-irc/kvirc/kvirc-5.2_pre20191202122540.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 2009-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
-
-inherit cmake-utils 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="0df9f22f2f4d013b91d5a8905cbd47c32e8fb9e5"
- 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="https://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 ~x86"
-IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
-REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="dev-lang/perl:0
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- kde? ( kde-frameworks/extra-cmake-modules:5 )
- 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:0= )
- ssl? ( dev-libs/openssl:0= )
- theora? (
- media-libs/libogg
- media-libs/libtheora
- media-libs/libvorbis
- )
- webkit? ( dev-qt/qtwebkit:5 )"
-RDEPEND="${DEPEND}
- gsm? ( media-sound/gsm )"
-
-if [[ "${PV}" != "9999" ]]; then
- S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
-fi
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.2_pre20190628041642-python-3.patch"
-)
-
-DOCS=()
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- cmake-utils_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=$(usex webkit ON OFF)
- -DWANT_SPELLCHECKER=$(usex spell ON OFF)
-
- # COMPILE_SVG_SUPPORT not used in source code.
- -DWANT_QTSVG=OFF
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use doc; then
- cmake-utils_src_compile devdocs
- fi
-}
-
-src_install() {
- cmake-utils_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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/kvirc/files/, net-irc/kvirc/
@ 2024-01-22 5:53 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-01-22 5:53 UTC (permalink / raw
To: gentoo-commits
commit: 26830db60d1c1f3b4579af6dd5f9c4cfe5c4dc73
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sun Jan 21 21:12:14 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 22 05:52:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26830db6
net-irc/kvirc: fix forcing of qt5
Closes: https://bugs.gentoo.org/922636
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/34947
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/kvirc/files/kvirc-5.2.0-qtver.patch | 25 ++++++++++++++++++++++
.../{kvirc-5.2.0.ebuild => kvirc-5.2.0-r1.ebuild} | 4 ++++
2 files changed, 29 insertions(+)
diff --git a/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch b/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch
new file mode 100644
index 000000000000..9f3700ec9d9b
--- /dev/null
+++ b/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch
@@ -0,0 +1,25 @@
+From a301aa4998c4f0040d093cd2950b7b2f4ec4dcdc Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <sokolov@google.com>
+Date: Sun, 21 Jan 2024 21:07:37 +0000
+Subject: [PATCH] Fix ability to select Qt5 vs Qt6
+
+https://bugs.gentoo.org/922636
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aabc0988b..9368e81c9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -389,7 +389,9 @@ endif()
+ ############################################################################
+
+ # first check if Qt6 or Qt5 has to be used
+-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
++if(NOT DEFINED QT_VERSION_MAJOR)
++ find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
++endif()
+ # second, detect available modules for the specific Qt version
+ find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
+ if(Qt${QT_VERSION_MAJOR}Widgets_FOUND)
diff --git a/net-irc/kvirc/kvirc-5.2.0.ebuild b/net-irc/kvirc/kvirc-5.2.0-r1.ebuild
similarity index 98%
rename from net-irc/kvirc/kvirc-5.2.0.ebuild
rename to net-irc/kvirc/kvirc-5.2.0-r1.ebuild
index aff1e010cbc6..9e0cd048be85 100644
--- a/net-irc/kvirc/kvirc-5.2.0.ebuild
+++ b/net-irc/kvirc/kvirc-5.2.0-r1.ebuild
@@ -66,6 +66,10 @@ RDEPEND="${DEPEND}
DOCS=()
+PATCHES=(
+ "${FILESDIR}/kvirc-5.2.0-qtver.patch"
+)
+
pkg_setup() {
if use python; then
python-single-r1_pkg_setup
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/kvirc/files/, net-irc/kvirc/
@ 2024-02-23 13:03 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2024-02-23 13:03 UTC (permalink / raw
To: gentoo-commits
commit: bd56bfe0365680f36c3b03221e9f3ea93404f9e1
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Fri Feb 23 09:14:11 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 13:03:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd56bfe0
net-irc/kvirc: fix build with +dcc-video
Closes: https://bugs.gentoo.org/925309
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch | 69 ++++++++++++++++++++++++++
net-irc/kvirc/kvirc-5.2.0-r2.ebuild | 1 +
2 files changed, 70 insertions(+)
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 <alebastr89@gmail.com>
+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/kvirc-5.2.0-r2.ebuild b/net-irc/kvirc/kvirc-5.2.0-r2.ebuild
index 5cd2cd5f3b7a..bb2c098eb7b8 100644
--- a/net-irc/kvirc/kvirc-5.2.0-r2.ebuild
+++ b/net-irc/kvirc/kvirc-5.2.0-r2.ebuild
@@ -70,6 +70,7 @@ DOCS=()
PATCHES=(
"${FILESDIR}/kvirc-5.2.0-qtver.patch"
+ "${FILESDIR}/kvirc-5.2.0-dccvideo.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/kvirc/files/, net-irc/kvirc/
@ 2024-02-23 13:03 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2024-02-23 13:03 UTC (permalink / raw
To: gentoo-commits
commit: ef0e74fc4ed4fb63d3a07ac57cd8a29abc295649
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Fri Feb 23 09:09:27 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 13:03:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef0e74fc
net-irc/kvirc: drop 5.2_pre20220629000000
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-irc/kvirc/Manifest | 1 -
.../kvirc-5.2_pre20210630233331-fixqprocess.patch | 29 ----
net-irc/kvirc/kvirc-5.2_pre20220629000000.ebuild | 179 ---------------------
3 files changed, 209 deletions(-)
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 52ec1fb1df4c..57b9a9ff14c2 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,2 +1 @@
DIST kvirc-5.2.0.tar.gz 6365703 BLAKE2B fda63b6579b9d8d75eae5c2b039f474f4a810c79c74d98da0adebc4bec51c19286a9fb4a219dafefdf4132709394e946dd5aa30d1335ce1af4cbffd60764578d SHA512 01a183ae283b774dc096ec4bf81509ad79acf10fb3c82e06f66b7360736d32c1514856849ef562e2fc2b4ef3019e0842d17de8a762c7858dbac34f85de125079
-DIST kvirc-5.2_pre20220629000000.tar.gz 6173590 BLAKE2B b4bfdc307df81a485acb72b33908f82bad0793139543abed03a1b84cae36cba4e11a6b8098cffc9669cb0a7c9072fd6a608589ce03a228b25dfd00b8d7d94b82 SHA512 4369f3703555c8717febfd32c06f6fd8576424cb3a92f9d9e24a5af93acf69ca8707d89a27804457327fd6c30601566d7874c0fc08e12018a3f5440ea988a69e
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 <sokolov@google.com>
-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 <KToolInvocation> // 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 <KToolInvocation>
-+#endif
- // invokeTerminal()
- #include <QProcess>
- #include <QStringList>
--#endif
-
- PluginManager * g_pPluginManager;
-
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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/kvirc/files/, net-irc/kvirc/
@ 2024-09-05 4:08 Eli Schwartz
0 siblings, 0 replies; 6+ messages in thread
From: Eli Schwartz @ 2024-09-05 4:08 UTC (permalink / raw
To: gentoo-commits
commit: 7ebadc598014ca452189058f808d0ba000299de4
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Wed Sep 4 15:37:35 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Thu Sep 5 04:07:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ebadc59
net-irc/kvirc: drop 5.2.0-r1, 5.2.0-r2, 5.2.2
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
net-irc/kvirc/Manifest | 2 -
net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch | 69 -----------
net-irc/kvirc/files/kvirc-5.2.0-qtver.patch | 25 ----
net-irc/kvirc/kvirc-5.2.0-r1.ebuild | 162 ------------------------
net-irc/kvirc/kvirc-5.2.0-r2.ebuild | 164 -------------------------
net-irc/kvirc/kvirc-5.2.2.ebuild | 159 ------------------------
6 files changed, 581 deletions(-)
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index f63504991f48..670edde31f44 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,3 +1 @@
-DIST kvirc-5.2.0.tar.gz 6365703 BLAKE2B fda63b6579b9d8d75eae5c2b039f474f4a810c79c74d98da0adebc4bec51c19286a9fb4a219dafefdf4132709394e946dd5aa30d1335ce1af4cbffd60764578d SHA512 01a183ae283b774dc096ec4bf81509ad79acf10fb3c82e06f66b7360736d32c1514856849ef562e2fc2b4ef3019e0842d17de8a762c7858dbac34f85de125079
-DIST kvirc-5.2.2.tar.gz 6362952 BLAKE2B ba90de3730dee0466c21cd658eda622bfb8f601e1af79d53952b2b016c0bacf0dc1d83c78f307288cc2e3bfda409773adfffc1b53fba6a0d8c682a5ab8739259 SHA512 dcb140051cebe4eaa82d8b8e221e4df3f40695b3b3a9aa9842ef5325e3129c73d08e5849589385793efc1eb70fd115ee634422af8be3f943eea79719a4159ea5
DIST kvirc-5.2.4.tar.gz 6333384 BLAKE2B e9e85c90cd66bda6b53aac14f807e487c1b65b3a4e463462ea768227a28f774db40e0dce63387aa934b3366db376be945e76682c5a14aae638e4f6470741f5e4 SHA512 7658bdf5258d822164d8b38b6f4baa1814ad49a9ecc7dc0013fc0e9dbd952aca0ba9ab8e90dbcfa0c9db43c756e862989b04cedcfba00f2751371955ffea6503
diff --git a/net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch b/net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch
deleted file mode 100644
index 0d2944e30830..000000000000
--- a/net-irc/kvirc/files/kvirc-5.2.0-dccvideo.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From da4659a9d9c30b6d89875f328cca88758ef568c6 Mon Sep 17 00:00:00 2001
-From: Aleksei Bavshin <alebastr89@gmail.com>
-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.0-qtver.patch b/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch
deleted file mode 100644
index 9f3700ec9d9b..000000000000
--- a/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a301aa4998c4f0040d093cd2950b7b2f4ec4dcdc Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <sokolov@google.com>
-Date: Sun, 21 Jan 2024 21:07:37 +0000
-Subject: [PATCH] Fix ability to select Qt5 vs Qt6
-
-https://bugs.gentoo.org/922636
----
- CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aabc0988b..9368e81c9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -389,7 +389,9 @@ endif()
- ############################################################################
-
- # first check if Qt6 or Qt5 has to be used
--find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
-+if(NOT DEFINED QT_VERSION_MAJOR)
-+ find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
-+endif()
- # second, detect available modules for the specific Qt version
- find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
- if(Qt${QT_VERSION_MAJOR}Widgets_FOUND)
diff --git a/net-irc/kvirc/kvirc-5.2.0-r1.ebuild b/net-irc/kvirc/kvirc-5.2.0-r1.ebuild
deleted file mode 100644
index e9b6d4a308d7..000000000000
--- a/net-irc/kvirc/kvirc-5.2.0-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# 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"
-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
- )"
-RDEPEND="${DEPEND}
- gsm? ( media-sound/gsm )"
-
-DOCS=()
-
-PATCHES=(
- "${FILESDIR}/kvirc-5.2.0-qtver.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_QTWEBKIT=OFF
- -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.0-r2.ebuild b/net-irc/kvirc/kvirc-5.2.0-r2.ebuild
deleted file mode 100644
index bb2c098eb7b8..000000000000
--- a/net-irc/kvirc/kvirc-5.2.0-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# 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.2.ebuild b/net-irc/kvirc/kvirc-5.2.2.ebuild
deleted file mode 100644
index 5f7c77b52cf6..000000000000
--- a/net-irc/kvirc/kvirc-5.2.2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# 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=()
-
-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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-09-05 4:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-29 18:46 [gentoo-commits] repo/gentoo:master commit in: net-irc/kvirc/files/, net-irc/kvirc/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2024-09-05 4:08 Eli Schwartz
2024-02-23 13:03 Joonas Niilola
2024-02-23 13:03 Joonas Niilola
2024-01-22 5:53 Sam James
2019-08-16 17:03 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox