Dessa/gentoo
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

[net-im/swift] sync with in-tree version

Browse Source
This commit is contained in:
Robert Förster 2020-12-14 02:15:12 +01:00
parent 7e7549c302
commit 6ae0727ee3
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net-im/swift/files/swift-4.0.2-qt-5.15-compatibility.patch Normal file
View File

@ -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>

26
net-im/swift/swift-9999.ebuild
View File

@ -3,9 +3,10 @@
EAPI=7 EAPI=7
PYTHON_COMPAT=( python3_{6..8} ) LUA_COMPAT=( lua5-{1..2} luajit )
PYTHON_COMPAT=( python3_{6..9} )
inherit gnome2-utils python-any-r1 scons-utils toolchain-funcs inherit lua-single python-any-r1 scons-utils toolchain-funcs xdg-utils
DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client" DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
HOMEPAGE="https://www.swift.im/" HOMEPAGE="https://www.swift.im/"
@ -28,6 +29,7 @@ IUSE="+client expat gconf +icu +idn lua spell test zeroconf"
REQUIRED_USE=" REQUIRED_USE="
|| ( icu idn ) || ( icu idn )
gconf? ( client ) gconf? ( client )
lua? ( ${LUA_REQUIRED_USE} )
spell? ( client ) spell? ( client )
" "
@ -55,7 +57,7 @@ RDEPEND="
gconf? ( gnome-base/gconf:2 ) gconf? ( gnome-base/gconf:2 )
icu? ( dev-libs/icu:= ) icu? ( dev-libs/icu:= )
idn? ( net-dns/libidn:= ) idn? ( net-dns/libidn:= )
lua? ( dev-lang/lua:= ) lua? ( ${LUA_DEPS} )
spell? ( app-text/hunspell:= ) spell? ( app-text/hunspell:= )
" "
@ -76,9 +78,15 @@ DOCS=(
) )
PATCHES=( PATCHES=(
"${FILESDIR}"/swift-4.0.2-python3-compatibility.patch "${FILESDIR}"/${PN}-4.0.2-python3-compatibility.patch
"${FILESDIR}"/${PN}-4.0.2-qt-5.15-compatibility.patch
) )
pkg_setup() {
python-any-r1_pkg_setup
use lua && lua-single_pkg_setup
}
src_unpack() { src_unpack() {
if [[ ${PV} = "9999" ]] ; then if [[ ${PV} = "9999" ]] ; then
git-r3_src_unpack git-r3_src_unpack
@ -92,6 +100,9 @@ src_prepare() {
# Don't include '/usr/lib*' in the link command line for `swiften-config` # Don't include '/usr/lib*' in the link command line for `swiften-config`
sed -e '/_LIBDIRFLAGS/d' -i Swiften/Config/SConscript || die sed -e '/_LIBDIRFLAGS/d' -i Swiften/Config/SConscript || die
# Use correct LIBDIR for Lua
sed -e "s/lib/$(get_libdir)/g" -i Sluift/SConscript.variant || die
# Hack for finding Qt system libs # Hack for finding Qt system libs
mkdir "${T}"/qt || die mkdir "${T}"/qt || die
ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
@ -159,6 +170,9 @@ src_configure() {
libnatpmp_force_bundled="false" libnatpmp_force_bundled="false"
link="$(tc-getCXX)" link="$(tc-getCXX)"
linkflags="${LDFLAGS}" linkflags="${LDFLAGS}"
lua_includedir="$(lua_get_include_dir)"
lua_libdir="${EPREFIX}/usr/$(get_libdir)"
lua_libname="$(basename -s '.so' $(lua_get_shared_lib))"
max_jobs="no" max_jobs="no"
optimize="no" optimize="no"
qt="${T}/qt" qt="${T}/qt"
@ -220,9 +234,9 @@ src_install() {
} }
pkg_postinst() { pkg_postinst() {
use client && gnome2_icon_cache_update use client && xdg_icon_cache_update
} }
pkg_postrm() { pkg_postrm() {
use client && gnome2_icon_cache_update use client && xdg_icon_cache_update
} }