commit: 664209dc8505d9aa1fd12ed289969ee181b9e551 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jan 15 21:22:44 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jan 17 00:12:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=664209dc
net-im/qtox: EAPI-7 bump, use cmake.eclass, fix build with Qt-5.13 Closes: https://bugs.gentoo.org/699152 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-im/qtox/files/qtox-1.16.3-qt-5.13.patch | 18 +++++++++++++++++ net-im/qtox/qtox-1.16.3.ebuild | 31 ++++++++++++----------------- net-im/qtox/qtox-9999.ebuild | 26 +++++++++--------------- 3 files changed, 40 insertions(+), 35 deletions(-) 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 new file mode 100644 index 00000000000..16805843253 --- /dev/null +++ b/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch @@ -0,0 +1,18 @@ +--- 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/qtox-1.16.3.ebuild b/net-im/qtox/qtox-1.16.3.ebuild index 44236e1bfab..57aabd1c8f0 100644 --- a/net-im/qtox/qtox-1.16.3.ebuild +++ b/net-im/qtox/qtox-1.16.3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit cmake-utils gnome2-utils xdg-utils +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" @@ -14,10 +14,15 @@ 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:= @@ -40,13 +45,13 @@ RDEPEND=" x11-libs/libXScrnSaver ) " DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig test? ( dev-qt/qttest:5 ) " +PATCHES=( "${FILESDIR}/${P}-qt-5.13.patch" ) # bug #699152 + src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # bug 628574 if ! use test; then @@ -64,15 +69,5 @@ src_configure() { -DGIT_DESCRIBE="${PV}" ) - cmake-utils_src_configure -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update + cmake_src_configure } diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild index 955d7a8edce..c2f80f279d6 100644 --- a/net-im/qtox/qtox-9999.ebuild +++ b/net-im/qtox/qtox-9999.ebuild @@ -1,21 +1,25 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils eutils git-r3 gnome2-utils xdg-utils +inherit cmake git-r3 xdg DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5" HOMEPAGE="https://github.com/qTox/qTox"; -SRC_URI="" EGIT_REPO_URI="https://github.com/qTox/qTox.git"; LICENSE="GPL-3+" SLOT="0" KEYWORDS="" IUSE="notification test X" + RESTRICT="!test? ( test )" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" RDEPEND=" dev-db/sqlcipher dev-libs/libsodium:= @@ -38,13 +42,11 @@ RDEPEND=" x11-libs/libXScrnSaver ) " DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig test? ( dev-qt/qttest:5 ) " src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # bug 628574 if ! use test; then @@ -61,15 +63,5 @@ src_configure() { -DUSE_FILTERAUDIO=OFF ) - cmake-utils_src_configure -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update + cmake_src_configure }
