* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/
@ 2018-11-24 2:46 Andrey Utkin
0 siblings, 0 replies; 5+ messages in thread
From: Andrey Utkin @ 2018-11-24 2:46 UTC (permalink / raw
To: gentoo-commits
commit: 69bd066772638de9aa56483b6dbd7b9bb5a79308
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Fri Nov 16 23:46:47 2018 +0000
Commit: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
CommitDate: Sat Nov 24 02:44:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69bd0667
net-im/swift: New package
An elegant, secure, adaptable and intuitive XMPP client.
Closes: https://bugs.gentoo.org/334887
Closes: https://bugs.gentoo.org/652464
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Signed-off-by: Andrey Utkin <andrey_utkin <AT> gentoo.org>
net-im/swift/Manifest | 1 +
...generated-files-handle-unicode-characters.patch | 38 ++++
.../files/swift-4.0.2-qt-5.11-compatibility.patch | 35 ++++
net-im/swift/metadata.xml | 23 +++
net-im/swift/swift-4.0.2.ebuild | 207 +++++++++++++++++++++
5 files changed, 304 insertions(+)
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
new file mode 100644
index 00000000000..d0e86af54c3
--- /dev/null
+++ b/net-im/swift/Manifest
@@ -0,0 +1 @@
+DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
diff --git a/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch b/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch
new file mode 100644
index 00000000000..7fd2e386d9d
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch
@@ -0,0 +1,38 @@
+From 39ff091cddf8fd5e01047d80c7ed60c150537705 Mon Sep 17 00:00:00 2001
+From: Thanos Doukoudakis <thanos.doukoudakis@isode.com>
+Date: Fri, 11 May 2018 11:26:39 +0100
+Subject: Make generated files handle Unicode characters
+
+This patch handles a case where some of the files used to generate COPYING,
+were containing unicode strings, which could lead to a failure when building
+sid package. The code now will check the type of the string before writing to
+the file, and if needed it will transform it to the appropriate format.
+
+Test-Information:
+Generated the sid package with package_all_platforms script with no problems.
+Created a debian sid box and tested the installation of the generated
+packages. Validated the output generated in Windows 10 and Ubuntu 16.04 builds
+through the "About" dialog in Swift.
+
+Change-Id: I05e518b758f316d9fbf23c1079be5a462e75106c
+
+diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py
+index 89f8963..9b424f2 100644
+--- a/BuildTools/SCons/Tools/textfile.py
++++ b/BuildTools/SCons/Tools/textfile.py
+@@ -113,7 +113,11 @@ def _action(target, source, env):
+ lsep = None
+ for s in source:
+ if lsep: fd.write(lsep)
+- fd.write(_do_subst(s, subs))
++ stringtowrite = _do_subst(s, subs)
++ if isinstance(stringtowrite, str):
++ fd.write(stringtowrite)
++ elif isinstance(stringtowrite, unicode):
++ fd.write(stringtowrite.encode('utf-8'))
+ lsep = linesep
+ fd.close()
+
+--
+cgit v0.10.2-6-g49f6
+
diff --git a/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch b/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch
new file mode 100644
index 00000000000..db633945b49
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch
@@ -0,0 +1,35 @@
+From 1d18148c86377787a8c77042b12ea66f20cb2ca9 Mon Sep 17 00:00:00 2001
+From: Tobias Markmann <tm@ayena.de>
+Date: Thu, 21 Jun 2018 13:04:56 +0200
+Subject: Add missing include for QAbstractItemModel
+
+This fixes building Swift with Qt 5.11.
+
+Test-Information:
+
+Builds and tests pass on macOS 10.13.5 with Qt 5.11.0.
+
+Change-Id: I1be2cd081d8a520ec38ab7cca5ada0d7fc39b777
+
+diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+index 0714ac1..fe536ab 100644
+--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
++++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010-2016 Isode Limited.
++ * Copyright (c) 2010-2018 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+@@ -8,6 +8,7 @@
+
+ #include <set>
+
++#include <QAbstractItemModel>
+ #include <QWizard>
+
+ #include <Swiften/Base/Override.h>
+--
+cgit v0.10.2-6-g49f6
+
diff --git a/net-im/swift/metadata.xml b/net-im/swift/metadata.xml
new file mode 100644
index 00000000000..acb7295d48a
--- /dev/null
+++ b/net-im/swift/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</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>
diff --git a/net-im/swift/swift-4.0.2.ebuild b/net-im/swift/swift-4.0.2.ebuild
new file mode 100644
index 00000000000..c67278ade28
--- /dev/null
+++ b/net-im/swift/swift-4.0.2.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils scons-utils toolchain-funcs
+
+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"
+
+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}-make-generated-files-handle-unicode-characters.patch
+ "${FILESDIR}"/${P}-qt-5.11-compatibility.patch
+)
+
+src_prepare() {
+ default
+
+ # 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="yes"
+ 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 && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ use client && gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/
@ 2019-04-16 11:04 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2019-04-16 11:04 UTC (permalink / raw
To: gentoo-commits
commit: 26b399a75b631cb550ab18b499072dc6757e4541
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Tue Apr 16 08:48:55 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 11:04:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b399a7
net-im/swift: add patch for boost >= 1.69
Including upstreams patch to support newer boost versions, since it
fails with boost 1.69 and newer.
Closes: https://bugs.gentoo.org/683424
Closes: https://github.com/gentoo/gentoo/pull/11705
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../swift-4.0.2-boost-1.69-compatibility.patch | 77 ++++++++++++++++++++++
net-im/swift/swift-4.0.2-r1.ebuild | 1 +
2 files changed, 78 insertions(+)
diff --git a/net-im/swift/files/swift-4.0.2-boost-1.69-compatibility.patch b/net-im/swift/files/swift-4.0.2-boost-1.69-compatibility.patch
new file mode 100644
index 00000000000..a99dc10a2e1
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.2-boost-1.69-compatibility.patch
@@ -0,0 +1,77 @@
+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
diff --git a/net-im/swift/swift-4.0.2-r1.ebuild b/net-im/swift/swift-4.0.2-r1.ebuild
index 3505fe4cc73..eac7d6fa9d5 100644
--- a/net-im/swift/swift-4.0.2-r1.ebuild
+++ b/net-im/swift/swift-4.0.2-r1.ebuild
@@ -64,6 +64,7 @@ DOCS=(
)
PATCHES=(
+ "${FILESDIR}"/${P}-boost-1.69-compatibility.patch
"${FILESDIR}"/${P}-make-generated-files-handle-unicode-characters.patch
"${FILESDIR}"/${P}-qt-5.11-compatibility.patch
)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/
@ 2020-08-26 21:43 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2020-08-26 21:43 UTC (permalink / raw
To: gentoo-commits
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
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/
@ 2023-10-04 14:42 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2023-10-04 14:42 UTC (permalink / raw
To: gentoo-commits
commit: 97e8dff60cf6729e421d7efb4cd80006faead8e6
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 4 14:41:06 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Oct 4 14:41:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e8dff6
net-im/swift: add 4.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
net-im/swift/Manifest | 2 +
.../files/swift-4.0.3-gcc11-compatibility.patch | 13 ++
.../files/swift-4.0.3-reproducible-build.patch | 21 +++
net-im/swift/swift-4.0.3.ebuild | 207 +++++++++++++++++++++
4 files changed, 243 insertions(+)
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index 197a384ef7aa..877ecee33790 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -1,2 +1,4 @@
DIST swift-4.0.2-python3-compatibility.patch.gz 14959 BLAKE2B 17b75950bba9252bb76e30eb9fadb9eaaaad6d693a09f6fa357fe174ade1bd283d00838e87b55059e0601edc5d72c02c952f53ca16dd597010c9f0ffe955662a SHA512 fac9cf0a85b55b1b9bba786cc6456ceaa6257d5f2cdd4d41c4fdee526c301de94bb6f7c71bc00aaec992d0aaf3787e2db3e9c7eed6ec88facea776db66941dba
DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
+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
diff --git a/net-im/swift/files/swift-4.0.3-gcc11-compatibility.patch b/net-im/swift/files/swift-4.0.3-gcc11-compatibility.patch
new file mode 100644
index 000000000000..4d94c2d10503
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.3-gcc11-compatibility.patch
@@ -0,0 +1,13 @@
+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;
diff --git a/net-im/swift/files/swift-4.0.3-reproducible-build.patch b/net-im/swift/files/swift-4.0.3-reproducible-build.patch
new file mode 100644
index 000000000000..951678f2303f
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.3-reproducible-build.patch
@@ -0,0 +1,21 @@
+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 :
diff --git a/net-im/swift/swift-4.0.3.ebuild b/net-im/swift/swift-4.0.3.ebuild
new file mode 100644
index 000000000000..36ac7c1ee8ed
--- /dev/null
+++ b/net-im/swift/swift-4.0.3.ebuild
@@ -0,0 +1,207 @@
+# 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
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/
@ 2024-03-16 20:50 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2024-03-16 20:50 UTC (permalink / raw
To: gentoo-commits
commit: 6ae8f0c2bc5a33b534d1f73cbf09f32940d02057
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 20:49:27 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 20:49:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ae8f0c2
net-im/swift: fix compilation with libxml2-2.12
Closes: https://bugs.gentoo.org/923288
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../swift/files/swift-4.0.3-libxml2-2.12-compatibility.patch | 11 +++++++++++
net-im/swift/swift-4.0.3-r2.ebuild | 1 +
2 files changed, 12 insertions(+)
diff --git a/net-im/swift/files/swift-4.0.3-libxml2-2.12-compatibility.patch b/net-im/swift/files/swift-4.0.3-libxml2-2.12-compatibility.patch
new file mode 100644
index 000000000000..b08a480835f3
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.3-libxml2-2.12-compatibility.patch
@@ -0,0 +1,11 @@
+--- a/Swiften/Parser/LibXMLParser.cpp
++++ b/Swiften/Parser/LibXMLParser.cpp
+@@ -97,7 +97,7 @@
+ if (xmlParseChunk(p->context_, data.c_str(), boost::numeric_cast<int>(data.size()), false) == XML_ERR_OK) {
+ return true;
+ }
+- xmlError* error = xmlCtxtGetLastError(p->context_);
++ const xmlError* error = xmlCtxtGetLastError(p->context_);
+ if (error->code == XML_WAR_NS_URI || error->code == XML_WAR_NS_URI_RELATIVE) {
+ xmlCtxtResetLastError(p->context_);
+ p->context_->errNo = XML_ERR_OK;
diff --git a/net-im/swift/swift-4.0.3-r2.ebuild b/net-im/swift/swift-4.0.3-r2.ebuild
index 686e9cf6c7c7..792b487871ed 100644
--- a/net-im/swift/swift-4.0.3-r2.ebuild
+++ b/net-im/swift/swift-4.0.3-r2.ebuild
@@ -58,6 +58,7 @@ 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
+ "${FILESDIR}"/${PN}-4.0.3-libxml2-2.12-compatibility.patch
"${WORKDIR}"/${PN}-4.0.3-python3-compatibility.patch
"${FILESDIR}"/${PN}-4.0.3-reproducible-build.patch
)
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-03-16 20:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-04 14:42 [gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2024-03-16 20:50 Conrad Kostecki
2020-08-26 21:43 Conrad Kostecki
2019-04-16 11:04 David Seifert
2018-11-24 2:46 Andrey Utkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox