commit: 719db758e9f3ed8c96acb2df6ded739fab2b22bd Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Fri Mar 28 20:23:51 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Fri Mar 28 20:24:58 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=719db758
net-im/swift: add fix for >=scons-4.9.0 Closes: https://bugs.gentoo.org/950584 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> net-im/swift/files/swift-4.0.3-scons-4.9.0.patch | 11 +++++++++++ net-im/swift/swift-4.0.3-r2.ebuild | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/net-im/swift/files/swift-4.0.3-scons-4.9.0.patch b/net-im/swift/files/swift-4.0.3-scons-4.9.0.patch new file mode 100644 index 000000000000..8b0e06410bb5 --- /dev/null +++ b/net-im/swift/files/swift-4.0.3-scons-4.9.0.patch @@ -0,0 +1,11 @@ +--- a/BuildTools/SCons/SConscript.boot ++++ b/BuildTools/SCons/SConscript.boot +@@ -64,7 +64,7 @@ + vars.Add(PathVariable("expat_includedir", "Expat headers location", None, PathVariable.PathAccept)) + vars.Add(PathVariable("expat_libdir", "Expat library location", None, PathVariable.PathAccept)) + vars.Add("expat_libname", "Expat library name", os.name == "nt" and "libexpat" or "expat") +-vars.Add(PackageVariable("icu", "ICU library location", "no")) ++vars.Add(PackageVariable("icu", "ICU library location", "search")) + vars.Add(BoolVariable("libidn_bundled_enable", "Allow use of bundled LibIDN", "true")) + vars.Add(BoolVariable("try_libidn", "Try configuring for LibIDN?", "true")) + vars.Add(PathVariable("libidn_includedir", "LibIDN headers location", None, PathVariable.PathAccept)) diff --git a/net-im/swift/swift-4.0.3-r2.ebuild b/net-im/swift/swift-4.0.3-r2.ebuild index 8a2cbafdea9e..2939f96690ad 100644 --- a/net-im/swift/swift-4.0.3-r2.ebuild +++ b/net-im/swift/swift-4.0.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -62,6 +62,7 @@ PATCHES=( "${WORKDIR}"/${PN}-4.0.3-python3-compatibility.patch "${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 ) pkg_setup() {
