[net-im/swift] drop, its in tree
This commit is contained in:
parent
d20b79f7af
commit
b96824b2cf
@ -1,2 +0,0 @@
|
|||||||
DIST swift-4.0.3-python3-compatibility.patch.gz 14964 BLAKE2B ec98bee12734eb00037433b2791817d24a0a53effa653268a886b59358fb82f8e6c05739165f2518c9c5ad5b7ddfcef90734964eb6de647a24197e69b333ebc9 SHA512 95e1a0c49158cbf1392442103c960e2d458a99b34c3f32cdb47fec2d195b709d6c4b0c2961b4c49d05c19e590f2e2ca836c6f559b960015030bf8375b0604c3f
|
|
||||||
DIST swift-4.0.3.tar.bz2 15124142 BLAKE2B 23896b72ffecc5148ade806ec6610c5edfa67ae9000e28383c7cf5a3c8bf275a6fc8208d1d6e7c7715e75bf133869ed404fd35bfb13998849209def3aab46c07 SHA512 59ebf69391f2cbdce538f0ee925f55eec0e8463c2f9b90899cb314f2a036f40ebdc357c4b6a6d3b71ae800ccf6ee6df5ff6011949ea0bb189cdf3e9f231e9733
|
|
||||||
@ -1,77 +0,0 @@
|
|||||||
From a21993d750396d755717df21e331df87af8a0c6a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bruce Stephens <bruce.stephens@isode.com>
|
|
||||||
Date: Wed, 9 Jan 2019 16:21:20 +0000
|
|
||||||
Subject: [PATCH] Don't assume that tribool has an implicit bool conversion
|
|
||||||
|
|
||||||
In boost 1.68.0 the conversion is implicit, but in 1.69.0 it's
|
|
||||||
explicit and we must explicitly call it.
|
|
||||||
|
|
||||||
Change-Id: I24eb78be7510c89b88342d28c539cad4977f99fd
|
|
||||||
---
|
|
||||||
Swiften/Network/PlatformNATTraversalWorker.cpp | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Swiften/Network/PlatformNATTraversalWorker.cpp b/Swiften/Network/PlatformNATTraversalWorker.cpp
|
|
||||||
index f56de0b78b..eaa13b30d3 100644
|
|
||||||
--- a/Swiften/Network/PlatformNATTraversalWorker.cpp
|
|
||||||
+++ b/Swiften/Network/PlatformNATTraversalWorker.cpp
|
|
||||||
@@ -157,7 +157,7 @@ NATTraversalInterface* PlatformNATTraversalWorker::getNATTraversalInterface() co
|
|
||||||
miniUPnPInterface = new MiniUPnPInterface();
|
|
||||||
miniUPnPSupported = miniUPnPInterface->isAvailable();
|
|
||||||
}
|
|
||||||
- SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl;
|
|
||||||
+ SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << static_cast<bool>(miniUPnPSupported) << std::endl;
|
|
||||||
if (miniUPnPSupported) {
|
|
||||||
return miniUPnPInterface;
|
|
||||||
}
|
|
||||||
@@ -168,7 +168,7 @@ NATTraversalInterface* PlatformNATTraversalWorker::getNATTraversalInterface() co
|
|
||||||
natPMPInterface = new NATPMPInterface();
|
|
||||||
natPMPSupported = natPMPInterface->isAvailable();
|
|
||||||
}
|
|
||||||
- SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl;
|
|
||||||
+ SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << static_cast<bool>(natPMPSupported) << std::endl;
|
|
||||||
if (natPMPSupported) {
|
|
||||||
return natPMPInterface;
|
|
||||||
}
|
|
||||||
From bb3bd8a32b220b9c1ffd566da00bcd0ba546156c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Miroslaw Stein <miroslaw.stein@isode.com>
|
|
||||||
Date: Fri, 18 Jan 2019 14:30:24 +0000
|
|
||||||
Subject: [PATCH] Avoid deprecated boost endianess include
|
|
||||||
|
|
||||||
As of Boost 1.69.0, boost/detail/endian.h is deprecated in favour of
|
|
||||||
boost/predef/other/endian.h, and BOOST_(LITTLE|BIG)_ENDIAN by
|
|
||||||
BOOST_ENDIAN_(LITTLE|BIG)_BYTE.
|
|
||||||
|
|
||||||
Test-Information:
|
|
||||||
|
|
||||||
Unit tests pass on Debian 9
|
|
||||||
|
|
||||||
Change-Id: If7076c559a4e35219ff97603f50b80cfbe05b29b
|
|
||||||
---
|
|
||||||
Swiften/Base/Platform.h | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Swiften/Base/Platform.h b/Swiften/Base/Platform.h
|
|
||||||
index 4deba2bdda..22dff30b14 100644
|
|
||||||
--- a/Swiften/Base/Platform.h
|
|
||||||
+++ b/Swiften/Base/Platform.h
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/*
|
|
||||||
- * Copyright (c) 2010 Isode Limited.
|
|
||||||
+ * Copyright (c) 2010-2019 Isode Limited.
|
|
||||||
* All rights reserved.
|
|
||||||
* See the COPYING file for more information.
|
|
||||||
*/
|
|
||||||
@@ -43,9 +43,9 @@
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Endianness
|
|
||||||
-#include <boost/detail/endian.hpp>
|
|
||||||
-#if defined(BOOST_LITTLE_ENDIAN)
|
|
||||||
+#include <boost/predef/other/endian.h>
|
|
||||||
+#if defined(BOOST_ENDIAN_LITTLE_BYTE)
|
|
||||||
#define SWIFTEN_LITTLE_ENDIAN
|
|
||||||
-#elif defined(BOOST_BIG_ENDIAN)
|
|
||||||
+#elif defined(BOOST_ENDIAN_BIG_BYTE)
|
|
||||||
#define SWIFTEN_BIG_ENDIAN
|
|
||||||
#endif
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- 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>
|
|
||||||
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
diff --git a/Swift/Controllers/ShowProfileController.h b/Swift/Controllers/ShowProfileController.h
|
|
||||||
index 0d01ba1a0..5dc7197ff 100644
|
|
||||||
--- a/Swift/Controllers/ShowProfileController.h
|
|
||||||
+++ b/Swift/Controllers/ShowProfileController.h
|
|
||||||
@@ -18,6 +18,8 @@
|
|
||||||
|
|
||||||
#include <Swift/Controllers/UIEvents/UIEvent.h>
|
|
||||||
|
|
||||||
+#include <map>
|
|
||||||
+
|
|
||||||
namespace Swift {
|
|
||||||
class VCardManager;
|
|
||||||
class ProfileWindow;
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
commit 39a684108ae5938105498e7744e70962308cde7b
|
|
||||||
Author: kpcyrd <git@rxv.cc>
|
|
||||||
Date: Wed Aug 25 23:30:17 2021 +0200
|
|
||||||
|
|
||||||
Reproducible Builds: Sort directory contents at build
|
|
||||||
|
|
||||||
diff --git a/Swiften/SConscript b/Swiften/SConscript
|
|
||||||
index f52637bdb..334f4489e 100644
|
|
||||||
--- a/Swiften/SConscript
|
|
||||||
+++ b/Swiften/SConscript
|
|
||||||
@@ -567,7 +567,9 @@ if env["SCONS_STAGE"] == "build" :
|
|
||||||
swiften_includes = []
|
|
||||||
swiften_public_includes = []
|
|
||||||
top_path = env.Dir("..").abspath
|
|
||||||
- for root, dirs, files in os.walk(env.Dir(".").abspath) :
|
|
||||||
+ for root, dirs, files in sorted(os.walk(env.Dir(".").abspath)) :
|
|
||||||
+ dirs.sort()
|
|
||||||
+ files.sort()
|
|
||||||
if root.endswith("UnitTest") :
|
|
||||||
continue
|
|
||||||
for file in files :
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="person">
|
|
||||||
<email>conikost@gentoo.org</email>
|
|
||||||
<name>Conrad Kostecki</name>
|
|
||||||
</maintainer>
|
|
||||||
<maintainer type="person">
|
|
||||||
<email>andrey_utkin@gentoo.org</email>
|
|
||||||
<name>Andrey Utkin</name>
|
|
||||||
</maintainer>
|
|
||||||
<longdescription>
|
|
||||||
Swift is an elegant, secure, adaptable and intuitive XMPP client,
|
|
||||||
with features that make it suitable for a wide range of use scenarios.
|
|
||||||
Swiften is a robust, high-quality, standards-compliant,
|
|
||||||
cross-platform, and performant C++ library for
|
|
||||||
implementing XMPP applications.
|
|
||||||
</longdescription>
|
|
||||||
<use>
|
|
||||||
<flag name="client">Build the full graphical XMPP client.</flag>
|
|
||||||
<flag name="gconf">Enable configuration through <pkg>gnome-base/gconf</pkg>.</flag>
|
|
||||||
</use>
|
|
||||||
</pkgmetadata>
|
|
||||||
@ -1,212 +0,0 @@
|
|||||||
# Copyright 1999-2023 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
|
|
||||||
LUA_COMPAT=( lua5-{1..2} luajit )
|
|
||||||
PYTHON_COMPAT=( python3_{9..11} )
|
|
||||||
|
|
||||||
inherit lua-single python-any-r1 scons-utils toolchain-funcs
|
|
||||||
|
|
||||||
DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
|
|
||||||
HOMEPAGE="https://www.swift.im/"
|
|
||||||
SRC_URI="
|
|
||||||
https://swift.im/git/${PN}/snapshot/${PN}-${P}.tar.bz2 -> ${P}.tar.bz2
|
|
||||||
https://dev.gentoo.org/~conikost/distfiles/patches/${P}-python3-compatibility.patch.gz
|
|
||||||
"
|
|
||||||
S="${WORKDIR}/${PN}-${P}"
|
|
||||||
|
|
||||||
LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
|
|
||||||
SLOT="4/0"
|
|
||||||
KEYWORDS="~amd64"
|
|
||||||
IUSE="expat +icu +idn lua test zeroconf"
|
|
||||||
REQUIRED_USE="
|
|
||||||
|| ( icu idn )
|
|
||||||
lua? ( ${LUA_REQUIRED_USE} )
|
|
||||||
"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
dev-db/sqlite:3
|
|
||||||
dev-libs/boost:=
|
|
||||||
dev-libs/openssl:0=
|
|
||||||
net-libs/libnatpmp
|
|
||||||
net-libs/miniupnpc:=
|
|
||||||
sys-libs/zlib
|
|
||||||
expat? ( dev-libs/expat )
|
|
||||||
!expat? ( dev-libs/libxml2:2 )
|
|
||||||
icu? ( dev-libs/icu:= )
|
|
||||||
idn? ( net-dns/libidn:= )
|
|
||||||
lua? ( ${LUA_DEPS} )
|
|
||||||
"
|
|
||||||
|
|
||||||
DEPEND="
|
|
||||||
${RDEPEND}
|
|
||||||
>=dev-util/scons-3.0.1-r3
|
|
||||||
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}"/${PN}-4.0.2-boost-1.69-compatibility.patch
|
|
||||||
"${FILESDIR}"/${PN}-4.0.2-qt-5.15-compatibility.patch
|
|
||||||
"${FILESDIR}"/${PN}-4.0.3-gcc11-compatibility.patch
|
|
||||||
"${WORKDIR}"/${PN}-4.0.3-python3-compatibility.patch
|
|
||||||
"${FILESDIR}"/${PN}-4.0.3-reproducible-build.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
python-any-r1_pkg_setup
|
|
||||||
use lua && lua-single_pkg_setup
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
# Use correct LIBDIR for Lua
|
|
||||||
sed -e "s/lib/$(get_libdir)/g" -i Sluift/SConscript.variant || 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
|
|
||||||
rm -fr Swift Slimber || die
|
|
||||||
if ! use lua; then rm -fr Sluift || die; fi
|
|
||||||
if ! use zeroconf; then rm -fr Limber || die; 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
|
|
||||||
|
|
||||||
if [[ ! -f VERSION.swift ]] ; then
|
|
||||||
# Source tarball from git doesn't include this file
|
|
||||||
echo "${PV}" > VERSION.swift || 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="no"
|
|
||||||
icu="$(usex icu)"
|
|
||||||
install_git_hooks="no"
|
|
||||||
# Use 'DISABLE' as an invalid lib name, so no editline lib is used,
|
|
||||||
# as current version is not compatible and compilation will fail.
|
|
||||||
editline_libname="DISABLE"
|
|
||||||
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="no"
|
|
||||||
swiften_dll="true"
|
|
||||||
swift_mobile="no"
|
|
||||||
target="native"
|
|
||||||
test="none"
|
|
||||||
try_avahi="no"
|
|
||||||
try_expat="$(usex expat)"
|
|
||||||
try_gconf="no"
|
|
||||||
try_libidn="$(usex idn)"
|
|
||||||
try_libxml="$(usex !expat)"
|
|
||||||
tls_backend="openssl"
|
|
||||||
unbound="no"
|
|
||||||
V="1"
|
|
||||||
valgrind="no"
|
|
||||||
zlib_bundled_enable="false"
|
|
||||||
)
|
|
||||||
|
|
||||||
if use lua; then
|
|
||||||
MYSCONS+=(
|
|
||||||
lua_includedir="$(lua_get_include_dir)"
|
|
||||||
lua_libdir="${EPREFIX}/usr/$(get_libdir)"
|
|
||||||
lua_libname="$(basename -s '.so' $(lua_get_shared_lib))"
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
local myesconsinstall=(
|
|
||||||
Swiften
|
|
||||||
$(usex lua Sluift '')
|
|
||||||
$(usex zeroconf Limber '')
|
|
||||||
)
|
|
||||||
|
|
||||||
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 lua "SLUIFT_DIR=${ED}/usr" '')
|
|
||||||
$(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
|
|
||||||
"${ED}"
|
|
||||||
)
|
|
||||||
|
|
||||||
escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
|
|
||||||
|
|
||||||
use zeroconf && dobin Limber/limber
|
|
||||||
|
|
||||||
einstalldocs
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user