diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-07-13 12:26:41 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-07-13 12:26:41 +0100 |
| commit | 482a48c0e1675b1e92663b8b5222bb7261aa7956 (patch) | |
| tree | b81e02db1810214fc690a762e3a9c687d0f0c5ab /net-im/swift | |
| parent | 37bccfe5e76c5740c4ef5ba1179e9488d8404075 (diff) | |
gentoo auto-resync : 13:07:2024 - 12:26:41
Diffstat (limited to 'net-im/swift')
| -rw-r--r-- | net-im/swift/Manifest | 3 | ||||
| -rw-r--r-- | net-im/swift/files/swift-4.0.3-miniupnpc.patch | 24 | ||||
| -rw-r--r-- | net-im/swift/swift-4.0.3-r2.ebuild | 4 |
3 files changed, 30 insertions, 1 deletions
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest index 776be3136275..5777851f56ee 100644 --- a/net-im/swift/Manifest +++ b/net-im/swift/Manifest @@ -2,8 +2,9 @@ AUX swift-4.0.2-boost-1.69-compatibility.patch 2986 BLAKE2B e81cdaadaa7fe4972df1 AUX swift-4.0.2-qt-5.15-compatibility.patch 245 BLAKE2B 77facc560f6cea3dedd7c3095b6e5d7a91ff956b80022dc8a27c93edac72884bfd7f484fc84052a47bccb184f4225eb90fcc3d30f925ee15e18d5c97037a0b16 SHA512 9e8adaec0e7b1e727a2f91a675eaea4f62b7f8a53fdbaaf2adf9e13d57a1df15e921f1aa1b876561c7eecd1a4602763a52b3e875cecebe139d6e338df1001b12 AUX swift-4.0.3-gcc11-compatibility.patch 388 BLAKE2B a8b9d79d05accc9f07ec9db302bdf5a7757c5872a6dd66abc5765a109f6e69358dafc7e7c67208b6e7a15a88befb07b09d4a8629aceda83acc306c4b33899554 SHA512 27b4372eea344c98aaffe02d55550da62130d66d1abb967f3e6d236d58db33cea525448b3ed195c4397446af43d166ec3555b9f1f23637e3edfd73f9acb339e8 AUX swift-4.0.3-libxml2-2.12-compatibility.patch 527 BLAKE2B 2e14b6b46ad7e47c2a2edbbb1d362d4c8bea93739670677bb00014cae7fd1aac603c0dffe64183d4c6a2410198f101300faa96692405e1da4cd0008f420be284 SHA512 a090a6d8e80a9e62d8f73a81d4d63e19d3e5b0209ffcdfa0ad19b9a179902013445ac363661eeaef0a484351f472bc9b86de8d0a987b9101a80bb6028a2be3d1 +AUX swift-4.0.3-miniupnpc.patch 756 BLAKE2B e79affa66798bb31ceedc25c8a12bcecef2ccc99e5c554f73678a4d7f018618ad0495870fe1ecdc44731140954516caa40066a0367299e5064fd67825c099f08 SHA512 f9fb87a0dfc366c8281a26f42f46477e250325247b4253292b077cd962edf15e5478785e43571015f365739095dd541038aa4e9a23b3c8ff83977a2828509aec AUX swift-4.0.3-reproducible-build.patch 732 BLAKE2B e40c7e9c5e18aec72c6cd6290e89badbb0d57d15bc30fb06baef1050c4be52f795593f43dc9715a0634d19b9c5a0bb2afbb4025de2b6aa8bd0deb074c748ee2c SHA512 4f90dba4ebbd4ae33b40eeeaa100e647a1ae5cd6e32ed21b6bcbdc52104b57d59bdcc7dbb907a1a751a30f91e1e234d695278d999574f1393d3aaf499484270f 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 -EBUILD swift-4.0.3-r2.ebuild 4696 BLAKE2B d1b0951b1f1f10b54a39505355e18d3c3d62c4c8c1578962cfa626f6bd975bee269b01d50e18e7de47fdd681fd6bad117ba2f7c27a87727252fed6f3a56a16e8 SHA512 3f7299feb5eca49d783bf27aac00b3bd08c1d1696de23bcb5b2d904c99d6a75cc654e64deab59e9f623999da5164b0293d3a1bdbc857266a143e0ee9bd11ae93 +EBUILD swift-4.0.3-r2.ebuild 4824 BLAKE2B d53c4d705052ef7c43eab7b496900170bec153540acb49f7552e9005865219994ed560b788859c3c3f3d4215502cc93cd2143e11217daaa3898c26e8becf33a2 SHA512 e88634d96ed14989d4b416e8791ba0182d88040364a5368eb873c90a0d17fa67f6c991e10f7463e88bbe9bd5184d768a109bd4db52295e47d178abf89c2f3279 MISC metadata.xml 572 BLAKE2B 844c5b114051f7e2292b7857c991d4c6ea9c52a7e697f5d7f93296f4047179da836519701425c3ac6e9fd9fae99d77565258e08f2493682b8f2629cac493344b SHA512 4ed15787f531624392d9e8489634094c99f32b2c077c1330d79713a662bb22c79bd808aa8c1616b21fb5824ec03908aa54ea1d1cf13aa3f011235ef3756a32c5 diff --git a/net-im/swift/files/swift-4.0.3-miniupnpc.patch b/net-im/swift/files/swift-4.0.3-miniupnpc.patch new file mode 100644 index 000000000000..db717ff1213b --- /dev/null +++ b/net-im/swift/files/swift-4.0.3-miniupnpc.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/934054 + +From: Bill Prendergast <dek.devel@baisenvar.info> + +Fix build with newer net-libs/miniupnpc (API 18) +--- a/Swiften/Network/MiniUPnPInterface.cpp ++++ b/Swiften/Network/MiniUPnPInterface.cpp +@@ -45,9 +45,16 @@ MiniUPnPInterface::MiniUPnPInterface() : p(new Private()) { + } + + char lanAddress[64]; ++#if MINIUPNPC_API_VERSION > 17 ++ char wanAddress[64]; ++ if (!UPNP_GetValidIGD(p->deviceList, &p->urls, &p->data, lanAddress, sizeof(lanAddress), wanAddress, sizeof(wanAddress))) { ++ return; ++ } ++#else + if (!UPNP_GetValidIGD(p->deviceList, &p->urls, &p->data, lanAddress, sizeof(lanAddress))) { + return; + } ++#endif + p->localAddress = std::string(lanAddress); + p->isValid = true; + } diff --git a/net-im/swift/swift-4.0.3-r2.ebuild b/net-im/swift/swift-4.0.3-r2.ebuild index 792b487871ed..8a2cbafdea9e 100644 --- a/net-im/swift/swift-4.0.3-r2.ebuild +++ b/net-im/swift/swift-4.0.3-r2.ebuild @@ -61,6 +61,7 @@ PATCHES=( "${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 + "${FILESDIR}"/${PN}-4.0.3-miniupnpc.patch ) pkg_setup() { @@ -77,6 +78,9 @@ src_prepare() { # Use correct LIBDIR for Lua sed -e "s/lib/$(get_libdir)/g" -i Sluift/SConscript.variant || die + # bug #933871 + sed -i -e 's:c++11:c++17:g' BuildTools/SCons/SConscript.boot || die + # Hack for finding Qt system libs mkdir "${T}"/qt || die ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die |