commit: 8a2c124745ddcd1e062ab30f357cc08896b89d46 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Sat Feb 7 22:31:04 2026 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sat Feb 7 23:23:00 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a2c1247
net-im/swift: fix boost-compat with >= 1.87 Closes: https://bugs.gentoo.org/946571 Closes: https://bugs.gentoo.org/963407 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> net-im/swift/Manifest | 1 + net-im/swift/files/swift-4.0.3-boost-1.89-compatibility.patch | 11 +++++++++++ net-im/swift/swift-4.0.3-r3.ebuild | 3 +++ 3 files changed, 15 insertions(+) diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest index 51cfbe5fc7ed..2e73c4e6ce66 100644 --- a/net-im/swift/Manifest +++ b/net-im/swift/Manifest @@ -1,2 +1,3 @@ +DIST swift-4.0.3-boost-1.87-compatibility.patch.gz 4487 BLAKE2B 93eeb69261c76cd6b2daccccca89433b970308f4bea585a37dff60b8d61aedc55a1dc754727f69292f14054455312156b1175331f882667dee66f2eeb9fd8615 SHA512 2607f0753b8610b4272c427e33c476863e3b0f0eb0d84f24fdaa0fbbc372ff717a0bb61925f0af1174f1b583aa1d8a905e349c08fa4c7cf45fb0e2e43c749354 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-boost-1.89-compatibility.patch b/net-im/swift/files/swift-4.0.3-boost-1.89-compatibility.patch new file mode 100644 index 000000000000..916e508029f6 --- /dev/null +++ b/net-im/swift/files/swift-4.0.3-boost-1.89-compatibility.patch @@ -0,0 +1,11 @@ +--- a/BuildTools/SCons/SConstruct ++++ b/BuildTools/SCons/SConstruct +@@ -211,7 +211,7 @@ + boost_flags["CPPFLAGS"] = [("-isystem", env["boost_includedir"])] + boost_conf_env.MergeFlags(boost_flags) + conf = Configure(boost_conf_env) +-boostLibs = [(None, "signals2.hpp"), ("system", "system/system_error.hpp"), ("thread", None), ("regex", None), ("program_options", None), ("filesystem", None), ("serialization", "archive/text_oarchive.hpp"), ("date_time", "date_time/date.hpp")] ++boostLibs = [(None, "signals2.hpp"), ("thread", None), ("regex", None), ("program_options", None), ("filesystem", None), ("serialization", "archive/text_oarchive.hpp"), ("date_time", "date_time/date.hpp")] + allLibsPresent = True + libNames = [] + for (lib, header) in boostLibs : diff --git a/net-im/swift/swift-4.0.3-r3.ebuild b/net-im/swift/swift-4.0.3-r3.ebuild index 0efb5efcaefe..75a3a752c4ff 100644 --- a/net-im/swift/swift-4.0.3-r3.ebuild +++ b/net-im/swift/swift-4.0.3-r3.ebuild @@ -13,6 +13,7 @@ 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 + https://dev.gentoo.org/~conikost/distfiles/patches/${P}-boost-1.87-compatibility.patch.gz " S="${WORKDIR}/${PN}-${P}" @@ -63,6 +64,8 @@ PATCHES=( "${FILESDIR}"/${PN}-4.0.3-reproducible-build.patch "${FILESDIR}"/${PN}-4.0.3-miniupnpc.patch "${FILESDIR}"/${PN}-4.0.3-scons-4.9.0.patch + "${WORKDIR}"/${PN}-4.0.3-boost-1.87-compatibility.patch + "${FILESDIR}"/${PN}-4.0.3-boost-1.89-compatibility.patch ) pkg_setup() {
