commit: 4aeb8138d93cf2beb53622d4537e7c4a625948aa Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Wed Aug 26 21:33:15 2020 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Wed Aug 26 21:34:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aeb8138
net-im/swift: fix compilation with qt-5.15 Also fixed QA notice for -r3, that the icon cache was not updated. Closes: https://bugs.gentoo.org/739068 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../files/swift-4.0.2-qt-5.15-compatibility.patch | 10 +++++++ net-im/swift/swift-4.0.2-r2.ebuild | 1 + ...swift-4.0.2-r2.ebuild => swift-4.0.2-r4.ebuild} | 33 +++++++++++++--------- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/net-im/swift/files/swift-4.0.2-qt-5.15-compatibility.patch b/net-im/swift/files/swift-4.0.2-qt-5.15-compatibility.patch new file mode 100644 index 00000000000..37918db1980 --- /dev/null +++ b/net-im/swift/files/swift-4.0.2-qt-5.15-compatibility.patch @@ -0,0 +1,10 @@ +--- a/Swift/QtUI/Roster/GroupItemDelegate.cpp ++++ b/Swift/QtUI/Roster/GroupItemDelegate.cpp +@@ -7,6 +7,7 @@ + #include <Swift/QtUI/Roster/GroupItemDelegate.h> + + #include <QPainter> ++#include <QPainterPath> + #include <QPen> + #include <QtDebug> + diff --git a/net-im/swift/swift-4.0.2-r2.ebuild b/net-im/swift/swift-4.0.2-r2.ebuild index b24e201e652..7075d51f6f8 100644 --- a/net-im/swift/swift-4.0.2-r2.ebuild +++ b/net-im/swift/swift-4.0.2-r2.ebuild @@ -67,6 +67,7 @@ PATCHES=( "${FILESDIR}"/${P}-boost-1.69-compatibility.patch "${FILESDIR}"/${P}-make-generated-files-handle-unicode-characters.patch "${FILESDIR}"/${P}-qt-5.11-compatibility.patch + "${FILESDIR}"/${P}-qt-5.15-compatibility.patch ) src_prepare() { diff --git a/net-im/swift/swift-4.0.2-r2.ebuild b/net-im/swift/swift-4.0.2-r4.ebuild similarity index 84% copy from net-im/swift/swift-4.0.2-r2.ebuild copy to net-im/swift/swift-4.0.2-r4.ebuild index b24e201e652..f32b568d38f 100644 --- a/net-im/swift/swift-4.0.2-r2.ebuild +++ b/net-im/swift/swift-4.0.2-r4.ebuild @@ -1,18 +1,22 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit gnome2-utils scons-utils toolchain-funcs +PYTHON_COMPAT=( python3_{6..9} ) + +inherit python-any-r1 scons-utils toolchain-funcs xdg-utils DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client" HOMEPAGE="https://www.swift.im/"; -SRC_URI="https://swift.im/downloads/releases/${P}/${P}.tar.gz"; +SRC_URI=" + https://swift.im/downloads/releases/${P}/${P}.tar.gz + https://dev.gentoo.org/~conikost/distfiles/patches/swift-4.0.2-python3-compatibility.patch.gz"; LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1" SLOT="4/0" -KEYWORDS="amd64" -IUSE="client expat gconf +icu +idn lua spell test zeroconf" +KEYWORDS="~amd64" +IUSE="+client expat gconf +icu +idn lua spell test zeroconf" REQUIRED_USE=" || ( icu idn ) gconf? ( client ) @@ -25,7 +29,7 @@ RDEPEND=" dev-libs/openssl:0= net-libs/libnatpmp net-libs/miniupnpc:= - sys-libs/zlib:= + sys-libs/zlib client? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -65,8 +69,9 @@ DOCS=( PATCHES=( "${FILESDIR}"/${P}-boost-1.69-compatibility.patch - "${FILESDIR}"/${P}-make-generated-files-handle-unicode-characters.patch + "${WORKDIR}"/${P}-python3-compatibility.patch "${FILESDIR}"/${P}-qt-5.11-compatibility.patch + "${FILESDIR}"/${P}-qt-5.15-compatibility.patch ) src_prepare() { @@ -185,11 +190,11 @@ src_test() { src_install() { local myesconsinstall=( - SWIFTEN_INSTALLDIR="${ED%/}/usr" - SWIFTEN_LIBDIR="${ED%/}/usr/$(get_libdir)" - $(usex client "SWIFT_INSTALLDIR=${ED%/}/usr" '') - $(usex lua "SLUIFT_DIR=${ED%/}/usr" '') - $(usex lua "SLUIFT_INSTALLDIR=${ED%/}/usr" '') + SWIFTEN_INSTALLDIR="${ED}/usr" + SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)" + $(usex client "SWIFT_INSTALLDIR=${ED}/usr" '') + $(usex lua "SLUIFT_DIR=${ED}/usr" '') + $(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '') "${ED}" ) @@ -203,9 +208,9 @@ src_install() { } pkg_postinst() { - use client && gnome2_icon_cache_update + use client && xdg_icon_cache_update } pkg_postrm() { - use client && gnome2_icon_cache_update + use client && xdg_icon_cache_update }
