From 4aeb8138d93cf2beb53622d4537e7c4a625948aa Mon Sep 17 00:00:00 2001 From: Conrad Kostecki Date: Wed, 26 Aug 2020 23:33:15 +0200 Subject: 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 --- .../files/swift-4.0.2-qt-5.15-compatibility.patch | 10 + net-im/swift/swift-4.0.2-r2.ebuild | 1 + net-im/swift/swift-4.0.2-r4.ebuild | 216 +++++++++++++++++++++ 3 files changed, 227 insertions(+) create mode 100644 net-im/swift/files/swift-4.0.2-qt-5.15-compatibility.patch create mode 100644 net-im/swift/swift-4.0.2-r4.ebuild (limited to 'net-im/swift') 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 000000000000..37918db1980f --- /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 + + #include ++#include + #include + #include + diff --git a/net-im/swift/swift-4.0.2-r2.ebuild b/net-im/swift/swift-4.0.2-r2.ebuild index b24e201e6521..7075d51f6f81 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-r4.ebuild b/net-im/swift/swift-4.0.2-r4.ebuild new file mode 100644 index 000000000000..f32b568d38f0 --- /dev/null +++ b/net-im/swift/swift-4.0.2-r4.ebuild @@ -0,0 +1,216 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 + 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" +REQUIRED_USE=" + || ( icu idn ) + gconf? ( client ) + spell? ( client ) +" + +RDEPEND=" + dev-db/sqlite:3 + dev-libs/boost:= + dev-libs/openssl:0= + net-libs/libnatpmp + net-libs/miniupnpc:= + sys-libs/zlib + client? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtwebkit:5 + dev-qt/qtx11extras:5 + net-dns/avahi + ) + expat? ( dev-libs/expat ) + !expat? ( dev-libs/libxml2:2 ) + gconf? ( gnome-base/gconf:2 ) + icu? ( dev-libs/icu:= ) + idn? ( net-dns/libidn:= ) + lua? ( dev-lang/lua:= ) + spell? ( app-text/hunspell:= ) +" + +DEPEND=" + ${RDEPEND} + >=dev-util/scons-3.0.1-r3 + client? ( dev-qt/linguist-tools:5 ) + test? ( net-dns/avahi ) +" + +# Tests don't run, as they fail with "[QA/UnitTest/**dummy**] Error -6". +RESTRICT="test" + +DOCS=( + "DEVELOPMENT.md" + "README.md" + "Swiften/ChangeLog.md" +) + +PATCHES=( + "${FILESDIR}"/${P}-boost-1.69-compatibility.patch + "${WORKDIR}"/${P}-python3-compatibility.patch + "${FILESDIR}"/${P}-qt-5.11-compatibility.patch + "${FILESDIR}"/${P}-qt-5.15-compatibility.patch +) + +src_prepare() { + default + + # Don't include '/usr/lib*' in the link command line for `swiften-config` + sed -e '/_LIBDIRFLAGS/d' -i Swiften/Config/SConscript || die + + # Hack for finding Qt system libs + mkdir "${T}"/qt || die + ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die + ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die + ln -s "${EPREFIX}"/usr/include/qt5 "${T}"/qt/include || die + + # Remove parts of Swift, which a user don't want to compile + if ! use client; then rm -fr Swift Slimber || die; fi + if ! use lua; then rm -fr Sluift || die; fi + if ! use zeroconf; then + rm -fr Limber || die + if use client; then rm -fr Slimber || die; fi + fi + + # Remove '3rdParty', as the system libs should be used + # `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests + local my3rdparty=( + Boost + Breakpad + DocBook + Expat + LCov + Ldns + LibIDN + LibMiniUPnPc + LibNATPMP + Lua + OpenSSL + SCons + SQLite + Unbound + ZLib + ) + + if use test; then + cd 3rdParty && rm -fr "${my3rdparty[@]}" || die + else + rm -fr 3rdParty || die + fi +} + +src_configure() { + MYSCONS=( + ar="$(tc-getAR)" + allow_warnings="yes" + assertions="no" + build_examples="yes" + boost_bundled_enable="false" + boost_force_bundled="false" + cc="$(tc-getCC)" + ccache="no" + ccflags="${CFLAGS}" + coverage="no" + cxx="$(tc-getCXX)" + cxxflags="${CXXFLAGS}" + debug="no" + distcc="no" + experimental="no" + experimental_ft="yes" + hunspell_enable="$(usex spell)" + icu="$(usex icu)" + install_git_hooks="no" + libidn_bundled_enable="false" + libminiupnpc_force_bundled="false" + libnatpmp_force_bundled="false" + link="$(tc-getCXX)" + linkflags="${LDFLAGS}" + max_jobs="no" + optimize="no" + qt="${T}/qt" + qt5="$(usex client)" + swiften_dll="true" + swift_mobile="no" + target="native" + test="none" + try_avahi="$(usex client)" + try_expat="$(usex expat)" + try_gconf="$(usex gconf)" + try_libidn="$(usex idn)" + try_libxml="$(usex !expat)" + tls_backend="openssl" + unbound="no" + V="1" + valgrind="no" + zlib_bundled_enable="false" + ) +} + +src_compile() { + local myesconsinstall=( + Swiften + $(usex client Swift '') + $(usex lua Sluift '') + $(usex zeroconf Limber '') + $(usex zeroconf "$(usex client Slimber '')" '') + ) + + escons "${MYSCONS[@]}" "${myesconsinstall[@]}" +} + +src_test() { + MYSCONS=( + V="1" + ) + + escons "${MYSCONS[@]}" test=unit QA +} + +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" '') + "${ED}" + ) + + escons "${MYSCONS[@]}" "${myesconsinstall[@]}" + + use zeroconf && dobin Limber/limber + use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli + use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt + + einstalldocs +} + +pkg_postinst() { + use client && xdg_icon_cache_update +} + +pkg_postrm() { + use client && xdg_icon_cache_update +} -- cgit v1.2.3-65-gdbad