diff options
Diffstat (limited to 'net-im/qtox')
| -rw-r--r-- | net-im/qtox/Manifest | 2 | ||||
| -rw-r--r-- | net-im/qtox/files/qtox-1.16.3-qt-5.13.patch | 18 | ||||
| -rw-r--r-- | net-im/qtox/metadata.xml | 11 | ||||
| -rw-r--r-- | net-im/qtox/qtox-1.16.3-r1.ebuild | 76 | ||||
| -rw-r--r-- | net-im/qtox/qtox-1.17.6-r2.ebuild | 90 | ||||
| -rw-r--r-- | net-im/qtox/qtox-9999.ebuild | 66 |
6 files changed, 142 insertions, 121 deletions
diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest index 3c3bb122ec66..26687b415f4c 100644 --- a/net-im/qtox/Manifest +++ b/net-im/qtox/Manifest @@ -1 +1 @@ -DIST qTox-1.16.3.tar.gz 4256757 BLAKE2B 70103e2d912da86dab63424586c642a73614b4a408a53634b146d1e401d5b328a2b8c81c472a94e0e8804d774f693c1250e7263b263e80abef5e111372f29232 SHA512 a857266ffcf32b1963e3a4428501299ce19f3c087087583115dc01e41934fc31d52ea54d781fa93ec7e21f6e3303b4e22383ecaaa7f1f1dbf32d740db73aca4c +DIST qTox-1.17.6.tar.gz 4777590 BLAKE2B d67ea8c1d5c478a791fd8594866130874c036f22ec9fd991e0f6c81fb7919824bba8e13675b0ffaf613188215a4fce6d07545476ab5565922b3989519aedd91f SHA512 840dfbca2cb1a3db4b5ab27cb408e183b152fcd87c0cb915ee58245e7c311b8682605e73497248072a5a48b239058b101a85235ed169d19606dc7bf61865f208 diff --git a/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch b/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch deleted file mode 100644 index 16805843253a..000000000000 --- a/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/CMakeLists.txt 2020-01-15 22:17:59.921502029 +0100 -+++ b/CMakeLists.txt 2020-01-15 22:19:55.834885195 +0100 -@@ -48,7 +48,6 @@ - set(RCC_OPTIONS -compress 9 -threshold 0) - - # Use C++11. --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") - -@@ -56,7 +55,6 @@ - set(POSITION_INDEPENDENT_CODE True) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-overflow") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-aliasing") --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") - - if (NOT WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all") diff --git a/net-im/qtox/metadata.xml b/net-im/qtox/metadata.xml index aa2232cb4665..fe84ae06f1e7 100644 --- a/net-im/qtox/metadata.xml +++ b/net-im/qtox/metadata.xml @@ -1,10 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>chiitoo@gentoo.org</email> + <name>Jimi Huotari</name> + </maintainer> <use> - <flag name="notification">Adds support for GTK Status Notifier tray backends</flag> - <flag name="X">Adds support for X11</flag> + <flag name="spellcheck">Enable spell checking support</flag> + <flag name="X">Enable auto-away support</flag> </use> <upstream> <remote-id type="github">qTox/qTox</remote-id> diff --git a/net-im/qtox/qtox-1.16.3-r1.ebuild b/net-im/qtox/qtox-1.16.3-r1.ebuild deleted file mode 100644 index d29e70e3f7b1..000000000000 --- a/net-im/qtox/qtox-1.16.3-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="qTox-${PV}" -inherit cmake xdg - -DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5" -HOMEPAGE="https://github.com/qTox/qTox" -SRC_URI="https://github.com/qTox/qTox/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="notification test X" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_P}" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -RDEPEND=" - dev-db/sqlcipher - dev-libs/libsodium:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - || ( - dev-qt/qtgui:5[gif,jpeg,png,X(-)] - dev-qt/qtgui:5[gif,jpeg,png,xcb(-)] - ) - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-gfx/qrencode:= - media-libs/libexif:= - media-libs/openal - >=media-video/ffmpeg-2.6.3:=[webp,v4l] - net-libs/tox:0/0.2[av] - notification? ( x11-libs/gtk+:2 ) - X? ( x11-libs/libX11 - x11-libs/libXScrnSaver ) -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" - -PATCHES=( "${FILESDIR}/${P}-qt-5.13.patch" ) # bug #699152 - -src_prepare() { - cmake_src_prepare - - # bug 628574 - if ! use test; then - sed -i CMakeLists.txt -e "/include(Testing)/d" || die - sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die - fi -} - -src_configure() { - local mycmakeargs=( - -DENABLE_STATUSNOTIFIER=$(usex notification) - -DENABLE_GTK_SYSTRAY=$(usex notification) - -DPLATFORM_EXTENSIONS=$(usex X) - -DUSE_FILTERAUDIO=OFF - -DGIT_DESCRIBE="${PV}" - ) - - cmake_src_configure -} diff --git a/net-im/qtox/qtox-1.17.6-r2.ebuild b/net-im/qtox/qtox-1.17.6-r2.ebuild new file mode 100644 index 000000000000..ca93183efb05 --- /dev/null +++ b/net-im/qtox/qtox-1.17.6-r2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/qTox/qTox.git" +else + MY_P="qTox-${PV}" + SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz" + KEYWORDS="amd64 ~x86" + S="${WORKDIR}/qTox" +fi + +DESCRIPTION="Instant messaging client using the encrypted p2p Tox protocol" +HOMEPAGE="https://qtox.github.io/" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="+spellcheck test X" + +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +RDEPEND=" + dev-db/sqlcipher + dev-libs/libsodium:= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5[gif(+),jpeg,png,X(-)] + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-gfx/qrencode:= + media-libs/libexif + media-libs/openal + media-video/ffmpeg:=[webp,v4l] + >=net-libs/tox-0.2.13:=[av] + spellcheck? ( kde-frameworks/sonnet:5 ) + X? ( + x11-libs/libX11 + x11-libs/libXScrnSaver + ) +" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 ) + X? ( x11-base/xorg-proto ) +" + +DOCS=( CHANGELOG.md README.md doc/user_manual_en.md ) + +src_prepare() { + cmake_src_prepare + + # bug 628574 + if ! use test; then + sed -i CMakeLists.txt -e "/include(Testing)/d" || die + sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die + fi +} + +src_configure() { + local mycmakeargs=( + -DPLATFORM_EXTENSIONS=$(usex X) + -DUPDATE_CHECK=OFF + -DUSE_CCACHE=OFF + -DSPELL_CHECK=$(usex spellcheck) + -DSVGZ_ICON=ON + -DASAN=OFF + -DDESKTOP_NOTIFICATIONS=OFF + -DSTRICT_OPTIONS=OFF + ) + + [[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_DESCRIBE=${PV} ) + + cmake_src_configure +} + +src_test() { + # The excluded tests require network access. + cmake_src_test -E "test_(bsu|core)" +} diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild index 8e6526263d3a..efe18c5045f9 100644 --- a/net-im/qtox/qtox-9999.ebuild +++ b/net-im/qtox/qtox-9999.ebuild @@ -1,18 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake git-r3 xdg +inherit cmake xdg -DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5" -HOMEPAGE="https://github.com/qTox/qTox" -EGIT_REPO_URI="https://github.com/qTox/qTox.git" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/qTox/qTox.git" +else + MY_P="qTox-${PV}" + SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/qTox" +fi + +DESCRIPTION="Instant messaging client using the encrypted p2p Tox protocol" +HOMEPAGE="https://qtox.github.io/" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="" -IUSE="notification test X" +IUSE="+spellcheck test X" RESTRICT="!test? ( test )" @@ -25,29 +33,32 @@ RDEPEND=" dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 - || ( - dev-qt/qtgui:5[gif,jpeg,png,X(-)] - dev-qt/qtgui:5[gif,jpeg,png,xcb(-)] - ) + dev-qt/qtgui:5[gif(+),jpeg,png,X(-)] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 - dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/qrencode:= - media-libs/libexif:= + media-libs/libexif media-libs/openal - >=media-video/ffmpeg-2.6.3:=[webp,v4l] - net-libs/tox:0/0.2[av] - notification? ( x11-libs/gtk+:2 ) - X? ( x11-libs/libX11 - x11-libs/libXScrnSaver ) + media-video/ffmpeg:=[webp,v4l] + >=net-libs/tox-0.2.13:=[av] + >=net-libs/toxext-0.0.3 + >=net-libs/tox_extension_messages-0.0.3 + spellcheck? ( kde-frameworks/sonnet:5 ) + X? ( + x11-libs/libX11 + x11-libs/libXScrnSaver + ) " DEPEND="${RDEPEND} test? ( dev-qt/qttest:5 ) + X? ( x11-base/xorg-proto ) " +DOCS=( CHANGELOG.md README.md doc/user_manual_en.md ) + src_prepare() { cmake_src_prepare @@ -60,11 +71,22 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DENABLE_STATUSNOTIFIER=$(usex notification) - -DENABLE_GTK_SYSTRAY=$(usex notification) -DPLATFORM_EXTENSIONS=$(usex X) - -DUSE_FILTERAUDIO=OFF + -DUPDATE_CHECK=OFF + -DUSE_CCACHE=OFF + -DSPELL_CHECK=$(usex spellcheck) + -DSVGZ_ICON=ON + -DASAN=OFF + -DDESKTOP_NOTIFICATIONS=OFF + -DSTRICT_OPTIONS=OFF ) + [[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_DESCRIBE=${PV} ) + cmake_src_configure } + +src_test() { + # The excluded tests require network access. + cmake_src_test -E "test_(bsu|core)" +} |